projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eec1b63
)
add NOLOCK back in
author
bdemsky
<bdemsky>
Fri, 27 May 2011 21:53:59 +0000
(21:53 +0000)
committer
bdemsky
<bdemsky>
Fri, 27 May 2011 21:53:59 +0000
(21:53 +0000)
Robust/src/Runtime/object.c
patch
|
blob
|
history
diff --git
a/Robust/src/Runtime/object.c
b/Robust/src/Runtime/object.c
index 25fa5869d23340ec49783c94971b2f8a630dccdd..d9b775b49fa56d053efd726ebed4d193e6f279bf 100644
(file)
--- a/
Robust/src/Runtime/object.c
+++ b/
Robust/src/Runtime/object.c
@@
-37,6
+37,7
@@
int CALL01(___Object______getType____, struct ___Object___ * ___this___) {
#ifdef THREADS
#ifdef D___Object______MonitorEnter____
void CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
#ifdef THREADS
#ifdef D___Object______MonitorEnter____
void CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
+#ifndef NOLOCK
#ifdef MAC
struct lockvector *lptr=(struct lockvector *)pthread_getspecific(threadlocks);
int self=(int)(long)pthread_getspecific(macthreadid);
#ifdef MAC
struct lockvector *lptr=(struct lockvector *)pthread_getspecific(threadlocks);
int self=(int)(long)pthread_getspecific(macthreadid);
@@
-65,6
+66,7
@@
void CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
}
}
}
}
}
}
+#endif
}
#endif
}
#endif
@@
-117,6
+119,7
@@
void CALL01(___Object______wait____, struct ___Object___ * ___this___) {
#ifdef D___Object______MonitorExit____
void CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
#ifdef D___Object______MonitorExit____
void CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
+#ifndef NOLOCK
#ifdef MAC
struct lockvector *lptr=(struct lockvector *)pthread_getspecific(threadlocks);
#else
#ifdef MAC
struct lockvector *lptr=(struct lockvector *)pthread_getspecific(threadlocks);
#else
@@
-128,6
+131,7
@@
void CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
MBARRIER();
lpair->object->tid=0;
}
MBARRIER();
lpair->object->tid=0;
}
+#endif
}
#endif
#endif
}
#endif
#endif