#include <string.h>
#include <threads.h>
+#include <mutex>
#include "common.h"
#include "threads-model.h"
+#include "action.h"
/* global "model" object */
#include "model.h"
/** Allocate a stack for a new thread. */
static void * stack_allocate(size_t size)
{
- return snapshot_malloc(size);
+ return Thread_malloc(size);
}
/** Free a stack for a terminated thread. */
static void stack_free(void *stack)
{
- snapshot_free(stack);
+ Thread_free(stack);
}
/**
/* Call the actual thread function */
curr_thread->start_routine(curr_thread->arg);
-
/* Finish thread properly */
model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, curr_thread));
}
int Thread::swap(Thread *t, ucontext_t *ctxt)
{
t->set_state(THREAD_READY);
- return swapcontext(&t->context, ctxt);
+ return model_swapcontext(&t->context, ctxt);
}
/**
int Thread::swap(ucontext_t *ctxt, Thread *t)
{
t->set_state(THREAD_RUNNING);
- return swapcontext(ctxt, &t->context);
+ return model_swapcontext(ctxt, &t->context);
}
user_thread(NULL),
id(tid),
state(THREAD_READY), /* Thread is always ready? */
- wait_list(),
last_action_val(0),
model_thread(true)
{
* @param func The function that the thread will call.
* @param a The parameter to pass to this function.
*/
-Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
+Thread::Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent) :
+ parent(parent),
creation(NULL),
pending(NULL),
start_routine(func),
arg(a),
user_thread(t),
+ id(tid),
state(THREAD_CREATED),
- wait_list(),
last_action_val(VALUE_NONE),
model_thread(false)
{
if (ret)
model_print("Error in create_context\n");
- id = model->get_next_id();
- user_thread->priv = this;
- parent = thread_current();
+ // user_thread->priv = this; // WL
+}
+
+/**
+ * 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) :
+ parent(parent),
+ creation(NULL),
+ pending(NULL),
+ start_routine(NULL),
+ pstart_routine(func),
+ arg(a),
+ user_thread(t),
+ id(tid),
+ state(THREAD_CREATED),
+ last_action_val(VALUE_NONE),
+ model_thread(false)
+{
+ int ret;
+
+ /* Initialize state */
+ ret = create_context();
+ if (ret)
+ model_print("Error in create_context\n");
}
+
/** Destructor */
Thread::~Thread()
{
if (!is_complete())
complete();
- model->remove_thread(this);
}
/** @return The thread_id_t corresponding to this Thread object. */
ASSERT(s == THREAD_COMPLETED || state != THREAD_COMPLETED);
state = s;
}
+
+/**
+ * Get the Thread that this Thread is immediately waiting on
+ * @return The thread we are waiting on, if any; otherwise NULL
+ */
+Thread * Thread::waiting_on() const
+{
+ if (!pending)
+ return NULL;
+
+ 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->is_lock())
+ return (Thread *)pending->get_mutex()->get_state()->locked;
+ return NULL;
+}
+
+/**
+ * Check if this Thread is waiting (blocking) on a given Thread, directly or
+ * indirectly (via a chain of waiting threads)
+ *
+ * @param t The Thread on which we may be waiting
+ * @return True if we are waiting on Thread t; false otherwise
+ */
+bool Thread::is_waiting_on(const Thread *t) const
+{
+ Thread *wait;
+ for (wait = waiting_on(); wait != NULL; wait = wait->waiting_on())
+ if (wait == t)
+ return true;
+ return false;
+}