From 2e501076bf39bf43b598954f040b453fedf49f4c Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Thu, 12 Nov 2015 14:45:37 +0100 Subject: [PATCH] [mc] Simplification, remove profiling code --- src/mc/ModelChecker.cpp | 2 - src/mc/mc_compare.cpp | 106 ---------------------------------------- src/mc/mc_global.cpp | 2 - src/mc/mc_private.h | 13 ----- 4 files changed, 123 deletions(-) diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 785d614320..9ceba066cc 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -115,8 +115,6 @@ void ModelChecker::start() // TODO, avoid direct dependency on sg_cfg process_->privatized(sg_cfg_get_boolean("smpi/privatize_global_variables")); - mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); - /* Initialize statistics */ mc_stats = xbt_new0(s_mc_stats_t, 1); mc_stats->state_size = 1; diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp index 1019fdb8bb..ed0d50e18d 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -388,15 +388,6 @@ int snapshot_compare(void *state1, void *state2) int errors = 0; int res_init; - xbt_os_timer_t global_timer = xbt_os_timer_new(); - xbt_os_timer_t timer = xbt_os_timer_new(); - - xbt_os_walltimer_start(global_timer); - -#ifdef MC_DEBUG - xbt_os_walltimer_start(timer); -#endif - int hash_result = 0; if (_sg_mc_hash) { hash_result = (s1->hash != s2->hash); @@ -429,11 +420,6 @@ int snapshot_compare(void *state1, void *state2) size_used2 = s2->stack_sizes[i]; if (size_used1 != size_used2) { #ifdef MC_DEBUG - if (is_diff == 0) { - xbt_os_walltimer_stop(timer); - mc_comp_times->stacks_sizes_comparison_time = - xbt_os_timer_elapsed(timer); - } XBT_DEBUG("(%d - %d) Different size used in stacks : %zu - %zu", num1, num2, size_used1, size_used2); errors++; @@ -444,25 +430,12 @@ int snapshot_compare(void *state1, void *state2) num2, size_used1, size_used2); #endif XBT_TRACE3(mc, state_diff, num1, num2, "Different stack size"); - - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; #endif } i++; } -#ifdef MC_DEBUG - if (is_diff == 0) - xbt_os_walltimer_stop(timer); - xbt_os_walltimer_start(timer); -#endif - /* Init heap information used in heap comparison algorithm */ xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes( alloca(sizeof(struct mdesc)), sizeof(struct mdesc), @@ -483,16 +456,9 @@ int snapshot_compare(void *state1, void *state2) XBT_VERB("(%d - %d) Different heap information", num1, num2); #endif - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; #endif } -#ifdef MC_DEBUG - xbt_os_walltimer_start(timer); -#endif /* Stacks comparison */ unsigned cursor = 0; @@ -515,10 +481,6 @@ int snapshot_compare(void *state1, void *state2) if (diff_local > 0) { XBT_TRACE3(mc, state_diff, num1, num2, "Different local variables"); #ifdef MC_DEBUG - if (is_diff == 0) { - xbt_os_walltimer_stop(timer); - mc_comp_times->stacks_comparison_time = xbt_os_timer_elapsed(timer); - } XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1, num2, cursor + 1); errors++; @@ -531,11 +493,6 @@ int snapshot_compare(void *state1, void *state2) #endif reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); return 1; #endif @@ -547,8 +504,6 @@ int snapshot_compare(void *state1, void *state2) // TODO, raise a difference instead? xbt_assert(regions_count == s2->snapshot_regions.size()); - mc_comp_times->global_variables_comparison_time = 0; - for (size_t k = 0; k != regions_count; ++k) { mc_mem_region_t region1 = s1->snapshot_regions[k].get(); mc_mem_region_t region2 = s2->snapshot_regions[k].get(); @@ -563,12 +518,6 @@ int snapshot_compare(void *state1, void *state2) std::string const& name = region1->object_info()->file_name; -#ifdef MC_DEBUG - if (is_diff == 0) - xbt_os_walltimer_stop(timer); - xbt_os_walltimer_start(timer); -#endif - /* Compare global variables */ is_diff = compare_global_variables(region1->object_info( ), simgrid::mc::AddressSpace::Normal, @@ -578,9 +527,6 @@ int snapshot_compare(void *state1, void *state2) if (is_diff != 0) { XBT_TRACE3(mc, state_diff, num1, num2, "Different global variables"); #ifdef MC_DEBUG - xbt_os_walltimer_stop(timer); - mc_comp_times->global_variables_comparison_time - += xbt_os_timer_elapsed(timer); XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2, name.c_str()); errors++; @@ -590,29 +536,16 @@ int snapshot_compare(void *state1, void *state2) num1, num2, name.c_str()); #endif - reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; #endif } } -#ifdef MC_DEBUG - xbt_os_walltimer_start(timer); -#endif - /* Compare heap */ if (mmalloc_compare_heap(s1, s2) > 0) { XBT_TRACE3(mc, state_diff, num1, num2, "Different heap"); #ifdef MC_DEBUG - xbt_os_walltimer_stop(timer); - mc_comp_times->heap_comparison_time = xbt_os_timer_elapsed(timer); XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2); errors++; #else @@ -621,37 +554,12 @@ int snapshot_compare(void *state1, void *state2) XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", num1, num2); #endif - reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; -#endif - } else { -#ifdef MC_DEBUG - xbt_os_walltimer_stop(timer); #endif } reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - -#ifdef MC_VERBOSE - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); -#endif - - xbt_os_timer_free(global_timer); - -#ifdef MC_DEBUG - print_comparison_times(); -#endif - #ifdef MC_VERBOSE if (errors || hash_result) XBT_VERB("(%d - %d) Difference found", num1, num2); @@ -674,18 +582,4 @@ int snapshot_compare(void *state1, void *state2) } -/***************************** Statistics *****************************/ -/*******************************************************************/ - -void print_comparison_times() -{ - XBT_DEBUG("*** Comparison times ***"); - XBT_DEBUG("- Nb processes : %f", mc_comp_times->nb_processes_comparison_time); - XBT_DEBUG("- Nb bytes used : %f", mc_comp_times->bytes_used_comparison_time); - XBT_DEBUG("- Stacks sizes : %f", mc_comp_times->stacks_sizes_comparison_time); - XBT_DEBUG("- GLobal variables : %f", mc_comp_times->global_variables_comparison_time); - XBT_DEBUG("- Heap : %f", mc_comp_times->heap_comparison_time); - XBT_DEBUG("- Stacks : %f", mc_comp_times->stacks_comparison_time); -} - } diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 62bb75d444..86891d46cb 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -62,8 +62,6 @@ int user_max_depth_reached = 0; mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; -__thread mc_comparison_times_t mc_comp_times = NULL; -__thread double mc_snapshot_comparison_time; mc_stats_t mc_stats = NULL; mc_global_t initial_global_state = NULL; xbt_fifo_t mc_stack = NULL; diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 00c1dd9c6e..f8293b561a 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -91,20 +91,7 @@ XBT_PRIVATE void MC_print_statistics(mc_stats_t stats); /********************************** Snapshot comparison **********************************/ -typedef struct s_mc_comparison_times{ - double nb_processes_comparison_time; - double bytes_used_comparison_time; - double stacks_sizes_comparison_time; - double global_variables_comparison_time; - double heap_comparison_time; - double stacks_comparison_time; -}s_mc_comparison_times_t, *mc_comparison_times_t; - -extern XBT_PRIVATE __thread mc_comparison_times_t mc_comp_times; -extern XBT_PRIVATE __thread double mc_snapshot_comparison_time; - XBT_PRIVATE int snapshot_compare(void *state1, void *state2); -XBT_PRIVATE void print_comparison_times(void); //#define MC_DEBUG 1 #define MC_VERBOSE 1 -- 2.20.1