projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mymemory: make snapshot_{malloc,calloc,free} externally linkable
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 47f5139ba1b82ebe63c804b32945bffd31325bd0..a2d33432de948e4bc64b48ca6d7c1c7596f1a20f 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-18,6
+18,7
@@
#include "clockvector.h"
#include "hashtable.h"
#include "workqueue.h"
#include "clockvector.h"
#include "hashtable.h"
#include "workqueue.h"
+#include "config.h"
/* Forward declaration */
class NodeStack;
/* Forward declaration */
class NodeStack;
@@
-34,6
+35,8
@@
typedef std::vector< const ModelAction *, MyAlloc<const ModelAction *> > rel_hea
struct model_params {
int maxreads;
int maxfuturedelay;
struct model_params {
int maxreads;
int maxfuturedelay;
+ unsigned int fairwindow;
+ unsigned int enabledcount;
};
struct PendingFutureValue {
};
struct PendingFutureValue {
@@
-64,6
+67,9
@@
public:
/** Prints an execution summary with trace information. */
void print_summary();
/** Prints an execution summary with trace information. */
void print_summary();
+#if SUPPORT_MOD_ORDER_DUMP
+ void dumpGraph(char *filename);
+#endif
void add_thread(Thread *t);
void remove_thread(Thread *t);
void add_thread(Thread *t);
void remove_thread(Thread *t);
@@
-72,7
+78,6
@@
public:
thread_id_t get_next_id();
int get_num_threads();
thread_id_t get_next_id();
int get_num_threads();
- modelclock_t get_next_seq_num();
/** @return The currently executing Thread. */
Thread * get_current_thread() { return scheduler->get_current_thread(); }
/** @return The currently executing Thread. */
Thread * get_current_thread() { return scheduler->get_current_thread(); }
@@
-90,6
+95,12
@@
public:
bool isfeasibleprefix();
void set_assert() {asserted=true;}
bool isfeasibleprefix();
void set_assert() {asserted=true;}
+ /** @brief Alert the model-checker that an incorrectly-ordered
+ * synchronization was made */
+ void set_bad_synchronization() { bad_synchronization = true; }
+
+ const model_params params;
+
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
@@
-101,7
+112,8
@@
private:
int num_executions;
int num_feasible_executions;
bool promises_expired();
int num_executions;
int num_feasible_executions;
bool promises_expired();
- const model_params params;
+
+ modelclock_t get_next_seq_num();
/**
* Stores the ModelAction for the current thread action. Call this
/**
* Stores the ModelAction for the current thread action. Call this
@@
-114,12
+126,13
@@
private:
ModelAction * initialize_curr_action(ModelAction *curr);
bool process_read(ModelAction *curr, bool second_part_of_rmw);
bool process_write(ModelAction *curr);
ModelAction * initialize_curr_action(ModelAction *curr);
bool process_read(ModelAction *curr, bool second_part_of_rmw);
bool process_write(ModelAction *curr);
- void process_mutex(ModelAction *curr);
+ bool process_mutex(ModelAction *curr);
+ bool process_thread_action(ModelAction *curr);
bool check_action_enabled(ModelAction *curr);
bool take_step();
bool check_action_enabled(ModelAction *curr);
bool take_step();
- void check_recency(ModelAction *curr);
+ void check_recency(ModelAction *curr
, const ModelAction *rf
);
ModelAction * get_last_conflict(ModelAction *act);
void set_backtracking(ModelAction *act);
Thread * get_next_thread(ModelAction *curr);
ModelAction * get_last_conflict(ModelAction *act);
void set_backtracking(ModelAction *act);
Thread * get_next_thread(ModelAction *curr);
@@
-143,6
+156,7
@@
private:
void do_complete_join(ModelAction *join);
ModelAction *diverge;
void do_complete_join(ModelAction *join);
ModelAction *diverge;
+ ModelAction *earliest_diverge;
ucontext_t system_context;
action_list_t *action_trace;
ucontext_t system_context;
action_list_t *action_trace;
@@
-193,6
+207,8
@@
private:
bool failed_promise;
bool too_many_reads;
bool asserted;
bool failed_promise;
bool too_many_reads;
bool asserted;
+ /** @brief Incorrectly-ordered synchronization was made */
+ bool bad_synchronization;
};
extern ModelChecker *model;
};
extern ModelChecker *model;