projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
create enumeration for enabled information...switch from bools to the enumeration
[model-checker.git]
/
threads.h
diff --git
a/threads.h
b/threads.h
index 248d948fe98c87863741d4ed94343ee22d9cef5e..a379494d43bd93ee78dea0f3f0bb98dcd0af60a4 100644
(file)
--- a/
threads.h
+++ b/
threads.h
@@
-11,10
+11,7
@@
#include "mymemory.h"
#include "libthreads.h"
#include "mymemory.h"
#include "libthreads.h"
-
-typedef int thread_id_t;
-
-#define THREAD_ID_T_NONE -1
+#include "modeltypes.h"
/** @brief Represents the state of a user Thread */
typedef enum thread_state {
/** @brief Represents the state of a user Thread */
typedef enum thread_state {
@@
-79,17
+76,27
@@
public:
bool wait_list_empty() { return wait_list.empty(); }
/**
bool wait_list_empty() { return wait_list.empty(); }
/**
- * Add a
thread
to the waiting list for this thread.
- * @param t The
Thread to add
+ * Add a
ModelAction
to the waiting list for this thread.
+ * @param t The
ModelAction to add. Must be a JOIN.
*/
*/
- void push_wait_list(Thread *t) { wait_list.push_back(t); }
+ void push_wait_list(ModelAction *act) { wait_list.push_back(act); }
+
+ unsigned int num_wait_list() {
+ return wait_list.size();
+ }
+
+ ModelAction * get_waiter(unsigned int i) {
+ return wait_list[i];
+ }
+ ModelAction * get_pending() { return pending; }
+ void set_pending(ModelAction *act) { pending = act; }
/**
/**
- * Remove one
Thread
from the waiting list
- * @return The
Thread
that was removed from the waiting list
+ * Remove one
ModelAction
from the waiting list
+ * @return The
ModelAction
that was removed from the waiting list
*/
*/
-
Thread
* pop_wait_list() {
-
Thread
*ret = wait_list.front();
+
ModelAction
* pop_wait_list() {
+
ModelAction
*ret = wait_list.front();
wait_list.pop_back();
return ret;
}
wait_list.pop_back();
return ret;
}
@@
-102,6
+109,7
@@
private:
Thread *parent;
ModelAction *creation;
Thread *parent;
ModelAction *creation;
+ ModelAction *pending;
void (*start_routine)(void *);
void *arg;
ucontext_t context;
void (*start_routine)(void *);
void *arg;
ucontext_t context;
@@
-111,11
+119,11
@@
private:
thread_state state;
/**
thread_state state;
/**
- * A list of
Threads waiting on this Thread. Particularly, this list
is
- *
used for thread joins, where another Thread waits for this Thread to
- * complete
+ * A list of
ModelActions waiting on this Thread. Particularly, th
is
+ *
list is used for thread joins, where another Thread waits for this
+ *
Thread to
complete
*/
*/
- std::vector<
Thread
*> wait_list;
+ std::vector<
ModelAction
*> wait_list;
/**
* The value returned by the last action in this thread
/**
* The value returned by the last action in this thread