From e58ab15bf513cbf6ec5ae87d8f6d79607440f27f Mon Sep 17 00:00:00 2001 From: weiyu Date: Tue, 8 Jan 2019 11:52:17 -0800 Subject: [PATCH] remove two unnecessary files --- #cmodelint.cc# | 74 ------------- #main.cc# | 288 ------------------------------------------------- 2 files changed, 362 deletions(-) delete mode 100644 #cmodelint.cc# delete mode 100644 #main.cc# diff --git a/#cmodelint.cc# b/#cmodelint.cc# deleted file mode 100644 index b67194f2..00000000 --- a/#cmodelint.cc# +++ /dev/null @@ -1,74 +0,0 @@ -#include "model.h" -#include "action.h" -#include "cmodelint.h" -#include "threads-model.h" - -memory_order orders[6] = { - memory_order_relaxed, memory_order_consume, memory_order_acquire, - memory_order_release, memory_order_acq_rel, memory_order_seq_cst -}; - -/** Performs a read action.*/ -uint64_t model_read_action(void * obj, memory_order ord) { - return model->switch_to_master(new ModelAction(ATOMIC_READ, ord, obj)); -} - -uint64_t model_read_action_helper(void * obj, int index) { - return model->switch_to_master(new ModelAction(ATOMIC_READ, orders[index], obj)); -} -:q! - -/** Performs a write action.*/ -void model_write_action(void * obj, memory_order ord, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_WRITE, ord, obj, val)); -} - -void model_write_action_helper(void * obj, int index, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[index], obj, val)); -} - -/** Performs an init action. */ -void model_init_action(void * obj, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, val)); -} -// do not need a helper function - -/** - * Performs the read part of a RMW action. The next action must either be the - * write part of the RMW action or an explicit close out of the RMW action w/o - * a write. - */ -uint64_t model_rmwr_action(void *obj, memory_order ord) { - return model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj)); -} - -uint64_t model_rmwr_action_helper(void *obj, int index) { - return model->switch_to_master(new ModelAction(ATOMIC_RMWR, orders[index], obj)); -} - -/** Performs the write part of a RMW action. */ -void model_rmw_action(void *obj, memory_order ord, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_RMW, ord, obj, val)); -} - -void model_rmw_action_helper(void *obj, int index, uint64_t val) { - model->switch_to_master(new ModelAction(ATOMIC_RMW, orders[index], obj, val)); -} - -/** Closes out a RMW action without doing a write. */ -void model_rmwc_action(void *obj, memory_order ord) { - model->switch_to_master(new ModelAction(ATOMIC_RMWC, ord, obj)); -} - -void model_rmwc_action_helper(void *obj, int index) { - model->switch_to_master(new ModelAction(ATOMIC_RMWC, orders[index], obj)); -} - -/** Issues a fence operation. */ -void model_fence_action(memory_order ord) { - model->switch_to_master(new ModelAction(ATOMIC_FENCE, ord, FENCE_LOCATION)); -} - -void model_fence_action_helper(int index) { - model->switch_to_master(new ModelAction(ATOMIC_FENCE, orders[index], FENCE_LOCATION)); -} diff --git a/#main.cc# b/#main.cc# deleted file mode 100644 index d4ab75bf..00000000 --- a/#main.cc# +++ /dev/null @@ -1,288 +0,0 @@ -/** @file main.cc - * @brief Entry point for the model checker. - */ - -#include -#include -#include - -#include "common.h" -#include "output.h" - -#include "datarace.h" - -/* global "model" object */ -#include "model.h" -#include "params.h" -#include "snapshot-interface.h" - -static void param_defaults(struct model_params *params) -{ - params->maxreads = 0; - params->maxfuturedelay = 6; - params->fairwindow = 0; - params->yieldon = false; - params->yieldblock = false; - params->enabledcount = 1; - params->bound = 0; - params->maxfuturevalues = 0; - params->expireslop = 4; - params->verbose = !!DBG_ENABLED(); - params->uninitvalue = 0; - params->maxexecutions = 0; -} - -static void print_usage(const char *program_name, struct model_params *params) -{ - ModelVector * registeredanalysis=getRegisteredTraceAnalysis(); - /* Reset defaults before printing */ - param_defaults(params); - - model_print( -"Copyright (c) 2013 Regents of the University of California. All rights reserved.\n" -"Distributed under the GPLv2\n" -"Written by Brian Norris and Brian Demsky\n" -"\n" -"Usage: %s [MODEL-CHECKER OPTIONS] -- [PROGRAM ARGS]\n" -"\n" -"MODEL-CHECKER OPTIONS can be any of the model-checker options listed below. Arguments\n" -"provided after the `--' (the PROGRAM ARGS) are passed to the user program.\n" -"\n" -"Model-checker options:\n" -"-h, --help Display this help message and exit\n" -"-m, --liveness=NUM Maximum times a thread can read from the same write\n" -" while other writes exist.\n" -" Default: %d\n" -"-M, --maxfv=NUM Maximum number of future values that can be sent to\n" -" the same read.\n" -" Default: %d\n" -"-s, --maxfvdelay=NUM Maximum actions that the model checker will wait for\n" -" a write from the future past the expected number\n" -" of actions.\n" -" Default: %d\n" -"-S, --fvslop=NUM Future value expiration sloppiness.\n" -" Default: %u\n" -"-y, --yield Enable CHESS-like yield-based fairness support\n" -" (requires thrd_yield() in test program).\n" -" Default: %s\n" -"-Y, --yieldblock Prohibit an execution from running a yield.\n" -" Default: %s\n" -"-f, --fairness=WINDOW Specify a fairness window in which actions that are\n" -" enabled sufficiently many times should receive\n" -" priority for execution (not recommended).\n" -" Default: %d\n" -"-e, --enabled=COUNT Enabled count.\n" -" Default: %d\n" -"-b, --bound=MAX Upper length bound.\n" -" Default: %d\n" -"-v[NUM], --verbose[=NUM] Print verbose execution information. NUM is optional:\n" -" 0 is quiet; 1 shows valid executions; 2 is noisy;\n" -" 3 is noisier.\n" -" Default: %d\n" -"-u, --uninitialized=VALUE Return VALUE any load which may read from an\n" -" uninitialized atomic.\n" -" Default: %u\n" -"-t, --analysis=NAME Use Analysis Plugin.\n" -"-o, --options=NAME Option for previous analysis plugin. \n" -"-x, --maxexec=NUM Maximum number of executions.\n" -" Default: %u\n" -" -o help for a list of options\n" -" -- Program arguments follow.\n\n", - program_name, - params->maxreads, - params->maxfuturevalues, - params->maxfuturedelay, - params->expireslop, - params->yieldon ? "enabled" : "disabled", - params->yieldblock ? "enabled" : "disabled", - params->fairwindow, - params->enabledcount, - params->bound, - params->verbose, - params->uninitvalue, - params->maxexecutions); - model_print("Analysis plugins:\n"); - for(unsigned int i=0;isize();i++) { - TraceAnalysis * analysis=(*registeredanalysis)[i]; - model_print("%s\n", analysis->name()); - } - exit(EXIT_SUCCESS); -} - -bool install_plugin(char * name) { - ModelVector * registeredanalysis=getRegisteredTraceAnalysis(); - ModelVector * installedanalysis=getInstalledTraceAnalysis(); - - for(unsigned int i=0;isize();i++) { - TraceAnalysis * analysis=(*registeredanalysis)[i]; - if (strcmp(name, analysis->name())==0) { - installedanalysis->push_back(analysis); - return false; - } - } - model_print("Analysis %s Not Found\n", name); - return true; -} - -static void parse_options(struct model_params *params, int argc, char **argv) -{ - const char *shortopts = "hyYt:o:m:M:s:S:f:e:b:u:x:v::"; - const struct option longopts[] = { - {"help", no_argument, NULL, 'h'}, - {"liveness", required_argument, NULL, 'm'}, - {"maxfv", required_argument, NULL, 'M'}, - {"maxfvdelay", required_argument, NULL, 's'}, - {"fvslop", required_argument, NULL, 'S'}, - {"fairness", required_argument, NULL, 'f'}, - {"yield", no_argument, NULL, 'y'}, - {"yieldblock", no_argument, NULL, 'Y'}, - {"enabled", required_argument, NULL, 'e'}, - {"bound", required_argument, NULL, 'b'}, - {"verbose", optional_argument, NULL, 'v'}, - {"uninitialized", required_argument, NULL, 'u'}, - {"analysis", required_argument, NULL, 't'}, - {"options", required_argument, NULL, 'o'}, - {"maxexecutions", required_argument, NULL, 'x'}, - {0, 0, 0, 0} /* Terminator */ - }; - int opt, longindex; - bool error = false; - while (!error && (opt = getopt_long(argc, argv, shortopts, longopts, &longindex)) != -1) { - switch (opt) { - case 'h': - print_usage(argv[0], params); - break; - case 'x': - params->maxexecutions = atoi(optarg); - break; - case 's': - params->maxfuturedelay = atoi(optarg); - break; - case 'S': - params->expireslop = atoi(optarg); - break; - case 'f': - params->fairwindow = 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->maxfuturevalues = atoi(optarg); - break; - case 'v': - params->verbose = optarg ? atoi(optarg) : 1; - break; - case 'u': - params->uninitvalue = atoi(optarg); - break; - case 'y': - params->yieldon = true; - break; - case 't': - if (install_plugin(optarg)) - error = true; - break; - case 'o': - { - ModelVector * analyses = getInstalledTraceAnalysis(); - if ( analyses->size() == 0 || (*analyses)[analyses->size()-1]->option(optarg)) - error = true; - } - break; - case 'Y': - params->yieldblock = true; - break; - default: /* '?' */ - error = true; - break; - } - } - - /* Pass remaining arguments to user program */ - params->argc = argc - (optind - 1); - params->argv = argv + (optind - 1); - - /* Reset program name */ - params->argv[0] = argv[0]; - - /* Reset (global) optind for potential use by user program */ - optind = 1; - - if (error) - print_usage(argv[0], params); -} - -int main_argc; -char **main_argv; - -static void install_trace_analyses(ModelExecution *execution) -{ - ModelVector * installedanalysis=getInstalledTraceAnalysis(); - for(unsigned int i=0;isize();i++) { - TraceAnalysis * ta=(*installedanalysis)[i]; - ta->setExecution(execution); - model->add_trace_analysis(ta); - /** Call the installation event for each installed plugin */ - ta->actionAtInstallation(); - } -} - -/** The model_main function contains the main model checking loop. */ -static void model_main() -{ - struct model_params params; - - param_defaults(¶ms); - register_plugins(); - - parse_options(¶ms, main_argc, main_argv); - - //Initialize race detector - initRaceDetector(); - - snapshot_stack_init(); - - model = new ModelChecker(params); // L: Model thread is created -// install_trace_analyses(model->get_execution()); L: disable plugin - - snapshot_record(0); - model->run(); - delete model; - - DEBUG("Exiting\n"); -} - -/** - * Main function. Just initializes snapshotting library and the - * snapshotting library calls the model_main function. - */ -int main(int argc, char **argv) -{ - main_argc = argc; - main_argv = argv; - - /* - * If this printf statement is removed, CDSChecker will fail on an - * assert on some versions of glibc. The first time printf is - * called, it allocated internal buffers. We can't easily snapshot - * libc since we also use it. - */ - - printf("CDSChecker\n" - "Copyright (c) 2013 Regents of the University of California. All rights reserved.\n" - "Distributed under the GPLv2\n" - "Written by Brian Norris and Brian Demsky\n\n"); - - /* Configure output redirection for the model-checker */ - redirect_output(); - - /* Let's jump in quickly and start running stuff */ - snapshot_system_init(10000, 1024, 1024, 4000, &model_main); -} -- 2.34.1