projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
straighten out header includes, comment on Forward declarations
[model-checker.git]
/
libthreads.cc
diff --git
a/libthreads.cc
b/libthreads.cc
index 86a95e63f7d83d73f81ac89197102b85ba410eb6..73a948cc4a493a7fa4b3c1bea65af8653c6ebc17 100644
(file)
--- a/
libthreads.cc
+++ b/
libthreads.cc
@@
-13,7
+13,7
@@
int thrd_create(thrd_t *t, void (*start_routine)(), void *arg)
int ret;
DBG();
ret = model->add_thread(new Thread(t, start_routine, arg));
int ret;
DBG();
ret = model->add_thread(new Thread(t, start_routine, arg));
- DEBUG("create thread %d\n",
thrd_to_id(*t
));
+ DEBUG("create thread %d\n",
id_to_int(thrd_to_id(*t)
));
return ret;
}
return ret;
}
@@
-23,8
+23,6
@@
int thrd_join(thrd_t t)
Thread *th = model->get_thread(thrd_to_id(t));
while (th->get_state() != THREAD_COMPLETED && !ret)
ret = model->switch_to_master(NULL);
Thread *th = model->get_thread(thrd_to_id(t));
while (th->get_state() != THREAD_COMPLETED && !ret)
ret = model->switch_to_master(NULL);
- /* seq_cst is just a 'don't care' parameter */
- ret = model->switch_to_master(new ModelAction(THREAD_JOIN, memory_order_seq_cst, NULL, VALUE_NONE));
return ret;
}
return ret;
}