[pypy-commit] stmgc c8-overheads-instrumentation: Correction to duration logging events

[tobweber]

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-overheads-instrumentation
Changeset: r2028:b59eb6c25bca
Date: 2017-03-13 11:54 +0100
http://bitbucket.org/pypy/stmgc/changeset/b59eb6c25bca/

Log:	Correction to duration logging events

diff --git a/c8/stmgc.h b/c8/stmgc.h
--- a/c8/stmgc.h
+++ b/c8/stmgc.h
@@ -578,8 +578,7 @@
     STM_DURATION_WRITE_GC_ONLY,
     STM_DURATION_WRITE_SLOWPATH,
     STM_DURATION_VALIDATION,
-    STM_DURATION_COMMIT_MINOR_GC,
-    STM_DURATION_COMMIT_ALL,
+    STM_DURATION_COMMIT_EXCEPT_GC,
     STM_DURATION_MINOR_GC,
     STM_DURATION_MAJOR_GC_LOG_ONLY,
     STM_DURATION_MAJOR_GC_FULL,
@@ -587,26 +586,25 @@
     _STM_EVENT_N
 };
 
-#define STM_EVENT_NAMES                         \
-    "transaction start",                        \
-    "transaction commit",                       \
-    "transaction abort",                        \
-    "contention write read",                    \
-    "wait free segment",                        \
-    "wait other inevitable",                    \
-    "wait done",                                \
-    "gc minor start",                           \
-    "gc minor done",                            \
-    "gc major start",                           \
-    "gc major done",                            \
-    /* names of duration events */              \
-    "duration of minor gc due to write",        \
-    "duration of write slowpath",               \
-    "duration of validation",                   \
-    "duration of minor gc due to commit",       \
-    "duration of commit except minor gc",       \
-    "duration of minor gc",                     \
-    "duration of major gc doing log clean up only",\
+#define STM_EVENT_NAMES                             \
+    "transaction start",                            \
+    "transaction commit",                           \
+    "transaction abort",                            \
+    "contention write read",                        \
+    "wait free segment",                            \
+    "wait other inevitable",                        \
+    "wait done",                                    \
+    "gc minor start",                               \
+    "gc minor done",                                \
+    "gc major start",                               \
+    "gc major done",                                \
+    /* names of duration events */                  \
+    "duration of gc due to write",                  \
+    "duration of write slowpath",                   \
+    "duration of validation",                       \
+    "duration of commit except gc",                 \
+    "duration of minor gc",                         \
+    "duration of major gc doing log clean up only", \
     "duration of full major gc"
 
 /* The markers pushed in the shadowstack are an odd number followed by a