#include <cstddef>
#include <ucontext.h>
-#include "schedule.h"
#include "mymemory.h"
-#include "libthreads.h"
-#include "threads.h"
#include "action.h"
-#include "clockvector.h"
#include "hashtable.h"
#include "workqueue.h"
+#include "config.h"
+#include "modeltypes.h"
/* Forward declaration */
class NodeStack;
class CycleGraph;
class Promise;
+class Scheduler;
+class Thread;
/** @brief Shorthand for a list of release sequence heads */
-typedef std::vector< const ModelAction *, MyAlloc<const ModelAction *> > rel_heads_list_t;
+typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
/**
* Model checker parameter structure. Holds run-time configuration options for
struct model_params {
int maxreads;
int maxfuturedelay;
+ unsigned int fairwindow;
+ unsigned int enabledcount;
};
struct PendingFutureValue {
/** 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);
- Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
- Thread * get_thread(ModelAction *act) { return get_thread(act->get_tid()); }
+ Thread * get_thread(thread_id_t tid);
+ Thread * get_thread(ModelAction *act);
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(); }
+ Thread * get_current_thread();
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
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 */
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
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();
- 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);
void do_complete_join(ModelAction *join);
ModelAction *diverge;
+ ModelAction *earliest_diverge;
ucontext_t system_context;
action_list_t *action_trace;
bool failed_promise;
bool too_many_reads;
bool asserted;
+ /** @brief Incorrectly-ordered synchronization was made */
+ bool bad_synchronization;
};
extern ModelChecker *model;