projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgot about events that happen after an unresolved read... bug fix checked in
[model-checker.git]
/
main.cc
diff --git
a/main.cc
b/main.cc
index b38f7ef4816d003f45d876133dacf0dc0d816bab..73b3b0c410d95fbdbd06190eadd35b25b1288e77 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-6,15
+6,16
@@
#include "common.h"
#include "threads.h"
#include "common.h"
#include "threads.h"
+#include "datarace.h"
+
/* global "model" object */
#include "model.h"
#include "snapshot-interface.h"
/* global "model" object */
#include "model.h"
#include "snapshot-interface.h"
-/**
The thread_system_next function takes the next step in the
- *
execution. @return Returns the 1 if there is another step and 0
- * otherwise.
+/**
+ *
The thread_system_next function takes the next step in the execution.
+ *
@return Returns the 1 if there is another step and 0
otherwise.
*/
*/
-
static int thread_system_next(void) {
Thread *curr, *next;
static int thread_system_next(void) {
Thread *curr, *next;
@@
-30,6
+31,8
@@
static int thread_system_next(void) {
ASSERT(false);
}
next = model->scheduler->next_thread();
ASSERT(false);
}
next = model->scheduler->next_thread();
+ if (!model->isfeasible())
+ return 1;
if (next)
next->set_state(THREAD_RUNNING);
DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
if (next)
next->set_state(THREAD_RUNNING);
DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
@@
-41,7
+44,6
@@
static int thread_system_next(void) {
/** The thread_wait_finish method runs the current execution until we
* have no more steps to take.
*/
/** The thread_wait_finish method runs the current execution until we
* have no more steps to take.
*/
-
static void thread_wait_finish(void) {
DBG();
static void thread_wait_finish(void) {
DBG();
@@
-50,11
+52,13
@@
static void thread_wait_finish(void) {
/** The real_main function contains the main model checking loop. */
/** The real_main function contains the main model checking loop. */
-
-void real_main() {
+static void real_main() {
thrd_t user_thread;
ucontext_t main_context;
thrd_t user_thread;
ucontext_t main_context;
+ //Initialize race detector
+ initRaceDetector();
+
//Create the singleton SnapshotStack object
snapshotObject = new SnapshotStack();
//Create the singleton SnapshotStack object
snapshotObject = new SnapshotStack();
@@
-66,7
+70,6
@@
void real_main() {
model->set_system_context(&main_context);
snapshotObject->snapshotStep(0);
model->set_system_context(&main_context);
snapshotObject->snapshotStep(0);
-
do {
/* Start user program */
model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
do {
/* Start user program */
model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));