1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-10 15:50:50 +02:00

Rename mark-sweep.h to whippet.h

This commit is contained in:
Andy Wingo 2022-05-16 21:47:13 +02:00
parent 061d92d125
commit 7d80d45c79
4 changed files with 12 additions and 12 deletions

View file

@ -1,5 +1,5 @@
TESTS=quads mt-gcbench # MT_GCBench MT_GCBench2
COLLECTORS=bdw semi mark-sweep parallel-mark-sweep
COLLECTORS=bdw semi whippet parallel-whippet
CC=gcc
CFLAGS=-Wall -O2 -g -fno-strict-aliasing -Wno-unused -DNDEBUG
@ -17,11 +17,11 @@ bdw-%: bdw.h conservative-roots.h %-types.h %.c
semi-%: semi.h precise-roots.h large-object-space.h %-types.h heap-objects.h %.c
$(COMPILE) -DGC_SEMI -o $@ $*.c
mark-sweep-%: mark-sweep.h precise-roots.h large-object-space.h serial-tracer.h assert.h debug.h %-types.h heap-objects.h %.c
$(COMPILE) -DGC_MARK_SWEEP -o $@ $*.c
whippet-%: whippet.h precise-roots.h large-object-space.h serial-tracer.h assert.h debug.h %-types.h heap-objects.h %.c
$(COMPILE) -DGC_WHIPPET -o $@ $*.c
parallel-mark-sweep-%: mark-sweep.h precise-roots.h large-object-space.h parallel-tracer.h assert.h debug.h %-types.h heap-objects.h %.c
$(COMPILE) -DGC_PARALLEL_MARK_SWEEP -o $@ $*.c
parallel-whippet-%: whippet.h precise-roots.h large-object-space.h parallel-tracer.h assert.h debug.h %-types.h heap-objects.h %.c
$(COMPILE) -DGC_PARALLEL_WHIPPET -o $@ $*.c
check: $(addprefix test-$(TARGET),$(TARGETS))

View file

@ -109,7 +109,7 @@ situate Whippet's performance in context:
- `bdw.h`: The external BDW-GC conservative parallel stop-the-world
mark-sweep segregated-fits collector with lazy sweeping.
- `semi.h`: Semispace copying collector.
- `mark-sweep.h`: The whippet collector. Two different marking
- `whippet.h`: The whippet collector. Two different marking
implementations: single-threaded and parallel.
## Guile

10
gc.h
View file

@ -5,11 +5,11 @@
#include "bdw.h"
#elif defined(GC_SEMI)
#include "semi.h"
#elif defined(GC_MARK_SWEEP)
#include "mark-sweep.h"
#elif defined(GC_PARALLEL_MARK_SWEEP)
#define GC_PARALLEL_MARK 1
#include "mark-sweep.h"
#elif defined(GC_WHIPPET)
#include "whippet.h"
#elif defined(GC_PARALLEL_WHIPPET)
#define GC_PARALLEL_TRACE 1
#include "whippet.h"
#else
#error unknown gc
#endif

View file

@ -11,7 +11,7 @@
#include "inline.h"
#include "large-object-space.h"
#include "precise-roots.h"
#ifdef GC_PARALLEL_MARK
#ifdef GC_PARALLEL_TRACE
#include "parallel-tracer.h"
#else
#include "serial-tracer.h"