#include "libthreads.h"
#include "common.h"
-#include "threads_internal.h"
+#include "threads.h"
/* global "model" object */
#include "model.h"
/*
* User program API functions
*/
-int thrd_create(thrd_t *t, void (*start_routine)(), void *arg)
+int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
{
- int ret;
+ Thread *thread;
DBG();
- ret = model->add_thread(new Thread(t, start_routine, arg));
- DEBUG("create thread %d\n", thrd_to_id(*t));
- return ret;
+ thread = new Thread(t, start_routine, arg);
+ model->add_thread(thread);
+ DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
+ /* seq_cst is just a 'don't care' parameter */
+ model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, thread, VALUE_NONE));
+ return 0;
}
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)
- /* 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;
+ model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, thrd_to_id(t)));
+ return 0;
}
int 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));
+ return model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, NULL, VALUE_NONE));
}
thrd_t thrd_current(void)