projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some boring fixes (mainly protection against spurious wakeups from cond_wait)
[cacao.git]
/
threads
/
nativethread.h
diff --git
a/threads/nativethread.h
b/threads/nativethread.h
index 229414b447b23acd3fa34fbfaecdbdd7445fff11..db55fa4e041d6ff8b020277b804e5fc82379aaa6 100644
(file)
--- a/
threads/nativethread.h
+++ b/
threads/nativethread.h
@@
-25,8
+25,8
@@
typedef struct _monitorLockRecord {
struct _monitorLockRecord *waiter, *incharge;
bool waiting;
sem_t queueSem;
struct _monitorLockRecord *waiter, *incharge;
bool waiting;
sem_t queueSem;
- pthread_mutex_t resolveLock
, waitLock
;
- pthread_cond_t resolveWait
, waitCond
;
+ pthread_mutex_t resolveLock;
+ pthread_cond_t resolveWait;
} monitorLockRecord;
struct _lockRecordPool;
} monitorLockRecord;
struct _lockRecordPool;
@@
-68,8
+68,9
@@
typedef struct _threadobject {
nativethread info;
ExecEnvironment ee;
nativethread info;
ExecEnvironment ee;
- long interrupted;
- monitorLockRecord *waiting;
+ pthread_mutex_t waitLock;
+ pthread_cond_t waitCond;
+ bool interrupted, signaled, isSleeping;
} threadobject;
monitorLockRecord *monitorEnter(threadobject *, java_objectheader *);
} threadobject;
monitorLockRecord *monitorEnter(threadobject *, java_objectheader *);