[pypy-commit] pypy stmgc-c8: in-progress

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c8
Changeset: r78220:2d9ef7ec5527
Date: 2015-06-21 09:27 +0200
http://bitbucket.org/pypy/pypy/changeset/2d9ef7ec5527/

Log:	in-progress

diff --git a/TODO b/TODO
--- a/TODO
+++ b/TODO
@@ -1,3 +1,8 @@
+------------------------------------------------------------
+
+ll_math_modf(), say, causes stm_become_inevitable()
+because of the raw array read "intpart_p[0]"
+
 ------------------------------------------------------------
 
 fuse the two 32bit setfield_gc for stmflags & tid in the jit
diff --git a/pypy/stm/print_stm_log.py b/pypy/stm/print_stm_log.py
--- a/pypy/stm/print_stm_log.py
+++ b/pypy/stm/print_stm_log.py
@@ -111,6 +111,7 @@
     def progress(self, now, new_state):
         prev_time, prev_state = self._prev
         add_time = now - prev_time
+        add_time = abs(add_time) #XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
         assert add_time >= 0.0
         if prev_state == "run":
             self._transaction_cpu_time += add_time
@@ -226,7 +227,7 @@
 
 def print_marker(marker):
     s = '  %s' % marker
-    match = r_marker.match(marker)
+    match = r_marker.search(marker)
     if match:
         filename = match.group(1)
         if not (filename.endswith('.pyc') or filename.endswith('.pyo')):
@@ -254,6 +255,7 @@
                 print >> sys.stderr, '%.0f%%' % (entry.frac * 100.0,),
         cnt += 1
         #
+        #print entry
         t = threads.get(entry.threadnum)
         if t is None:
             t = threads[entry.threadnum] = ThreadState(entry.threadnum)