fix some allocation/free bugs when we put non objects into table...

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index b6eaee4ea18cb511b9d4e37edc78814669e152c8..399472c9ac60b5b578ea0af88ea05bcf7da06c9f 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -1,3 +1,8 @@
+/** @file threads.cc
+ *  @brief Thread functions.
+ */
+
+
 #include "libthreads.h"
 #include "common.h"
 #include "threads.h"
@@ -23,10 +28,21 @@ Thread * thread_current(void)
        return model->scheduler->get_current_thread();
 }
 
-/* This method just gets around makecontext not being 64-bit clean */
+/**
+ * Provides a startup wrapper for each thread, allowing some initial
+ * model-checking data to be recorded. This method also gets around makecontext
+ * not being 64-bit clean
+ * @todo We should make the START event always immediately follow the
+ * CREATE event, so we don't get redundant traces...
+ */
 
 void thread_startup() {
        Thread * curr_thread = thread_current();
+
+       /* Add dummy "start" action, just to create a first clock vector */
+       model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
+
+       /* Call the actual thread function */
        curr_thread->start_routine(curr_thread->arg);
 }
 
@@ -70,20 +86,19 @@ void Thread::complete()
 }
 
 Thread::Thread(thrd_t *t, void (*func)(void *), void *a) :
+       start_routine(func),
+       arg(a),
+       user_thread(t),
+       state(THREAD_CREATED),
        last_action_val(VALUE_NONE)
 {
        int ret;
 
-       user_thread = t;
-       start_routine = func;
-       arg = a;
-
        /* Initialize state */
        ret = create_context();
        if (ret)
                printf("Error in create_context\n");
 
-       state = THREAD_CREATED;
        id = model->get_next_id();
        *user_thread = id;
        parent = thread_current();