projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean out includes, etc.
[c11tester.git]
/
libthreads.cc
diff --git
a/libthreads.cc
b/libthreads.cc
index a414686dccb713116bad22a1e6126f590b72cc7b..75d1910718db8f1f594213072582be48b2c35ee3 100644
(file)
--- a/
libthreads.cc
+++ b/
libthreads.cc
@@
-1,6
+1,7
@@
-#include
"libthreads.h"
+#include
<threads.h>
#include "common.h"
#include "common.h"
-#include "threads.h"
+#include "threads-model.h"
+#include "action.h"
/* global "model" object */
#include "model.h"
/* global "model" object */
#include "model.h"
@@
-10,30
+11,23
@@
*/
int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
{
*/
int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
{
- Thread *thread;
- int ret;
- DBG();
- thread = new Thread(t, start_routine, arg);
- ret = model->add_thread(thread);
- DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
+ struct thread_params params = { start_routine, arg };
/* seq_cst is just a 'don't care' parameter */
/* seq_cst is just a 'don't care' parameter */
- model->switch_to_master(new ModelAction(THREAD_CREATE,
memory_order_seq_cst, thread, VALUE_NONE
));
- return
ret
;
+ model->switch_to_master(new ModelAction(THREAD_CREATE,
std::memory_order_seq_cst, t, (uint64_t)¶ms
));
+ return
0
;
}
int thrd_join(thrd_t t)
{
}
int thrd_join(thrd_t t)
{
- int ret = 0;
- Thread *th = model->get_thread(thrd_to_id(t));
- while (th->get_state() != THREAD_COMPLETED && !ret)
- ret = model->switch_to_master(NULL);
- return ret;
+ Thread *th = t.priv;
+ model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(thrd_to_id(t))));
+ return 0;
}
}
-int thrd_yield(void)
+/** A no-op, for now */
+void thrd_yield(void)
{
{
- /* seq_cst is just a 'don't care' parameter */
- return model->switch_to_master(new ModelAction(THREAD_YIELD, memory_order_seq_cst, NULL, VALUE_NONE));
+ model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE));
}
thrd_t thrd_current(void)
}
thrd_t thrd_current(void)