X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37baaf70ee95c42a6f4b80913db243c199230fb9..9006d78ba8a08a6500c994bb8141f48376448fc4:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 9ea615fa67..521129e930 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -33,70 +33,14 @@ unsigned int hash_region(char *str, int str_len){ } -const char* get_memory_map_addr(void *addr){ - - FILE *fp; /* File pointer to process's proc maps file */ - char *line = NULL; /* Temporal storage for each line that is readed */ - ssize_t read; /* Number of bytes readed */ - size_t n = 0; /* Amount of bytes to read by getline */ - - fp = fopen("/proc/self/maps", "r"); - - if(fp == NULL) - perror("fopen failed"); - - if(addr == NULL){ - fclose(fp); - return "nil"; - } - - xbt_dynar_t lfields = NULL; - xbt_dynar_t start_end = NULL; - void *start_addr; - void *end_addr; - - while ((read = getline(&line, &n, fp)) != -1) { - - xbt_str_trim(line, NULL); - xbt_str_strip_spaces(line); - lfields = xbt_str_split(line,NULL); - - start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-"); - start_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 0, char*), NULL, 16); - end_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 1, char*), NULL, 16); - - if((addr > start_addr) && ( addr < end_addr)){ - free(line); - fclose(fp); - if(start_addr == std_heap) - return "std_heap"; - if(start_addr == raw_heap) - return "raw_heap"; - if(xbt_dynar_length(lfields) == 6) - return xbt_dynar_get_as(lfields, xbt_dynar_length(lfields) - 1, char*); - else - return "Anonymous"; - } - - } - - free(line); - fclose(fp); - return "Unknown area"; - -} - int data_program_region_compare(void *d1, void *d2, size_t size){ int distance = 0; - int pointer_align; int i; for(i=0; inum_reg != s2->num_reg){ @@ -152,7 +93,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, void* s_heap, void* r_h XBT_INFO("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); errors++; } - if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data, s_heap, r_heap)){ + if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){ XBT_INFO("Different heap (mmalloc_compare)"); errors++; } @@ -227,13 +168,14 @@ int reached(xbt_state_t st){ //xbt_dict_t current_rdv_points = SIMIX_get_rdv_points(); xbt_dynar_foreach(reached_pairs, cursor, pair_test){ - XBT_INFO("Pair reached #%u", cursor+1); + XBT_INFO("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, prop_ato) == 0){ //XBT_INFO("Rdv points size %d - %d", xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points)); //if(xbt_dict_length(pair_test->rdv_points) == xbt_dict_length(current_rdv_points)){ //if(rdv_points_compare(pair_test->rdv_points, current_rdv_points) == 0){ - if(snapshot_compare(pair_test->system_state, sn, std_heap, raw_heap) == 0){ + if(snapshot_compare(pair_test->system_state, sn) == 0){ + MC_free_snapshot(sn); xbt_dynar_reset(prop_ato); xbt_free(prop_ato); @@ -429,6 +371,7 @@ void set_pair_reached(xbt_state_t st){ mc_pair_reached_t pair = NULL; pair = xbt_new0(s_mc_pair_reached_t, 1); + pair->nb = xbt_dynar_length(reached_pairs) + 1; pair->automaton_state = st; pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); pair->system_state = xbt_new0(s_mc_snapshot_t, 1); @@ -630,7 +573,7 @@ int visited(xbt_state_t st, int sc){ if(pair_test->search_cycle == sc) { if(automaton_state_compare(pair_test->automaton_state, st) == 0){ if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - if(snapshot_compare(pair_test->system_state, sn, std_heap, raw_heap) == 0){ + if(snapshot_compare(pair_test->system_state, sn) == 0){ MC_free_snapshot(sn); xbt_dynar_reset(prop_ato); @@ -992,7 +935,7 @@ void MC_ddfs(int search_cycle){ mc_pair_stateless_t next_pair = NULL; mc_pair_stateless_t pair_succ; - + if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){ //set_pair_visited(current_pair->automaton_state, search_cycle); @@ -1012,7 +955,7 @@ void MC_ddfs(int search_cycle){ xbt_free(req_str); MC_state_set_executed_request(current_pair->graph_state, req, value); - + /* Answer the request */ SIMIX_simcall_pre(req, value); @@ -1226,7 +1169,7 @@ void MC_ddfs(int search_cycle){ //if(reached_hash(pair_succ->automaton_state)){ XBT_INFO("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1); - + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); XBT_INFO("| ACCEPTANCE CYCLE |"); XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); @@ -1337,3 +1280,60 @@ void MC_ddfs(int search_cycle){ } + + +#ifdef SIMGRID_TEST + +XBT_TEST_SUITE("mc_liveness", "Model checking liveness properties"); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(mc_liveness); + +XBT_TEST_UNIT("snapshots_comparison", test_compare_snapshot, "Comparison of snapshots") +{ + + MC_SET_RAW_MEM; + + /* Save first snapshot */ + mc_snapshot_t snapshot1 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot1); + + /* Save second snapshot */ + mc_snapshot_t snapshot2 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot2); + + MC_UNSET_RAW_MEM; + + xbt_test_assert(snapshot_compare(snapshot1, snapshot2) == 0, "Different consecutive snapshot"); + + +} + +XBT_TEST_UNIT("snapshots_comparison2", test2_compare_snapshot, "Comparison of snapshots with modification between") +{ + + MC_SET_RAW_MEM; + + /* Save first snapshot */ + mc_snapshot_t snapshot1 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot1); + + MC_UNSET_RAW_MEM; + + void *test = snapshot1; + test = (char*)test+1; + char* t= strdup("toto"); + t=strdup("tat"); + + MC_SET_RAW_MEM; + + /* Save second snapshot */ + mc_snapshot_t snapshot2 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot2); + + xbt_test_assert(snapshot_compare(snapshot1, snapshot2) != 0, "Same snapshot with new allocations"); + + MC_UNSET_RAW_MEM; + + +} + +#endif