threads_internal: pass the current 'action' to the internal thread system

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 858b9198bccc2fea775d3870970c9f4a0e19ef7e..88d5ce32e21195d7106c291220d4eb2af7bb80a0 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -1,7 +1,7 @@
+#include <stdio.h>
+
 #include "model.h"
 #include "schedule.h"
-#include <stdlib.h>
-#include <string.h>
 
 ModelChecker *model;
 
@@ -9,17 +9,15 @@ ModelChecker::ModelChecker()
 {
        /* First thread created (system_thread) will have id 1 */
        this->used_thread_id = 0;
+       /* Initialize default scheduler */
+       this->scheduler = new DefaultScheduler();
 
-       scheduler_init(this);
+       this->current_action = NULL;
 }
 
 ModelChecker::~ModelChecker()
 {
-       struct scheduler *sched = model->scheduler;
-
-       if (sched->exit)
-               sched->exit();
-       free(sched);
+       delete this->scheduler;
 }
 
 void ModelChecker::assign_id(struct thread *t)
@@ -29,5 +27,43 @@ void ModelChecker::assign_id(struct thread *t)
 
 void ModelChecker::add_system_thread(struct thread *t)
 {
-       model->system_thread = t;
+       this->system_thread = t;
+}
+
+ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value)
+{
+       struct thread *t = thread_current();
+       ModelAction *act = this;
+
+       act->type = type;
+       act->order = order;
+       act->location = loc;
+       act->tid = t->id;
+       act->value = value;
+}
+
+void ModelAction::print(void)
+{
+       const char *type_str;
+       switch (this->type) {
+       case THREAD_CREATE:
+               type_str = "thread create";
+               break;
+       case THREAD_YIELD:
+               type_str = "thread yield";
+               break;
+       case THREAD_JOIN:
+               type_str = "thread join";
+               break;
+       case ATOMIC_READ:
+               type_str = "atomic read";
+               break;
+       case ATOMIC_WRITE:
+               type_str = "atomic write";
+               break;
+       default:
+               type_str = "unknown type";
+       }
+
+       printf("Thread: %d\tAction: %s\tMO: %d\tLoc: %#014zx\tValue: %d\n", tid, type_str, order, (size_t)location, value);
 }