projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes
[model-checker.git]
/
threads.h
diff --git
a/threads.h
b/threads.h
index 490081afe882c41b0bfec641740f43c4e99d90ed..a97a04c704449963981fe443a711c64abc716fb3 100644
(file)
--- a/
threads.h
+++ b/
threads.h
@@
-1,10
+1,16
@@
+/** @file threads.h
+ * @brief Model Checker Thread class.
+ */
+
#ifndef __THREADS_H__
#define __THREADS_H__
#include <ucontext.h>
#ifndef __THREADS_H__
#define __THREADS_H__
#include <ucontext.h>
-
+#include "mymemory.h"
#include "libthreads.h"
#include "libthreads.h"
+typedef int thread_id_t;
+
#define THREAD_ID_T_NONE -1
typedef enum thread_state {
#define THREAD_ID_T_NONE -1
typedef enum thread_state {
@@
-14,12
+20,12
@@
typedef enum thread_state {
THREAD_COMPLETED
} thread_state;
THREAD_COMPLETED
} thread_state;
+class ModelAction;
+
+/** @brief A Thread is created for each user-space thread */
class Thread {
public:
class Thread {
public:
- void * operator new(size_t size);
- void operator delete(void *ptr);
- Thread(thrd_t *t, void (*func)(), void *a);
- Thread(thrd_t *t);
+ Thread(thrd_t *t, void (*func)(void *), void *a);
~Thread();
void complete();
~Thread();
void complete();
@@
-30,10
+36,20
@@
public:
void set_state(thread_state s) { state = s; }
thread_id_t get_id();
thrd_t get_thrd_t() { return *user_thread; }
void set_state(thread_state s) { state = s; }
thread_id_t get_id();
thrd_t get_thrd_t() { return *user_thread; }
+ Thread * get_parent() { return parent; }
+
+ void set_creation(ModelAction *act) { creation = act; }
+ ModelAction * get_creation() { return creation; }
+
+ friend void thread_startup();
+
+ SNAPSHOTALLOC
private:
int create_context();
private:
int create_context();
+ Thread *parent;
+ ModelAction *creation;
- void (*start_routine)();
+ void (*start_routine)(
void *
);
void *arg;
ucontext_t context;
void *stack;
void *arg;
ucontext_t context;
void *stack;
@@
-49,4
+65,14
@@
static inline thread_id_t thrd_to_id(thrd_t t)
return t;
}
return t;
}
+static inline thread_id_t int_to_id(int i)
+{
+ return i;
+}
+
+static inline int id_to_int(thread_id_t id)
+{
+ return id;
+}
+
#endif /* __THREADS_H__ */
#endif /* __THREADS_H__ */