From: bdemsky <bdemsky>
Date: Mon, 4 Jan 2010 05:09:39 +0000 (+0000)
Subject: bug fixes
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=663288be75f9ec16574b3e006d40faef155f59e0;p=IRC.git

bug fixes
---

diff --git a/Robust/src/Runtime/STM/monitor.h b/Robust/src/Runtime/STM/monitor.h
index 588795cf..0e75bfb7 100644
--- 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 83d221e6..f9eaf0c8 100644
--- 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