projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cyclegraph: improve comments, use initializer list
[c11tester.git]
/
model.h
diff --git
a/model.h
b/model.h
index 2093bf4b19cb31579d2b5e1040bcdb3ce55eb63c..dc6ef6add21045042ed42a29882e3ad9a38ac34e 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-6,7
+6,6
@@
#define __MODEL_H__
#include <list>
#define __MODEL_H__
#include <list>
-#include <map>
#include <vector>
#include <cstddef>
#include <ucontext.h>
#include <vector>
#include <cstddef>
#include <ucontext.h>
@@
-14,18
+13,27
@@
#include "schedule.h"
#include "mymemory.h"
#include "libthreads.h"
#include "schedule.h"
#include "mymemory.h"
#include "libthreads.h"
-#include "libatomic.h"
#include "threads.h"
#include "action.h"
#include "clockvector.h"
#include "threads.h"
#include "action.h"
#include "clockvector.h"
+#include "hashtable.h"
/* Forward declaration */
class NodeStack;
/* Forward declaration */
class NodeStack;
+class CycleGraph;
+class Promise;
+
+/**
+ * Model checker parameter structure. Holds run-time configuration options for
+ * the model checker.
+ */
+struct model_params {
+};
/** @brief The central structure for model-checking */
class ModelChecker {
public:
/** @brief The central structure for model-checking */
class ModelChecker {
public:
- ModelChecker();
+ ModelChecker(
struct model_params params
);
~ModelChecker();
/** The scheduler to use: tracks the running/ready Threads */
~ModelChecker();
/** The scheduler to use: tracks the running/ready Threads */
@@
-41,12
+49,15
@@
public:
ucontext_t * get_system_context(void) { return system_context; }
void check_current_action(void);
ucontext_t * get_system_context(void) { return system_context; }
void check_current_action(void);
- void print_summary(void);
+
+ /** Prints an execution summary with trace information. */
+ void print_summary();
+
Thread * schedule_next_thread();
int add_thread(Thread *t);
void remove_thread(Thread *t);
Thread * schedule_next_thread();
int add_thread(Thread *t);
void remove_thread(Thread *t);
- Thread * get_thread(thread_id_t tid) { return
(*thread_map)[id_to_int(tid)]
; }
+ Thread * get_thread(thread_id_t tid) { return
thread_map->get(id_to_int(tid))
; }
thread_id_t get_next_id();
int get_num_threads();
thread_id_t get_next_id();
int get_num_threads();
@@
-55,6
+66,9
@@
public:
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
bool next_execution();
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
bool next_execution();
+ bool isfeasible();
+ bool isfinalfeasible();
+ void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
MEMALLOC
private:
MEMALLOC
private:
@@
-62,6
+76,8
@@
private:
modelclock_t used_sequence_numbers;
int num_executions;
modelclock_t used_sequence_numbers;
int num_executions;
+ const model_params params;
+
/**
* Stores the ModelAction for the current thread action. Call this
* immediately before switching from user- to system-context to pass
/**
* Stores the ModelAction for the current thread action. Call this
* immediately before switching from user- to system-context to pass
@@
-75,12
+91,18
@@
private:
thread_id_t get_next_replay_thread();
ModelAction * get_next_backtrack();
void reset_to_initial_state();
thread_id_t get_next_replay_thread();
ModelAction * get_next_backtrack();
void reset_to_initial_state();
+ void resolve_promises(ModelAction *curr);
+ void compute_promises(ModelAction *curr);
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 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);
+ ModelAction * process_rmw(ModelAction * curr);
+ void post_r_modification_order(ModelAction * curr, const ModelAction *rf);
+ 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;
@@
-88,16
+110,19
@@
private:
ucontext_t *system_context;
action_list_t *action_trace;
ucontext_t *system_context;
action_list_t *action_trace;
-
std::map<int, Thread *
> *thread_map;
+
HashTable<int, Thread *, int
> *thread_map;
/** Per-object list of actions. Maps an object (i.e., memory location)
* to a trace of all actions performed on the object. */
/** 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;
+
HashTable<const void *, action_list_t, uintptr_t, 4
> *obj_map;
- std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
+ HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
+ std::vector<Promise *> * promises;
std::vector<ModelAction *> *thrd_last_action;
NodeStack *node_stack;
ModelAction *next_backtrack;
std::vector<ModelAction *> *thrd_last_action;
NodeStack *node_stack;
ModelAction *next_backtrack;
+ CycleGraph * cyclegraph;
+ bool failed_promise;
};
extern ModelChecker *model;
};
extern ModelChecker *model;