projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snapshot: remove unused 'uc_link' context
[model-checker.git]
/
main.cc
diff --git
a/main.cc
b/main.cc
index c5b6028f27536551078a0447d0c57e4d1bb15542..66ad9f1d0a6b9f34b9b416d37d7890957984565d 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-1,15
+1,20
@@
+/** @file main.cc
+ * @brief Entry point for the model checker.
+ */
+
#include "libthreads.h"
#include "common.h"
#include "threads.h"
/* global "model" object */
#include "model.h"
#include "libthreads.h"
#include "common.h"
#include "threads.h"
/* global "model" object */
#include "model.h"
-#include "snapshot.h"
#include "snapshot-interface.h"
#include "snapshot-interface.h"
-/*
- * Return 1 if found next thread, 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;
@@
-33,18
+38,25
@@
static int thread_system_next(void) {
return Thread::swap(model->get_system_context(), next);
}
return Thread::swap(model->get_system_context(), next);
}
+/** The thread_wait_finish method runs the current execution until we
+ * have no more steps to take.
+ */
+
static void thread_wait_finish(void) {
DBG();
while (!thread_system_next());
}
static void thread_wait_finish(void) {
DBG();
while (!thread_system_next());
}
+
+/** The real_main function contains the main model checking loop. */
+
void real_main() {
thrd_t user_thread;
ucontext_t main_context;
void real_main() {
thrd_t user_thread;
ucontext_t main_context;
- //Create the singleton
s
napshotStack object
- snapshotObject = new
s
napshotStack();
+ //Create the singleton
S
napshotStack object
+ snapshotObject = new
S
napshotStack();
model = new ModelChecker();
model = new ModelChecker();
@@
-53,6
+65,8
@@
void real_main() {
model->set_system_context(&main_context);
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));
@@
-64,13
+78,15
@@
void real_main() {
delete model;
DEBUG("Exiting\n");
delete model;
DEBUG("Exiting\n");
+ finalize();
}
int main_numargs;
char ** main_args;
}
int main_numargs;
char ** main_args;
-/*
- * Main system function
+/**
+ * Main function. Just initializes snapshotting library and the
+ * snapshotting library calls the real_main function.
*/
int main(int numargs, char ** args) {
/* Stash this stuff in case someone wants it eventually */
*/
int main(int numargs, char ** args) {
/* Stash this stuff in case someone wants it eventually */