projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bb1dc9a
)
fix compile
author
bdemsky
<bdemsky>
Tue, 7 Apr 2009 06:43:05 +0000
(06:43 +0000)
committer
bdemsky
<bdemsky>
Tue, 7 Apr 2009 06:43:05 +0000
(06:43 +0000)
Robust/src/Runtime/garbage.c
patch
|
blob
|
history
Robust/src/Runtime/garbage.h
patch
|
blob
|
history
diff --git
a/Robust/src/Runtime/garbage.c
b/Robust/src/Runtime/garbage.c
index 539119e21d3ba9717c9ca3f966ac03d240b15e22..61e56d92d1840025f105ebb50674c3455d4d1c94 100644
(file)
--- a/
Robust/src/Runtime/garbage.c
+++ b/
Robust/src/Runtime/garbage.c
@@
-197,8
+197,10
@@
void collect(struct garbagelist * stackptr) {
#if defined(THREADS)||defined(DSTM)||defined(STM)
/* Go to next thread */
if (listptr!=NULL) {
+#ifdef THREADS
void * orig=listptr->locklist;
ENQUEUE(orig, listptr->locklist);
+#endif
stackptr=listptr->stackptr;
listptr=listptr->next;
} else
@@
-474,7
+476,9
@@
struct listitem * stopforgc(struct garbagelist * ptr) {
void restartaftergc(struct listitem * litem) {
pthread_mutex_lock(&gclistlock);
+#ifdef THREADS
pthread_setspecific(threadlocks, litem->locklist);
+#endif
if (litem->prev==NULL) {
list=litem->next;
} else {
diff --git
a/Robust/src/Runtime/garbage.h
b/Robust/src/Runtime/garbage.h
index 41ec5ea1db2125d0c7efe8eb467592fcb5fe8b77..cfe607302d67f93b5607a51e35dd48f7e8ab3bae 100644
(file)
--- a/
Robust/src/Runtime/garbage.h
+++ b/
Robust/src/Runtime/garbage.h
@@
-1,5
+1,8
@@
#ifndef GARBAGE_H
#define GARBAGE_H
+#ifdef STM
+#include "clookup.h"
+#endif
struct garbagelist {
int size;
struct garbagelist *next;