coreprof in RCR, just one event for now showing begin and end of traverse call

diff --git a/Robust/src/Benchmarks/oooJava/master-makefile b/Robust/src/Benchmarks/oooJava/master-makefile
index 0b11a873219740742f1cb053634d5ab71b9af388..9a75c5aa52975a94d5df14c49b220294bc893d3d 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/master-makefile
+++ b/Robust/src/Benchmarks/oooJava/master-makefile
@@ -17,21 +17,22 @@ USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
        -coreprof-eventwords 1024*1024*128 \
        -coreprof-enable cpe_main \
        -coreprof-enable cpe_taskexecute \
-       -coreprof-enable cpe_taskretire \
+       -coreprof-enable cpe_taskdispatch \
+       -coreprof-enable cpe_runmalloc \
+       -coreprof-enable cpe_rcr_traverse
+#      -coreprof-enable cpe_taskretire \
        -coreprof-enable cpe_workschedsubmit \
        -coreprof-enable cpe_workschedgrab \
-       -coreprof-enable cpe_taskdispatch
-#      -coreprof-enable cpe_runmalloc \
-#      -coreprof-enable cpe_poolalloc \
-#      -coreprof-enable cpe_preparememq \
-#      -coreprof-enable cpe_runfree \
-#      -coreprof-enable cpe_count_poolalloc \
-#      -coreprof-enable cpe_count_poolreuse \
-#      -coreprof-enable cpe_taskstallvar \
-#      -coreprof-enable cpe_taskstallmem
-
-
-USEOOO= -ooojava 24 2  -ooodebug -squeue #-ooodebug-disable-task-mem-pool
+       -coreprof-enable cpe_poolalloc \
+       -coreprof-enable cpe_preparememq \
+       -coreprof-enable cpe_runfree \
+       -coreprof-enable cpe_count_poolalloc \
+       -coreprof-enable cpe_count_poolreuse \
+       -coreprof-enable cpe_taskstallvar \
+       -coreprof-enable cpe_taskstallmem
+
+
+USEOOO= -ooojava 24 2 -ooodebug -squeue #-ooodebug-disable-task-mem-pool
 USERCR= -ooojava 23 2 -rcr -ooodebug -squeue
 BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 8000 -garbagestats -joptimize -noloop -optimize -debug #-nooptimize #src-after-pp #-debug
 

diff --git a/Robust/src/Runtime/oooJava/rcr_runtime.c b/Robust/src/Runtime/oooJava/rcr_runtime.c
index fc7c1894487d220df8f6edcca263de72d668ae1b..3887636e5b2a89291b93276bd406625e44c0d524 100644 (file)
--- a/Robust/src/Runtime/oooJava/rcr_runtime.c
+++ b/Robust/src/Runtime/oooJava/rcr_runtime.c
@@ -1,24 +1,41 @@
 #include "trqueue.h"
+#include "coreprof/coreprof.h"
 #include "mlp_runtime.h"
 #include "rcr_runtime.h"
 #include "hashStructure.h"
 #include "structdefs.h"
 #include "RuntimeConflictResolver.h"
 
+
 void * workerTR(void *x) {
   struct trQueue * queue=(struct trQueue *)x;
   allHashStructures=queue->allHashStructures;
+
+  CP_CREATE();
+
   while(1) {
     SESEcommon * tmp;
     do {
       tmp=(SESEcommon *) dequeueTR(queue);
       if (tmp!=NULL) {
+
+#ifdef CP_EVENTID_RCR_TRAVERSE
+    CP_LOGEVENT( CP_EVENTID_RCR_TRAVERSE, CP_EVENTTYPE_BEGIN );
+#endif
        tasktraverse(tmp);
+
+#ifdef CP_EVENTID_RCR_TRAVERSE
+    CP_LOGEVENT( CP_EVENTID_RCR_TRAVERSE, CP_EVENTTYPE_END );
+#endif
+
       } else {
        sched_yield();
       }
     } while(1);
   }
+
+  CP_EXIT();
+
   return NULL;
 }
 

diff --git a/Robust/src/Runtime/oooJava/trqueue.c b/Robust/src/Runtime/oooJava/trqueue.c
index 68ef603f07798c14134af2494336b9fd124b842a..1b63685d434680bfe8952208f839ff56905467eb 100644 (file)
--- a/Robust/src/Runtime/oooJava/trqueue.c
+++ b/Robust/src/Runtime/oooJava/trqueue.c
@@ -6,6 +6,7 @@
 #include "structdefs.h"
 #include "RuntimeConflictResolver.h"
 
+
 struct trQueue * queuelist=NULL;
 pthread_mutex_t queuelock;