projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rmw example works
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 22430378298aaa60c7755e40be665fe68d1bd275..8593b98f06a186aa7e297cd661219edf1c69c264 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-1,5
+1,5
@@
/** @file model.h
/** @file model.h
- * @brief Core model checker.
+ * @brief Core model checker.
*/
#ifndef __MODEL_H__
*/
#ifndef __MODEL_H__
@@
-13,15
+13,14
@@
#include "schedule.h"
#include "mymemory.h"
#include "schedule.h"
#include "mymemory.h"
-#include <utility>
#include "libthreads.h"
#include "libthreads.h"
-#include "libatomic.h"
#include "threads.h"
#include "action.h"
#include "clockvector.h"
/* Forward declaration */
class NodeStack;
#include "threads.h"
#include "action.h"
#include "clockvector.h"
/* Forward declaration */
class NodeStack;
+class CycleGraph;
/** @brief The central structure for model-checking */
class ModelChecker {
/** @brief The central structure for model-checking */
class ModelChecker {
@@
-30,7
+29,7
@@
public:
~ModelChecker();
/** The scheduler to use: tracks the running/ready Threads */
~ModelChecker();
/** The scheduler to use: tracks the running/ready Threads */
-
class
Scheduler *scheduler;
+ Scheduler *scheduler;
/** Stores the context for the main model-checking system thread (call
* once)
/** Stores the context for the main model-checking system thread (call
* once)
@@
-41,13
+40,6
@@
public:
/** @returns the context for the main model-checking system thread */
ucontext_t * get_system_context(void) { return system_context; }
/** @returns the context for the main model-checking system thread */
ucontext_t * get_system_context(void) { return system_context; }
- /**
- * Stores the ModelAction for the current thread action. Call this
- * immediately before switching from user- to system-context to pass
- * data between them.
- * @param act The ModelAction created by the user-thread action
- */
- void set_current_action(ModelAction *act) { current_action = act; }
void check_current_action(void);
void print_summary(void);
Thread * schedule_next_thread();
void check_current_action(void);
void print_summary(void);
Thread * schedule_next_thread();
@@
-61,8
+53,9
@@
public:
modelclock_t get_next_seq_num();
int switch_to_master(ModelAction *act);
modelclock_t get_next_seq_num();
int switch_to_master(ModelAction *act);
-
+ ClockVector * get_cv(thread_id_t tid);
bool next_execution();
bool next_execution();
+ bool isfeasible();
MEMALLOC
private:
MEMALLOC
private:
@@
-70,6
+63,14
@@
private:
modelclock_t used_sequence_numbers;
int num_executions;
modelclock_t used_sequence_numbers;
int num_executions;
+ /**
+ * Stores the ModelAction for the current thread action. Call this
+ * immediately before switching from user- to system-context to pass
+ * data between them.
+ * @param act The ModelAction created by the user-thread action
+ */
+ void set_current_action(ModelAction *act) { current_action = act; }
+
ModelAction * get_last_conflict(ModelAction *act);
void set_backtracking(ModelAction *act);
thread_id_t get_next_replay_thread();
ModelAction * get_last_conflict(ModelAction *act);
void set_backtracking(ModelAction *act);
thread_id_t get_next_replay_thread();
@@
-79,7
+80,12
@@
private:
void add_action_to_lists(ModelAction *act);
ModelAction * get_last_action(thread_id_t tid);
ModelAction * get_parent_action(thread_id_t tid);
void add_action_to_lists(ModelAction *act);
ModelAction * get_last_action(thread_id_t tid);
ModelAction * get_parent_action(thread_id_t tid);
+ ModelAction * get_last_seq_cst(const void *location);
void build_reads_from_past(ModelAction *curr);
void build_reads_from_past(ModelAction *curr);
+ ModelAction * process_rmw(ModelAction * curr);
+ void r_modification_order(ModelAction * curr, const ModelAction *rf);
+ void w_modification_order(ModelAction * curr);
+
ModelAction *current_action;
ModelAction *diverge;
ModelAction *current_action;
ModelAction *diverge;
@@
-87,11
+93,17
@@
private:
ucontext_t *system_context;
action_list_t *action_trace;
ucontext_t *system_context;
action_list_t *action_trace;
- std::map<int, class Thread *> *thread_map;
+ std::map<int, Thread *> *thread_map;
+
+ /** Per-object list of actions. Maps an object (i.e., memory location)
+ * to a trace of all actions performed on the object. */
+ std::map<const void *, action_list_t> *obj_map;
+
std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
std::vector<ModelAction *> *thrd_last_action;
std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
std::vector<ModelAction *> *thrd_last_action;
-
class
NodeStack *node_stack;
+ NodeStack *node_stack;
ModelAction *next_backtrack;
ModelAction *next_backtrack;
+ CycleGraph * cyclegraph;
};
extern ModelChecker *model;
};
extern ModelChecker *model;