#include <string.h>
#include <threads.h>
-#include <mutex>
+#include "mutex.h"
#include "common.h"
#include "threads-model.h"
#include "action.h"
model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
/* Call the actual thread function */
- if ( !curr_thread->start_routine )
+ if (curr_thread->start_routine != NULL) {
curr_thread->start_routine(curr_thread->arg);
- else
- curr_thread->pstart_routine(curr_thread->arg);
+ } else if (curr_thread->pstart_routine != NULL) {
+ // set pthread return value
+ void *retval = curr_thread->pstart_routine(curr_thread->arg);
+ curr_thread->set_pthread_return(retval);
+ }
/* Finish thread properly */
model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
}
stack(NULL),
user_thread(NULL),
id(tid),
- state(THREAD_READY), /* Thread is always ready? */
+ state(THREAD_READY), /* Thread is always ready? */
last_action_val(0),
model_thread(true)
{
creation(NULL),
pending(NULL),
start_routine(func),
+ pstart_routine(NULL),
arg(a),
user_thread(t),
id(tid),
if (ret)
model_print("Error in create_context\n");
- user_thread->priv = this;
+ user_thread->priv = this; // WL
}
-/**
- * to be modified
- * Construct a new thread for pthread_create.
+/**
+ * Construct a new thread for pthread.
* @param t The thread identifier of the newly created thread.
* @param func The function that the thread will call.
* @param a The parameter to pass to this function.
*/
-Thread::Thread(thread_id_t tid, thrd_t *t, void* (*func)(void *), void *a, Thread *parent) :
+Thread::Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent) :
parent(parent),
creation(NULL),
pending(NULL),
ret = create_context();
if (ret)
model_print("Error in create_context\n");
-
- user_thread->priv = this;
}
+
/** Destructor */
Thread::~Thread()
{
if (pending->get_type() == THREAD_JOIN)
return pending->get_thread_operand();
- else if (pending->get_type() == PTHREAD_JOIN) {
- // WL: to be added
- }
+ else if (pending->get_type() == PTHREAD_JOIN)
+ return pending->get_thread_operand();
else if (pending->is_lock())
return (Thread *)pending->get_mutex()->get_state()->locked;
return NULL;
bool Thread::is_waiting_on(const Thread *t) const
{
Thread *wait;
- for (wait = waiting_on(); wait != NULL; wait = wait->waiting_on())
+ for (wait = waiting_on();wait != NULL;wait = wait->waiting_on())
if (wait == t)
return true;
return false;