projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up printing a little for cycle cases...
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 07879cdbfbfe90cbbfedc077a803ae109db6c76e..b5c7c30520cb7138cb4219bf8c35a21a6c69d0ab 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-6,7
+6,6
@@
#define __MODEL_H__
#include <cstddef>
#define __MODEL_H__
#include <cstddef>
-#include <ucontext.h>
#include <inttypes.h>
#include "mymemory.h"
#include <inttypes.h>
#include "mymemory.h"
@@
-15,6
+14,7
@@
#include "config.h"
#include "modeltypes.h"
#include "stl-model.h"
#include "config.h"
#include "modeltypes.h"
#include "stl-model.h"
+#include "context.h"
/* Forward declaration */
class Node;
/* Forward declaration */
class Node;
@@
-24,11
+24,11
@@
class Promise;
class Scheduler;
class Thread;
class ClockVector;
class Scheduler;
class Thread;
class ClockVector;
+class Trace_Analysis;
struct model_snapshot_members;
/** @brief Shorthand for a list of release sequence heads */
typedef ModelVector<const ModelAction *> rel_heads_list_t;
struct model_snapshot_members;
/** @brief Shorthand for a list of release sequence heads */
typedef ModelVector<const ModelAction *> rel_heads_list_t;
-
typedef SnapList<ModelAction *> action_list_t;
/**
typedef SnapList<ModelAction *> action_list_t;
/**
@@
-39,6
+39,7
@@
struct model_params {
int maxreads;
int maxfuturedelay;
bool yieldon;
int maxreads;
int maxfuturedelay;
bool yieldon;
+ bool sc_trace_analysis;
unsigned int fairwindow;
unsigned int enabledcount;
unsigned int bound;
unsigned int fairwindow;
unsigned int enabledcount;
unsigned int bound;
@@
-73,9
+74,11
@@
struct execution_stats {
};
struct PendingFutureValue {
};
struct PendingFutureValue {
- PendingFutureValue(ModelAction *writer, ModelAction *act) : writer(writer), act(act) { }
+ PendingFutureValue(ModelAction *writer, ModelAction *reader) :
+ writer(writer), reader(reader)
+ { }
const ModelAction *writer;
const ModelAction *writer;
- ModelAction *
act
;
+ ModelAction *
reader
;
};
/** @brief Records information regarding a single pending release sequence */
};
/** @brief Records information regarding a single pending release sequence */
@@
-130,11
+133,17
@@
public:
void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
bool isfeasibleprefix() const;
void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
bool isfeasibleprefix() const;
- bool assert_bug(const char *msg);
+ bool assert_bug(const char *msg
, ...
);
void assert_user_bug(const char *msg);
const model_params params;
Node * get_curr_node() const;
void assert_user_bug(const char *msg);
const model_params params;
Node * get_curr_node() const;
+ void add_trace_analysis(Trace_Analysis * a) {
+ trace_analyses->push_back(a);
+ }
+
+ action_list_t * get_actions_on_obj(void * obj, thread_id_t tid);
+ ModelAction * get_last_action(thread_id_t tid) const;
MEMALLOC
private:
MEMALLOC
private:
@@
-144,8
+153,9
@@
private:
void add_thread(Thread *t);
bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
void add_thread(Thread *t);
bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
- bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
+ bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader)
const
;
bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
+ bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const;
bool has_asserted() const;
void set_assert();
void set_bad_synchronization();
bool has_asserted() const;
void set_assert();
void set_bad_synchronization();
@@
-168,6
+178,7
@@
private:
bool check_action_enabled(ModelAction *curr);
Thread * take_step(ModelAction *curr);
bool check_action_enabled(ModelAction *curr);
Thread * take_step(ModelAction *curr);
+ bool should_terminate_execution();
template <typename T>
bool check_recency(ModelAction *curr, const T *rf) const;
template <typename T>
bool check_recency(ModelAction *curr, const T *rf) const;
@@
-193,7
+204,6
@@
private:
void check_curr_backtracking(ModelAction *curr);
void add_action_to_lists(ModelAction *act);
void check_curr_backtracking(ModelAction *curr);
void add_action_to_lists(ModelAction *act);
- ModelAction * get_last_action(thread_id_t tid) const;
ModelAction * get_last_fence_release(thread_id_t tid) const;
ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
ModelAction * get_last_fence_release(thread_id_t tid) const;
ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
@@
-223,10
+233,6
@@
private:
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const obj_map;
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const obj_map;
- /** Per-object list of actions. Maps an object (i.e., memory location)
- * to a trace of all actions performed on the object. */
- HashTable<const void *, action_list_t *, uintptr_t, 4> * const lock_waiters_map;
-
/** Per-object list of actions. Maps an object (i.e., memory location)
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const condvar_waiters_map;
/** Per-object list of actions. Maps an object (i.e., memory location)
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const condvar_waiters_map;
@@
-246,6
+252,8
@@
private:
SnapVector<ModelAction *> * const thrd_last_action;
SnapVector<ModelAction *> * const thrd_last_fence_release;
NodeStack * const node_stack;
SnapVector<ModelAction *> * const thrd_last_action;
SnapVector<ModelAction *> * const thrd_last_fence_release;
NodeStack * const node_stack;
+ ModelVector<Trace_Analysis *> * trace_analyses;
+
/** Private data members that should be snapshotted. They are grouped
* together for efficiency and maintainability. */
/** Private data members that should be snapshotted. They are grouped
* together for efficiency and maintainability. */
@@
-274,12
+282,11
@@
private:
/** @brief The cumulative execution stats */
struct execution_stats stats;
void record_stats();
/** @brief The cumulative execution stats */
struct execution_stats stats;
void record_stats();
-
+ void run_trace_analyses();
void print_infeasibility(const char *prefix) const;
bool is_feasible_prefix_ignore_relseq() const;
bool is_infeasible() const;
bool is_deadlocked() const;
void print_infeasibility(const char *prefix) const;
bool is_feasible_prefix_ignore_relseq() const;
bool is_infeasible() const;
bool is_deadlocked() const;
- bool is_circular_wait(const Thread *t) const;
bool is_complete_execution() const;
bool have_bug_reports() const;
void print_bugs() const;
bool is_complete_execution() const;
bool have_bug_reports() const;
void print_bugs() const;