Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r76567:5075882bb14f
Date: 2015-03-26 09:27 +0100
http://bitbucket.org/pypy/pypy/changeset/5075882bb14f/
Log: import stmgc/84157d77ae80
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 @@
-a0b5046a7bea
+84157d77ae80
diff --git a/rpython/translator/stm/src_stm/stm/core.c
b/rpython/translator/stm/src_stm/stm/core.c
--- a/rpython/translator/stm/src_stm/stm/core.c
+++ b/rpython/translator/stm/src_stm/stm/core.c
@@ -2,6 +2,11 @@
#ifndef _STM_CORE_H_
# error "must be compiled via stmgc.c"
#endif
+char *stm_object_pages;
+long _stm_segment_nb_pages = NB_PAGES;
+int _stm_nb_segments = NB_SEGMENTS;
+int _stm_psegment_ofs = (int)(uintptr_t)STM_PSEGMENT;
+
static void teardown_core(void)
{
diff --git a/rpython/translator/stm/src_stm/stm/core.h
b/rpython/translator/stm/src_stm/stm/core.h
--- a/rpython/translator/stm/src_stm/stm/core.h
+++ b/rpython/translator/stm/src_stm/stm/core.h
@@ -232,7 +232,10 @@
TS_INEVITABLE,
};
-static char *stm_object_pages;
+extern char *stm_object_pages;
+extern long _stm_segment_nb_pages;
+extern int _stm_nb_segments;
+extern int _stm_psegment_ofs;
static int stm_object_pages_fd;
static stm_thread_local_t *stm_all_thread_locals = NULL;
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
