[pypy-commit] stmgc default: Change some dprints

arigo noreply at buildbot.pypy.org
Mon Feb 23 14:40:40 CET 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r1644:856d24b4ea37
Date: 2015-02-23 14:41 +0100
http://bitbucket.org/pypy/stmgc/changeset/856d24b4ea37/

Log:	Change some dprints

diff --git a/c7/stm/extra.c b/c7/stm/extra.c
--- a/c7/stm/extra.c
+++ b/c7/stm/extra.c
@@ -40,6 +40,7 @@
     if (result < 0 && callback != NULL) {
         /* no regular transaction running, invoke the callback
            immediately */
+        dprintf(("stm_call_on_commit calls now: %p(%p)\n", callback, key));
         callback(key);
     }
     return result;
@@ -76,6 +77,8 @@
         /* The callback may call stm_call_on_abort(key, NULL)
            (so with callback==NULL).  It is ignored, because
            'callbacks_on_commit_and_abort' was cleared already. */
+        dprintf(("invoke_and_clear_user_callbacks(%ld): %p(%p)\n",
+                 index, callback, key));
         callback(key);
 
     } TREE_LOOP_END;
diff --git a/c7/stm/nursery.c b/c7/stm/nursery.c
--- a/c7/stm/nursery.c
+++ b/c7/stm/nursery.c
@@ -263,9 +263,9 @@
     OPT_ASSERT(write_locks[first_card_index] <= NB_SEGMENTS
                || write_locks[first_card_index] == 255); /* see gcpage.c */
 
-    dprintf(("mark cards of %p, size %lu with %d, all: %d\n",
+  /*dprintf(("mark cards of %p, size %lu with %d, all: %d\n",
              obj, size, mark_value, mark_all));
-    dprintf(("obj has %lu cards\n", last_card_index));
+    dprintf(("obj has %lu cards\n", last_card_index));*/
     while (card_index <= last_card_index) {
         uintptr_t card_lock_idx = first_card_index + card_index;
 
diff --git a/c7/stm/pages.c b/c7/stm/pages.c
--- a/c7/stm/pages.c
+++ b/c7/stm/pages.c
@@ -63,12 +63,12 @@
 
 static void d_remap_file_pages(char *addr, size_t size, ssize_t pgoff)
 {
-    dprintf(("remap_file_pages: 0x%lx bytes: (seg%ld %p) --> (seg%ld %p)\n",
+    /*dprintf(("remap_file_pages: 0x%lx bytes: (seg%ld %p) --> (seg%ld %p)\n",
              (long)size,
              (long)((addr - stm_object_pages) / 4096UL) / NB_PAGES,
              (void *)((addr - stm_object_pages) % (4096UL * NB_PAGES)),
              (long)pgoff / NB_PAGES,
-             (void *)((pgoff % NB_PAGES) * 4096UL)));
+             (void *)((pgoff % NB_PAGES) * 4096UL)));*/
     assert(size % 4096 == 0);
     assert(size <= TOTAL_MEMORY);
     assert(((uintptr_t)addr) % 4096 == 0);


More information about the pypy-commit mailing list