From: Gabriel Corona Date: Tue, 10 Nov 2015 14:36:23 +0000 (+0100) Subject: [mc] Fix exit status naming convention X-Git-Tag: v3_13~1582^2~7 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/093ee3ab84a46a3a5a6673aeb1f4980a3cc50647 [mc] Fix exit status naming convention --- diff --git a/src/mc/Server.cpp b/src/mc/Server.cpp index 6d2e316965..7823da393c 100644 --- a/src/mc/Server.cpp +++ b/src/mc/Server.cpp @@ -224,7 +224,7 @@ bool Server::handle_message(char* buffer, ssize_t size) case MC_MESSAGE_ASSERTION_FAILED: MC_report_assertion_error(); - ::exit(SIMGRID_EXIT_SAFETY); + ::exit(SIMGRID_MC_EXIT_SAFETY); break; default: @@ -331,7 +331,7 @@ void Server::handle_waitpid() xbt_die("Could not get exit status"); if (WIFSIGNALED(status)) { MC_report_crash(status); - ::exit(SIMGRID_PROGRAM_CRASH); + ::exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); } } diff --git a/src/mc/mc_comm_determinism.cpp b/src/mc/mc_comm_determinism.cpp index 9d041a1329..bfe5e1a9d4 100644 --- a/src/mc/mc_comm_determinism.cpp +++ b/src/mc/mc_comm_determinism.cpp @@ -145,7 +145,7 @@ static void deterministic_comm_pattern(int process, mc_comm_pattern_t comm, int xbt_free(initial_global_state->send_diff); initial_global_state->send_diff = NULL; MC_print_statistics(mc_stats); - exit(SIMGRID_EXIT_NON_DETERMINISM); + exit(SIMGRID_MC_EXIT_NON_DETERMINISM); }else if(_sg_mc_comms_determinism && (!initial_global_state->send_deterministic && !initial_global_state->recv_deterministic)) { XBT_INFO("****************************************************"); XBT_INFO("***** Non-deterministic communications pattern *****"); @@ -157,7 +157,7 @@ static void deterministic_comm_pattern(int process, mc_comm_pattern_t comm, int xbt_free(initial_global_state->recv_diff); initial_global_state->recv_diff = NULL; MC_print_statistics(mc_stats); - exit(SIMGRID_EXIT_NON_DETERMINISM); + exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } } } diff --git a/src/mc/mc_exit.h b/src/mc/mc_exit.h index 7889d720d7..2e8f5216f6 100644 --- a/src/mc/mc_exit.h +++ b/src/mc/mc_exit.h @@ -1,14 +1,14 @@ #ifndef SIMGRID_MC_EXIT_HPP #define SIMGRID_MC_EXIT_HPP -#define SIMGRID_EXIT_SUCCESS 0 -#define SIMGRID_EXIT_SAFETY 1 -#define SIMGRID_EXIT_LIVENESS 2 -#define SIMGRID_EXIT_DEADLOCK 3 -#define SIMGRID_EXIT_NON_TERMINATION 4 -#define SIMGRID_EXIT_NON_DETERMINISM 5 -#define SIMGRID_PROGRAM_CRASH 6 +#define SIMGRID_MC_EXIT_SUCCESS 0 +#define SIMGRID_MC_EXIT_SAFETY 1 +#define SIMGRID_MC_EXIT_LIVENESS 2 +#define SIMGRID_MC_EXIT_DEADLOCK 3 +#define SIMGRID_MC_EXIT_NON_TERMINATION 4 +#define SIMGRID_MC_EXIT_NON_DETERMINISM 5 +#define SIMGRID_MC_EXIT_PROGRAM_CRASH 6 -#define SIMGRID_ERROR 63 +#define SIMGRID_MC_EXIT_ERROR 63 #endif diff --git a/src/mc/mc_liveness.cpp b/src/mc/mc_liveness.cpp index a1f786d1f0..d585d5cc6c 100644 --- a/src/mc/mc_liveness.cpp +++ b/src/mc/mc_liveness.cpp @@ -252,7 +252,7 @@ static void MC_modelcheck_liveness_main(void) MC_dump_stack_liveness(mc_stack); MC_print_statistics(mc_stats); XBT_INFO("Counter-example depth : %d", counter_example_depth); - exit(SIMGRID_EXIT_LIVENESS); + exit(SIMGRID_MC_EXIT_LIVENESS); } } diff --git a/src/mc/mc_safety.cpp b/src/mc/mc_safety.cpp index 84d5aa4202..843389b509 100644 --- a/src/mc/mc_safety.cpp +++ b/src/mc/mc_safety.cpp @@ -126,7 +126,7 @@ void MC_modelcheck_safety(void) if(_sg_mc_termination && is_exploration_stack_state(next_state)){ MC_show_non_termination(); - exit(SIMGRID_EXIT_NON_TERMINATION); + exit(SIMGRID_MC_EXIT_NON_TERMINATION); } if ((visited_state = is_visited_state(next_state)) == NULL) { @@ -186,7 +186,7 @@ void MC_modelcheck_safety(void) /* Check for deadlocks */ if (MC_deadlock_check()) { MC_show_deadlock(NULL); - exit(SIMGRID_EXIT_DEADLOCK); + exit(SIMGRID_MC_EXIT_DEADLOCK); } /* Traverse the stack backwards until a state with a non empty interleave @@ -259,7 +259,7 @@ void MC_modelcheck_safety(void) XBT_INFO("No property violation found."); MC_print_statistics(mc_stats); - exit(SIMGRID_EXIT_SUCCESS); + exit(SIMGRID_MC_EXIT_SUCCESS); } static void MC_modelcheck_safety_init(void) diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp index a8b28844cf..4dcc0bab00 100644 --- a/src/mc/simgrid_mc.cpp +++ b/src/mc/simgrid_mc.cpp @@ -47,7 +47,7 @@ static int do_child(int socket, char** argv) // Make sure we do not outlive our parent: if (prctl(PR_SET_PDEATHSIG, SIGHUP) != 0) { std::perror("simgrid-mc"); - return SIMGRID_ERROR; + return SIMGRID_MC_EXIT_ERROR; } #endif @@ -57,11 +57,11 @@ static int do_child(int socket, char** argv) int fdflags = fcntl(socket, F_GETFD, 0); if (fdflags == -1) { std::perror("simgrid-mc"); - return SIMGRID_ERROR; + return SIMGRID_MC_EXIT_ERROR; } if (fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) == -1) { std::perror("simgrid-mc"); - return SIMGRID_ERROR; + return SIMGRID_MC_EXIT_ERROR; } XBT_DEBUG("CLOEXEC removed on socket %i", socket); @@ -77,12 +77,12 @@ static int do_child(int socket, char** argv) char buffer[64]; res = std::snprintf(buffer, sizeof(buffer), "%i", socket); if ((size_t) res >= sizeof(buffer) || res == -1) - return SIMGRID_ERROR; + return SIMGRID_MC_EXIT_ERROR; setenv(MC_ENV_SOCKET_FD, buffer, 1); execvp(argv[1], argv+1); XBT_ERROR("Could not execute the child process"); - return SIMGRID_ERROR; + return SIMGRID_MC_EXIT_ERROR; } static int do_parent(int socket, pid_t child) @@ -106,7 +106,7 @@ static int do_parent(int socket, pid_t child) catch(std::exception& e) { XBT_ERROR("Exception: %s", e.what()); } - exit(SIMGRID_ERROR); + exit(SIMGRID_MC_EXIT_ERROR); } static char** argvdup(int argc, char** argv) @@ -138,7 +138,7 @@ int main(int argc, char** argv) res = socketpair(AF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0, sockets); if (res == -1) { perror("simgrid-mc"); - return SIMGRID_ERROR; + return SIMGRID_MC_EXIT_ERROR; } XBT_DEBUG("Created socketpair"); @@ -146,7 +146,7 @@ int main(int argc, char** argv) pid_t pid = fork(); if (pid < 0) { perror("simgrid-mc"); - return SIMGRID_ERROR; + return SIMGRID_MC_EXIT_ERROR; } else if (pid == 0) { close(sockets[1]); int res = do_child(sockets[0], argv);