#include "output.h"
#include "traceanalysis.h"
#include "execution.h"
+#include "history.h"
#include "bugmessage.h"
+#include "params.h"
ModelChecker *model = NULL;
-ModelChecker *model_init = NULL;
/** Wrapper to run the user's main function, with appropriate arguments */
void user_main_wrapper(void *)
scheduler(new Scheduler()),
node_stack(new NodeStack()),
execution(new ModelExecution(this, scheduler, node_stack)),
+ history(new ModelHistory()),
execution_number(1),
trace_analyses(),
inspect_plugin(NULL)
{
memset(&stats,0,sizeof(struct execution_stats));
- init_thread = new Thread(execution->get_next_id(), (thrd_t *) malloc(sizeof(thrd_t)), &user_main_wrapper, NULL, NULL); // L: user_main_wrapper passes the user program
+ init_thread = new Thread(execution->get_next_id(), (thrd_t *) model_malloc(sizeof(thrd_t)), &user_main_wrapper, NULL, NULL); // L: user_main_wrapper passes the user program
execution->add_thread(init_thread);
scheduler->set_current_thread(init_thread);
+ execution->setParams(¶ms);
+ param_defaults(¶ms);
}
/** @brief Destructor */
}
/** Method to set parameters */
-void ModelChecker::setParams(struct model_params params) {
- this->params = params;
- execution->setParams(¶ms);
+model_params * ModelChecker::getParams() {
+ return ¶ms;
}
/**
*/
void ModelChecker::reset_to_initial_state()
{
- DEBUG("+++ Resetting to initial state +++\n");
- node_stack->reset_execution();
/**
* FIXME: if we utilize partial rollback, we will need to free only
bugs->size(),
bugs->size() > 1 ? "s" : "");
for (unsigned int i = 0;i < bugs->size();i++)
- (*bugs)[i]->print();
+ (*bugs)[i] -> print();
}
/**
*/
void ModelChecker::record_stats()
{
- stats.num_total++;
+ stats.num_total ++;
if (!execution->isfeasibleprefix())
- stats.num_infeasible++;
+ stats.num_infeasible ++;
else if (execution->have_bug_reports())
- stats.num_buggy_executions++;
+ stats.num_buggy_executions ++;
else if (execution->is_complete_execution())
- stats.num_complete++;
+ stats.num_complete ++;
else {
- stats.num_redundant++;
+ stats.num_redundant ++;
/**
* @todo We can violate this ASSERT() when fairness/sleep sets
return true;
}
// test code
- execution_number++;
+ execution_number ++;
reset_to_initial_state();
- node_stack->full_reset();
return false;
}
/** @brief Run trace analyses on complete trace */
void ModelChecker::run_trace_analyses() {
- for (unsigned int i = 0;i < trace_analyses.size();i++)
- trace_analyses[i]->analyze(execution->get_action_trace());
+ for (unsigned int i = 0;i < trace_analyses.size();i ++)
+ trace_analyses[i] -> analyze(execution->get_action_trace());
}
/**
return old->get_return_value();
}
+static void runChecker() {
+ model->run();
+ delete model;
+}
+
+void ModelChecker::startChecker() {
+ startExecution(get_system_context(), runChecker);
+}
+
bool ModelChecker::should_terminate_execution()
{
/* Infeasible -> don't take any more steps */
{
restart_flag = false;
reset_to_initial_state();
- node_stack->full_reset();
memset(&stats,0,sizeof(struct execution_stats));
execution_number = 1;
}
+void ModelChecker::startMainThread() {
+ init_thread->set_state(THREAD_RUNNING);
+ scheduler->set_current_thread(init_thread);
+ thread_startup();
+}
+
+static bool is_nonsc_write(const ModelAction *act) {
+ if (act->get_type() == ATOMIC_WRITE) {
+ std::memory_order order = act->get_mo();
+ switch(order) {
+ case std::memory_order_relaxed:
+ case std::memory_order_release:
+ return true;
+ default:
+ return false;
+ }
+ }
+ return false;
+}
+
/** @brief Run ModelChecker for the user program */
void ModelChecker::run()
{
* thread which just took a step--plus the first step
* for any newly-created thread
*/
-
+ ModelAction * pending;
for (unsigned int i = 0;i < get_num_threads();i++) {
thread_id_t tid = int_to_id(i);
Thread *thr = get_thread(tid);
- if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) {
+ if (!thr->is_model_thread() && !thr->is_complete() && ((!(pending=thr->get_pending())) || is_nonsc_write(pending)) ) {
switch_from_master(thr); // L: context swapped, and action type of thr changed.
if (thr->is_waiting_on(thr))
assert_bug("Deadlock detected (thread %u)", i);