Merge branch 'master' into pldi13

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index 853654ccd35626c8410842f15419b265accd2dbb..e8d4f9af356f4ac6a59ab21f69fc26d6bd2d12bb 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,9 @@
 
 #include <unistd.h>
 
 
 #include <unistd.h>
 

-#include "libthreads.h"
+#include <threads.h>

 #include "common.h"
 #include "common.h"

-#include "threads.h"
+#include "threads-model.h"

 
 #include "datarace.h"
 
 
 #include "datarace.h"
 


@@ -19,9 +19,13 @@ static void param_defaults(struct model_params * params) {
        params->maxfuturedelay = 100;
        params->fairwindow = 0;
        params->enabledcount = 1;
        params->maxfuturedelay = 100;
        params->fairwindow = 0;
        params->enabledcount = 1;

+       params->bound = 0;

 }
 
 static void print_usage(struct model_params *params) {
 }
 
 static void print_usage(struct model_params *params) {

+       /* Reset defaults before printing */
+       param_defaults(params);
+

        printf(
 "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"
        printf(
 "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"


@@ -36,13 +40,14 @@ static void print_usage(struct model_params *params) {
 "                      enabled sufficiently many times should receive\n"
 "                      priority for execution. Default: %d\n"
 "-e                    Enabled count. Default: %d\n"
 "                      enabled sufficiently many times should receive\n"
 "                      priority for execution. Default: %d\n"
 "-e                    Enabled count. Default: %d\n"

+"-b                    Upper length bound. Default: %d\n"

 "--                    Program arguments follow.\n\n",
 "--                    Program arguments follow.\n\n",

-params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount);
+params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound);

        exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int *argc, char ***argv) {
        exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int *argc, char ***argv) {

-       const char *shortopts = "hm:s:f:e:";
+       const char *shortopts = "hm:s:f:e:b:";

        int opt;
        bool error = false;
        while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
        int opt;
        bool error = false;
        while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {


@@ -59,6 +64,9 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
                case 'e':
                        params->enabledcount = atoi(optarg);
                        break;
                case 'e':
                        params->enabledcount = atoi(optarg);
                        break;

+               case 'b':
+                       params->bound = atoi(optarg);
+                       break;

                case 'm':
                        params->maxreads = atoi(optarg);
                        break;
                case 'm':
                        params->maxreads = atoi(optarg);
                        break;


@@ -67,8 +75,10 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
                        break;
                }
        }
                        break;
                }
        }

-       (*argc) -= optind;
-       (*argv) += optind;
+       (*argv)[optind - 1] = (*argv)[0];
+       (*argc) -= (optind - 1);
+       (*argv) += (optind - 1);
+       optind = 1;

 
        if (error)
                print_usage(params);
 
        if (error)
                print_usage(params);


@@ -77,6 +87,12 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 int main_argc;
 char **main_argv;
 
 int main_argc;
 char **main_argv;
 

+/** 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;
 /** The model_main function contains the main model checking loop. */
 static void model_main() {
        thrd_t user_thread;


@@ -97,7 +113,7 @@ static void model_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();