mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Pushing logged edges takes ownership of edge buffers

Browse source 
This allows field logging to proceed during collection, which might add
new edge buffers.  Also fix a bug that would cause debug-mode assertion
failures, where clearing a field set didn't clear edge buffer next
pointers.
This commit is contained in:
Andy Wingo 2025-01-10 15:27:22 +01:00
parent 8b96d8cf90
commit 209be38640
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/field-set.h
View file

@ -132,10 +132,12 @@ gc_field_set_release_buffer(struct gc_field_set *set,
static void static void
gc_field_set_add_roots(struct gc_field_set *set, struct gc_tracer *tracer) { gc_field_set_add_roots(struct gc_field_set *set, struct gc_tracer *tracer) {
struct gc_edge_buffer *buf; struct gc_edge_buffer *buf;
for (buf = set->partly_full.list.head; buf; buf = buf->next) struct gc_lock lock = gc_lock_acquire(&set->lock);
while ((buf = gc_edge_buffer_stack_pop(&set->partly_full, &lock)))
gc_tracer_add_root(tracer, gc_root_edge_buffer(buf)); gc_tracer_add_root(tracer, gc_root_edge_buffer(buf));
for (buf = set->full.head; buf; buf = buf->next) while ((buf = gc_edge_buffer_list_pop(&set->full)))
gc_tracer_add_root(tracer, gc_root_edge_buffer(buf)); gc_tracer_add_root(tracer, gc_root_edge_buffer(buf));
gc_lock_release(&lock);
} }
static void static void
@ -151,6 +153,7 @@ gc_field_set_clear(struct gc_field_set *set,
struct gc_edge_buffer *buf, *next; struct gc_edge_buffer *buf, *next;
for (buf = partly_full; buf; buf = next) { for (buf = partly_full; buf; buf = next) {
next = buf->next; next = buf->next;
buf->next = NULL;
if (forget_edge) if (forget_edge)
for (size_t i = 0; i < buf->size; i++) for (size_t i = 0; i < buf->size; i++)
forget_edge(buf->edges[i], heap); forget_edge(buf->edges[i], heap);
@ -159,6 +162,7 @@ gc_field_set_clear(struct gc_field_set *set,
} }
for (buf = full; buf; buf = next) { for (buf = full; buf; buf = next) {
next = buf->next; next = buf->next;
buf->next = NULL;
if (forget_edge) if (forget_edge)
for (size_t i = 0; i < buf->size; i++) for (size_t i = 0; i < buf->size; i++)
forget_edge(buf->edges[i], heap); forget_edge(buf->edges[i], heap);
@ -185,6 +189,7 @@ gc_field_set_visit_edge_buffer(struct gc_field_set *set,
void *data) { void *data) {
for (size_t i = 0; i < buf->size; i++) for (size_t i = 0; i < buf->size; i++)
visit(buf->edges[i], heap, data); visit(buf->edges[i], heap, data);
gc_field_set_release_buffer(set, buf);
} }
static void static void