projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some support for traceanalysis plugins
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 355764b7c4d290cfb3de64f7f0c0086a0ba83c73..90c8a55e5f96f7ca93a6adcd6c6f28fdac96fa4a 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,6
+24,7
@@
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 */
struct model_snapshot_members;
/** @brief Shorthand for a list of release sequence heads */
@@
-132,7
+133,7
@@
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;
void assert_user_bug(const char *msg);
const model_params params;
@@
-171,6
+172,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;
@@
-226,10
+228,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;
@@
-249,6
+247,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. */
@@
-277,12
+277,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;