#include "history.h"
#include "bugmessage.h"
#include "params.h"
+#include "plugins.h"
ModelChecker *model = NULL;
-/** Wrapper to run the user's main function, with appropriate arguments */
-void user_main_wrapper(void *)
-{
- user_main(model->params.argc, model->params.argv);
+void placeholder(void *) {
+ ASSERT(0);
}
/** @brief Constructor */
params(),
restart_flag(false),
scheduler(new Scheduler()),
- execution(new ModelExecution(this, scheduler)),
history(new ModelHistory()),
+ execution(new ModelExecution(this, scheduler)),
execution_number(1),
trace_analyses(),
inspect_plugin(NULL)
{
+ model_print("C11Tester\n"
+ "Copyright (c) 2013 and 2019 Regents of the University of California. All rights reserved.\n"
+ "Distributed under the GPLv2\n"
+ "Written by Weiyu Luo, Brian Norris, and Brian Demsky\n\n");
memset(&stats,0,sizeof(struct execution_stats));
- 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
+ init_thread = new Thread(execution->get_next_id(), (thrd_t *) model_malloc(sizeof(thrd_t)), &placeholder, NULL, NULL);
#ifdef TLS
init_thread->setTLS((char *)get_tls_addr());
#endif
execution->add_thread(init_thread);
scheduler->set_current_thread(init_thread);
+ register_plugins();
execution->setParams(¶ms);
param_defaults(¶ms);
+ parse_options(¶ms);
initRaceDetector();
+ /* Configure output redirection for the model-checker */
+ redirect_output();
+ install_trace_analyses(get_execution());
}
/** @brief Destructor */
for (unsigned int i = 0;i < get_num_threads();i++)
delete get_thread(int_to_id(i))->get_pending();
- snapshot_backtrack_before(0);
+ snapshot_roll_back(snapshot);
}
/** @return the number of user threads created during this execution */
* @param msg Descriptive message for the bug (do not include newline char)
* @return True if bug is immediately-feasible
*/
-bool ModelChecker::assert_bug(const char *msg, ...)
+void ModelChecker::assert_bug(const char *msg, ...)
{
char str[800];
vsnprintf(str, sizeof(str), msg, ap);
va_end(ap);
- return execution->assert_bug(str);
+ execution->assert_bug(str);
}
/**
void ModelChecker::assert_user_bug(const char *msg)
{
/* If feasible bug, bail out now */
- if (assert_bug(msg))
- switch_to_master(NULL);
+ assert_bug(msg);
+ switch_to_master(NULL);
}
/** @brief Print bug report listing for this execution (if any bugs exist) */
void ModelChecker::record_stats()
{
stats.num_total ++;
- if (!execution->isfeasibleprefix())
- stats.num_infeasible ++;
- else if (execution->have_bug_reports())
+ if (execution->have_bug_reports())
stats.num_buggy_executions ++;
else if (execution->is_complete_execution())
stats.num_complete ++;
else {
- stats.num_redundant ++;
-
+ //All threads are sleeping
/**
* @todo We can violate this ASSERT() when fairness/sleep sets
* conflict to cause an execution to terminate, e.g. with:
void ModelChecker::print_stats() const
{
model_print("Number of complete, bug-free executions: %d\n", stats.num_complete);
- model_print("Number of redundant executions: %d\n", stats.num_redundant);
model_print("Number of buggy executions: %d\n", stats.num_buggy_executions);
- model_print("Number of infeasible executions: %d\n", stats.num_infeasible);
model_print("Total executions: %d\n", stats.num_total);
}
{
DBG();
/* Is this execution a feasible execution that's worth bug-checking? */
- bool complete = execution->isfeasibleprefix() &&
- (execution->is_complete_execution() ||
+ bool complete = (execution->is_complete_execution() ||
execution->have_bug_reports());
/* End-of-execution bug checks */
// test code
execution_number ++;
reset_to_initial_state();
+ history->set_new_exec_flag();
return false;
}
*/
uint64_t ModelChecker::switch_to_master(ModelAction *act)
{
- if (forklock) {
+ if (modellock) {
static bool fork_message_printed = false;
if (!fork_message_printed) {
- model_print("Fork handler trying to call into model checker...\n");
+ model_print("Fork handler or dead thread trying to call into model checker...\n");
fork_message_printed = true;
}
delete act;
void ModelChecker::startChecker() {
startExecution(get_system_context(), runChecker);
+ snapshot = take_snapshot();
+ initMainThread();
}
bool ModelChecker::should_terminate_execution()
{
- /* Infeasible -> don't take any more steps */
- if (execution->is_infeasible())
- return true;
- else if (execution->isfeasibleprefix() && execution->have_fatal_bug_reports()) {
+ if (execution->have_bug_reports()) {
execution->set_assert();
return true;
+ } else if (execution->isFinished()) {
+ return true;
}
return false;
}
execution_number = 1;
}
-void ModelChecker::startMainThread() {
- init_thread->set_state(THREAD_RUNNING);
- scheduler->set_current_thread(init_thread);
- main_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() && ((!(pending=thr->get_pending())) || is_nonsc_write(pending)) ) {
- switch_from_master(thr); // L: context swapped, and action type of thr changed.
+ if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) {
+ switch_from_master(thr);
if (thr->is_waiting_on(thr))
assert_bug("Deadlock detected (thread %u)", i);
}
t = get_next_thread();
if (!t || t->is_model_thread())
break;
+ if (t->just_woken_up()) {
+ t->set_wakeup_state(false);
+ t->set_pending(NULL);
+ t = NULL;
+ continue; // Allow this thread to stash the next pending action
+ }
/* Consume the next action for a Thread */
ModelAction *curr = t->get_pending();
/* Have the trace analyses dump their output. */
for (unsigned int i = 0;i < trace_analyses.size();i++)
trace_analyses[i]->finish();
+
+ /* unlink tmp file created by last child process */
+ char filename[256];
+ snprintf_(filename, sizeof(filename), "C11FuzzerTmp%d", getpid());
+ unlink(filename);
}
projects / c11tester.git / blobdiff