[pypy-commit] pypy stmgc-c4: Import stmgc/88246694721e

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c4
Changeset: r65237:bb66659492be
Date: 2013-07-06 16:20 +0200
http://bitbucket.org/pypy/pypy/changeset/bb66659492be/

Log:	Import stmgc/88246694721e

diff --git a/rpython/translator/stm/src_stm/revision b/rpython/translator/stm/src_stm/revision
--- a/rpython/translator/stm/src_stm/revision
+++ b/rpython/translator/stm/src_stm/revision
@@ -1,1 +1,1 @@
-007ac02eb935
+88246694721e
diff --git a/rpython/translator/stm/src_stm/stmgc.h b/rpython/translator/stm/src_stm/stmgc.h
--- a/rpython/translator/stm/src_stm/stmgc.h
+++ b/rpython/translator/stm/src_stm/stmgc.h
@@ -110,7 +110,10 @@
 void stm_abort_info_pop(long count);
 char *stm_inspect_abort_info(void);
 
+/* mostly for debugging support */
 void stm_abort_and_retry(void);
+void stm_minor_collect(void);
+void stm_major_collect(void);
 
 
 /****************  END OF PUBLIC INTERFACE  *****************/
diff --git a/rpython/translator/stm/src_stm/stmsync.c b/rpython/translator/stm/src_stm/stmsync.c
--- a/rpython/translator/stm/src_stm/stmsync.c
+++ b/rpython/translator/stm/src_stm/stmsync.c
@@ -329,6 +329,18 @@
     AbortNowIfDelayed();   /* if another thread ran a major GC */
 }
 
+void stm_minor_collect(void)
+{
+    stmgc_minor_collect();
+    stmgcpage_possibly_major_collect(0);
+}
+
+void stm_major_collect(void)
+{
+    stmgc_minor_collect();
+    stmgcpage_possibly_major_collect(1);
+}
+
 /************************************************************/
 
 /***** Prebuilt roots, added in the list as the transaction that changed