Author: Armin Rigo <[email protected]>
Branch:
Changeset: r114:f5727433a73e
Date: 2013-06-13 11:32 +0200
http://bitbucket.org/pypy/stmgc/changeset/f5727433a73e/
Log: Add demo1.c from ../c3. Works.
diff --git a/c3/Makefile b/c4/Makefile
copy from c3/Makefile
copy to c4/Makefile
--- a/c3/Makefile
+++ b/c4/Makefile
@@ -2,33 +2,17 @@
# Run with "make -jN" for maximum randomness.
#
-debug: debug-demo1 debug-demo2
+debug: debug-demo1
clean:
- rm -f debug-demo1 debug-demo2
+ rm -f debug-demo1
-tests: iteration-1 iteration-2 iteration-3 iteration-4
+H_FILES = atomic_ops.h stmgc.h stmimpl.h \
+ dbgmem.h et.h fprintcolor.h lists.h steal.h stmsync.h
+C_FILES = dbgmem.c et.c fprintcolor.c lists.c steal.c stmsync.c
-all-builds: build-demo1 build-demo2 build-demo3 build-demo4 build-demo5
-
-iteration-1: all-builds
- +make test-demo5 test-demo1 test-demo2 test-demo3 test-demo4
-
-iteration-2: all-builds
- +make test-demo2 test-demo3 test-demo4 test-demo5 test-demo1
-
-iteration-3: all-builds
- +make test-demo3 test-demo4 test-demo5 test-demo1 test-demo2
-
-iteration-4: all-builds
- +make test-demo4 test-demo5 test-demo1 test-demo2 test-demo3
-
-
-H_FILES = et.h lists.h nursery.h gcpage.h stmsync.h dbgmem.h fprintcolor.h
stmgc.h atomic_ops.h stmimpl.h
-C_FILES = et.c lists.c nursery.c gcpage.c stmsync.c dbgmem.c fprintcolor.c
-
-DEBUG = -g -DGC_NURSERY=0x10000 -D_GC_DEBUG=1
+DEBUG = -g -DGC_NURSERY=0x10000 #-D_GC_DEBUG=1
build-%: %.c ${H_FILES} ${C_FILES}
diff --git a/c3/demo1.c b/c4/demo1.c
copy from c3/demo1.c
copy to c4/demo1.c
--- a/c3/demo1.c
+++ b/c4/demo1.c
@@ -106,7 +106,7 @@
static sem_t done;
-extern void stmgcpage_possibly_major_collect(int force); /* temp */
+//extern void stmgcpage_possibly_major_collect(int force); /* temp */
static int thr_mynum = 0;
@@ -128,7 +128,7 @@
w_node->value = start + i;
stm_push_root((gcptr)w_node);
stm_perform_transaction((gcptr)w_node, insert1);
- stmgcpage_possibly_major_collect(0); /* temp */
+ //stmgcpage_possibly_major_collect(0); /* temp */
w_node = (struct node *)stm_pop_root();
}
stm_finalize();
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
