bug fixes

diff --git a/Robust/src/Runtime/STM/monitor.h b/Robust/src/Runtime/STM/monitor.h
index 588795cfdb3bf83db1b5ec192d2476af22815a04..0e75bfb7d52c2401e7c315a5383c5993e08f098c 100644 (file)
--- a/Robust/src/Runtime/STM/monitor.h
+++ b/Robust/src/Runtime/STM/monitor.h
@@ -3,9 +3,8 @@
 
 #define MAXEVENTS (1024*1024*128)
 
-
 #define EV_THREAD 0
-#define EV_BARRIER 1
+#define EV_ENTERBARRIER 1
 #define EV_READ 2
 #define EV_WRITE 3
 #define EV_START 4
@@ -13,6 +12,7 @@
 #define EV_ABORT 6
 #define EV_ARRAYREAD 7
 #define EV_ARRAYWRITE 8
+#define EV_EXITBARRIER 9
 
 struct eventmonitor {
   int index;

diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index 83d221e6f25e1c8f836f908448240e6821909976..f9eaf0c894bb7a4069d911a7e985741f03ff55e8 100644 (file)
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -413,6 +413,9 @@ void CALL11(___Barrier______setBarrier____I, int nthreads, int nthreads) {
 void CALL00(___Barrier______enterBarrier____) {
   // Synchronization point
   int ret;
+#ifdef EVENTMONITOR
+  EVLOGEVENT(EV_ENTERBARRIER);
+#endif
 #ifdef PRECISE_GC
   stopforgc((struct garbagelist *)___params___);
 #endif
@@ -425,7 +428,7 @@ void CALL00(___Barrier______enterBarrier____) {
     exit(-1);
   }
 #ifdef EVENTMONITOR
-  EVLOGEVENT(EV_BARRIER);
+  EVLOGEVENT(EV_EXITBARRIER);
 #endif
 }
 #endif