projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa63c91
)
fixup EOL whitespace
author
Brian Norris
<banorris@uci.edu>
Mon, 21 May 2012 19:33:12 +0000
(12:33 -0700)
committer
Brian Norris
<banorris@uci.edu>
Mon, 21 May 2012 19:33:12 +0000
(12:33 -0700)
main.cc
patch
|
blob
|
history
schedule.cc
patch
|
blob
|
history
diff --git
a/main.cc
b/main.cc
index 741ef7775a8bffbb69a5065b5ec2d8613eebd0e6..c5b6028f27536551078a0447d0c57e4d1bb15542 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-12,7
+12,7
@@
*/
static int thread_system_next(void) {
Thread *curr, *next;
*/
static int thread_system_next(void) {
Thread *curr, *next;
-
+
curr = thread_current();
if (curr) {
if (curr->get_state() == THREAD_READY) {
curr = thread_current();
if (curr) {
if (curr->get_state() == THREAD_READY) {
@@
-45,24
+45,24
@@
void real_main() {
//Create the singleton snapshotStack object
snapshotObject = new snapshotStack();
//Create the singleton snapshotStack object
snapshotObject = new snapshotStack();
-
+
model = new ModelChecker();
model = new ModelChecker();
-
+
if (getcontext(&main_context))
return;
if (getcontext(&main_context))
return;
-
+
model->set_system_context(&main_context);
do {
/* Start user program */
model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
model->set_system_context(&main_context);
do {
/* Start user program */
model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
-
+
/* Wait for all threads to complete */
thread_wait_finish();
} while (model->next_execution());
/* Wait for all threads to complete */
thread_wait_finish();
} while (model->next_execution());
-
+
delete model;
delete model;
-
+
DEBUG("Exiting\n");
}
DEBUG("Exiting\n");
}
diff --git
a/schedule.cc
b/schedule.cc
index e9f6cbb9287e926cc6978524f864066c84ebc7f3..1791605b7c38842c37d11553c37f663c9dc88c38 100644
(file)
--- a/
schedule.cc
+++ b/
schedule.cc
@@
-3,8
+3,8
@@
#include "common.h"
#include "model.h"
#include "common.h"
#include "model.h"
-Scheduler::Scheduler()
:
-current(NULL)
+Scheduler::Scheduler()
:
+ current(NULL)
{
}
{
}