projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
did a little more looking at infeasible executions...
[model-checker.git]
/
main.cc
diff --git
a/main.cc
b/main.cc
index 26d8beb79d52f8d09a9d16b97f96c79972941822..2a4119a6acb940e615f1342eb715732c13427357 100644
(file)
--- a/
main.cc
+++ b/
main.cc
@@
-77,8
+77,14
@@
static void parse_options(struct model_params *params, int *argc, char ***argv)
int main_argc;
char **main_argv;
int main_argc;
char **main_argv;
-/** The real_main function contains the main model checking loop. */
-static void real_main() {
+/** Wrapper to run the user's main function, with appropriate arguments */
+void wrapper_user_main(void *)
+{
+ user_main(main_argc, main_argv);
+}
+
+/** The model_main function contains the main model checking loop. */
+static void model_main() {
thrd_t user_thread;
struct model_params params;
thrd_t user_thread;
struct model_params params;
@@
-97,7
+103,7
@@
static void real_main() {
snapshotObject->snapshotStep(0);
do {
/* Start user program */
snapshotObject->snapshotStep(0);
do {
/* Start user program */
- model->add_thread(new Thread(&user_thread,
(void (*)(void *)) &
user_main, NULL));
+ model->add_thread(new Thread(&user_thread,
&wrapper_
user_main, NULL));
/* Wait for all threads to complete */
model->finish_execution();
/* Wait for all threads to complete */
model->finish_execution();
@@
-110,12
+116,12
@@
static void real_main() {
/**
* Main function. Just initializes snapshotting library and the
/**
* Main function. Just initializes snapshotting library and the
- * snapshotting library calls the
rea
l_main function.
+ * snapshotting library calls the
mode
l_main function.
*/
int main(int argc, char ** argv) {
main_argc = argc;
main_argv = argv;
/* Let's jump in quickly and start running stuff */
*/
int main(int argc, char ** argv) {
main_argc = argc;
main_argv = argv;
/* Let's jump in quickly and start running stuff */
- initSnap
ShotLibrary(10000, 1024, 1024, 1000, &rea
l_main);
+ initSnap
shotLibrary(10000, 1024, 1024, 4000, &mode
l_main);
}
}