Author: Armin Rigo <ar...@tunes.org>
Branch: c7-more-segments
Changeset: r1020:f8c3c7960895
Date: 2014-03-15 17:22 +0100
http://bitbucket.org/pypy/stmgc/changeset/f8c3c7960895/
Log: Disable this too
diff --git a/c7/stm/gcpage.c b/c7/stm/gcpage.c
--- a/c7/stm/gcpage.c
+++ b/c7/stm/gcpage.c
@@ -193,6 +193,7 @@
/************************************************************/
+#if 0
static inline void mark_single_flag_private(uintptr_t pagenum)
{
if (flag_page_private[pagenum] == PRIVATE_PAGE) {
@@ -314,6 +315,7 @@
(uninitialized_page_stop - stm_object_pages) / 4096UL,
NB_PAGES);
}
+#endif
/************************************************************/
@@ -346,11 +348,13 @@
while (1) {
+#if 0
/* first, if we're not seeing segment 0, we must change the
flags in flag_page_private[] from PRIVATE_PAGE to
SEGMENT1_PAGE, which will mean "can't re-share" */
if (segment_base != stm_object_pages && RESHARE_PAGES)
mark_flag_page_private(obj, segment_base);
+#endif
/* trace into the object (the version from 'segment_base') */
struct object_s *realobj =
@@ -549,8 +553,10 @@
/* sweeping */
mutex_pages_lock();
+#if 0
if (RESHARE_PAGES)
major_reshare_pages();
+#endif
sweep_large_objects();
//sweep_uniform_pages();
mutex_pages_unlock();
diff --git a/c7/stm/pages.h b/c7/stm/pages.h
--- a/c7/stm/pages.h
+++ b/c7/stm/pages.h
@@ -13,10 +13,6 @@
/* Page is private for each segment. */
PRIVATE_PAGE,
-
- /* gcpage.c: page contains objects that have been traced in the
- segment > 0 */
- SEGMENT1_PAGE,
};
static uint8_t flag_page_private[NB_PAGES];
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
