projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
threads/model: allocate Thread from w/in ModelChecker
[model-checker.git]
/
libthreads.cc
diff --git
a/libthreads.cc
b/libthreads.cc
index 4d6a0243c53b7fe880952747236bd8327c04a108..0a5699695f9e856f413bddec9714751a0313c99d 100644
(file)
--- a/
libthreads.cc
+++ b/
libthreads.cc
@@
-1,6
+1,6
@@
-#include
"libthreads.h"
+#include
<threads.h>
#include "common.h"
#include "common.h"
-#include "threads.h"
+#include "threads
-model
.h"
/* global "model" object */
#include "model.h"
/* global "model" object */
#include "model.h"
@@
-10,27
+10,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;
- DBG();
- thread = new Thread(t, start_routine, arg);
- 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, std::memory_order_seq_cst, t
hread, VALUE_NONE
));
+ 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)
{
return 0;
}
int thrd_join(thrd_t t)
{
- Thread *th =
model->get_thread(thrd_to_id(t))
;
- model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th,
thrd_to_id(t
)));
+ 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;
}
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, std::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)