projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for pthread_mutex
[c11tester.git]
/
model.h
diff --git
a/model.h
b/model.h
index 4dbe557222c40a0a7d92fb55227a202d54f069f6..7e651561a79740af75910d2f7fd1251691644b49 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-16,6
+16,9
@@
#include "context.h"
#include "params.h"
#include "context.h"
#include "params.h"
+#include <map>
+#include <mutex>
+
/* Forward declaration */
class Node;
class NodeStack;
/* Forward declaration */
class Node;
class NodeStack;
@@
-47,43
+50,54
@@
public:
void run();
void run();
+ /** Restart the model checker, intended for pluggins. */
+ void restart();
+
+ /** Exit the model checker, intended for pluggins. */
+ void exit_model_checker();
+
+ /** Check the exit_flag. */
+ bool get_exit_flag() const { return exit_flag; }
+
/** @returns the context for the main model-checking system thread */
ucontext_t * get_system_context() { return &system_context; }
/** @returns the context for the main model-checking system thread */
ucontext_t * get_system_context() { return &system_context; }
- const ModelExecution * get_execution() const { return execution; }
+ ModelExecution * get_execution() const { return execution; }
+
+ int get_execution_number() const { return execution_number; }
Thread * get_thread(thread_id_t tid) const;
Thread * get_thread(const ModelAction *act) const;
Thread * get_thread(thread_id_t tid) const;
Thread * get_thread(const ModelAction *act) const;
- bool is_enabled(Thread *t) const;
- bool is_enabled(thread_id_t tid) const;
-
- thread_id_t get_next_id();
- unsigned int get_num_threads() const;
Thread * get_current_thread() const;
void switch_from_master(Thread *thread);
uint64_t switch_to_master(ModelAction *act);
Thread * get_current_thread() const;
void switch_from_master(Thread *thread);
uint64_t switch_to_master(ModelAction *act);
- void check_promises_thread_disabled();
bool assert_bug(const char *msg, ...);
void assert_user_bug(const char *msg);
const model_params params;
bool assert_bug(const char *msg, ...);
void assert_user_bug(const char *msg);
const model_params params;
- void add_trace_analysis(TraceAnalysis *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;
-
+ void add_trace_analysis(TraceAnalysis *a) { trace_analyses.push_back(a); }
+ void set_inspect_plugin(TraceAnalysis *a) { inspect_plugin=a; }
MEMALLOC
MEMALLOC
+ std::map<pthread_t, ModelAction*> pthread_map;
+ std::map<pthread_mutex_t *, std::mutex*> mutex_map;
private:
private:
+ /** Flag indicates whether to restart the model checker. */
+ bool restart_flag;
+ /** Flag indicates whether to exit the model checker. */
+ bool exit_flag;
+
/** The scheduler to use: tracks the running/ready Threads */
Scheduler * const scheduler;
NodeStack * const node_stack;
ModelExecution *execution;
/** The scheduler to use: tracks the running/ready Threads */
Scheduler * const scheduler;
NodeStack * const node_stack;
ModelExecution *execution;
+ int execution_number;
+
+ unsigned int get_num_threads() const;
+
void execute_sleep_set();
bool next_execution();
void execute_sleep_set();
bool next_execution();
@@
-98,8
+112,12
@@
private:
ucontext_t system_context;
ucontext_t system_context;
- ModelVector<TraceAnalysis *>
*
trace_analyses;
+ ModelVector<TraceAnalysis *> trace_analyses;
+ /** @bref Implement restart. */
+ void do_restart();
+ /** @bref Plugin that can inspect new actions. */
+ TraceAnalysis *inspect_plugin;
/** @brief The cumulative execution stats */
struct execution_stats stats;
void record_stats();
/** @brief The cumulative execution stats */
struct execution_stats stats;
void record_stats();