if(wait(&status) < 0)
perror("wait");
if(WIFSIGNALED(status) && WCOREDUMP(status)){
- char *core_name = malloc(20);
+ char *core_name = xbt_malloc(20);
sprintf(core_name,"core_%d", pair);
rename("core", core_name);
free(core_name);
return 0;
}
-void MC_print_comparison_times_statistics(mc_comparison_times_t ct){
-
- XBT_DEBUG("Comparisons done : %d", ct->nb_comparisons);
-
- double total, min, max;
- unsigned int cursor;
-
- if(xbt_dynar_length(ct->chunks_used_comparison_times) > 0){
- cursor = 0;
- total = 0.0;
- max = 0.0;
- min = xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
- while(cursor < xbt_dynar_length(ct->chunks_used_comparison_times) - 1){
- total += xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double) > max)
- max = xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double) < min)
- min = xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
- cursor++;
- }
- XBT_DEBUG("Chunks used comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->chunks_used_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->chunks_used_comparison_times), max, min);
- }
-
- if(xbt_dynar_length(ct->stacks_sizes_comparison_times) > 0){
- cursor = 0;
- total = 0.0;
- max = 0.0;
- min = xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
- while(cursor < xbt_dynar_length(ct->stacks_sizes_comparison_times) - 1){
- total += xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double) > max)
- max = xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double) < min)
- min = xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
- cursor++;
- }
- XBT_DEBUG("Stacks sizes comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->stacks_sizes_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->stacks_sizes_comparison_times), max, min);
- }
-
- if(xbt_dynar_length(ct->binary_global_variables_comparison_times) > 0){
- cursor = 0;
- total = 0.0;
- max = 0.0;
- min = xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
- while(cursor < xbt_dynar_length(ct->binary_global_variables_comparison_times) - 1){
- total += xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double) > max)
- max = xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double) < min)
- min = xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
- cursor++;
- }
- XBT_DEBUG("Binary global variables comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->binary_global_variables_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->binary_global_variables_comparison_times), max, min);
- }
-
- if(xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times) > 0){
- cursor = 0;
- total = 0.0;
- max = 0.0;
- min = xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
- while(cursor < xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times) - 1){
- total += xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double) > max)
- max = xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double) < min)
- min = xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
- cursor++;
- }
- XBT_DEBUG("Libsimgrid global variables comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times), max, min);
- }
-
- if(xbt_dynar_length(ct->heap_comparison_times) > 0){
- cursor = 0;
- total = 0.0;
- max = 0.0;
- min = xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
- while(cursor < xbt_dynar_length(ct->heap_comparison_times) - 1){
- total += xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->heap_comparison_times, cursor, double) > max)
- max = xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->heap_comparison_times, cursor, double) < min)
- min = xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
- cursor++;
- }
- XBT_DEBUG("Heap comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->heap_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->heap_comparison_times), max, min);
- }
-
- if(xbt_dynar_length(ct->stacks_comparison_times) > 0){
- cursor = 0;
- total = 0.0;
- max = 0.0;
- min = xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
- while(cursor < xbt_dynar_length(ct->stacks_comparison_times) - 1){
- total += xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double) > max)
- max = xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double) < min)
- min = xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
- cursor++;
- }
- XBT_DEBUG("Stacks comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->stacks_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->stacks_comparison_times), max, min);
- }
-
- if(xbt_dynar_length(ct->snapshot_comparison_times) > 0){
- cursor = 0;
- total = 0.0;
- max = 0.0;
- min = xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
- while(cursor < xbt_dynar_length(ct->snapshot_comparison_times) - 1){
- total += xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double) > max)
- max = xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
- if(xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double) < min)
- min = xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
- cursor++;
- }
- XBT_DEBUG("Snapshot comparison (Whole funnel) -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->snapshot_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->snapshot_comparison_times), max, min);
- }
-
-}
-
-mc_comparison_times_t new_comparison_times(){
- mc_comparison_times_t ct = NULL;
- ct = xbt_new0(s_mc_comparison_times_t, 1);
- ct->nb_comparisons = 0;
- ct->snapshot_comparison_times = xbt_dynar_new(sizeof(double), NULL);
- ct->chunks_used_comparison_times = xbt_dynar_new(sizeof(double), NULL);
- ct->stacks_sizes_comparison_times = xbt_dynar_new(sizeof(double), NULL);
- ct->binary_global_variables_comparison_times = xbt_dynar_new(sizeof(double), NULL);
- ct->libsimgrid_global_variables_comparison_times = xbt_dynar_new(sizeof(double), NULL);
- ct->heap_comparison_times = xbt_dynar_new(sizeof(double), NULL);
- ct->stacks_comparison_times = xbt_dynar_new(sizeof(double), NULL);
- return ct;
-}
-
int reached(xbt_state_t st){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
new_pair->nb = xbt_dynar_length(reached_pairs) + 1;
new_pair->automaton_state = st;
new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- new_pair->comparison_times = new_comparison_times();
new_pair->system_state = MC_take_snapshot();
/* Get values of propositional symbols */
XBT_DEBUG("****** Pair reached #%d ******", pair_test->nb);
if(automaton_state_compare(pair_test->automaton_state, st) == 0){
if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state, new_pair->comparison_times, pair_test->comparison_times) == 0){
+ if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
if(raw_mem_set)
MC_SET_RAW_MEM;
MC_UNSET_RAW_MEM;
return 1;
- }
+ }
}else{
XBT_DEBUG("Different values of propositional symbols");
}
}else{
XBT_DEBUG("Different automaton state");
}
- if(pair_test->comparison_times != NULL && XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
- XBT_DEBUG("*** Comparison times statistics ***");
- MC_print_comparison_times_statistics(pair_test->comparison_times);
- }
}
/* New pair reached */
pair->nb = xbt_dynar_length(reached_pairs) + 1;
pair->automaton_state = st;
pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- pair->comparison_times = new_comparison_times();
pair->system_state = MC_take_snapshot();
/* Get values of propositional symbols */
XBT_DEBUG("****** Pair visited #%d ******", cursor + 1);
if(automaton_state_compare(pair_test->automaton_state, st) == 0){
if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state, NULL, NULL) == 0){
+ if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
if(raw_mem_set)
MC_SET_RAW_MEM;
else
if(pair){
pair->automaton_state = NULL;
xbt_dynar_free(&(pair->prop_ato));
- if(pair->comparison_times != NULL){
- xbt_dynar_free(&(pair->comparison_times->snapshot_comparison_times));
- xbt_dynar_free(&(pair->comparison_times->chunks_used_comparison_times));
- xbt_dynar_free(&(pair->comparison_times->stacks_sizes_comparison_times));
- xbt_dynar_free(&(pair->comparison_times->binary_global_variables_comparison_times));
- xbt_dynar_free(&(pair->comparison_times->libsimgrid_global_variables_comparison_times));
- xbt_dynar_free(&(pair->comparison_times->heap_comparison_times));
- xbt_dynar_free(&(pair->comparison_times->stacks_comparison_times));
- }
MC_free_snapshot(pair->system_state);
xbt_free(pair);
}
/* Debug information */
- req_str = MC_request_to_string(req, value);
- XBT_DEBUG("Execute: %s", req_str);
- xbt_free(req_str);
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Execute: %s", req_str);
+ xbt_free(req_str);
+ }
MC_state_set_executed_request(current_pair->graph_state, req, value);