new_reg->start_addr = start_addr;
new_reg->size = size;
new_reg->data = xbt_malloc0(size);
+ XBT_DEBUG("New reg data %p, start_addr %p", new_reg->data, start_addr);
memcpy(new_reg->data, start_addr, size);
+
return new_reg;
}
{
/*FIXME: check if start_addr is still mapped, if it is not, then map it
before copying the data */
- memcpy(reg->start_addr, reg->data, reg->size);
+ if(reg->type == 3){
+ memory_map_t maps = get_memory_map();
+ MC_UNSET_RAW_MEM;
+ unsigned int i=0;
+ s_map_region r;
+ while(i < maps->mapsize){
+ r = maps->regions[i];
+ if (maps->regions[i].pathname != NULL){
+ if (!memcmp(maps->regions[i].pathname, "[stack]", 7)){
+ size_t diff = (char*)reg->start_addr - (char*)r.start_addr;
+ void *segment = malloc(reg->size + diff);
+ XBT_DEBUG("Size of segment : %lu", sizeof(segment));
+ memcpy((char *)segment + diff, reg->data, reg->size);
+ //memset(segment, '\0', diff);
+ //XBT_DEBUG("Memset ok");
+ //memcpy(segment+diff, reg->data, reg->size);
+ //XBT_DEBUG("Memcpy segment ok");
+ memcpy(r.start_addr, segment, sizeof(segment));
+ XBT_DEBUG("Memcpy region ok");
+ //memcpy(r.start_addr, reg->data, sizeof(reg->data));
+ break;
+ }
+ }
+ i++;
+ }
+ }else{
+ XBT_DEBUG("Memcpy : dest %p, src %p, size %Zu", reg->start_addr, reg->data, reg->size);
+ memcpy(reg->start_addr, reg->data, reg->size);
+ }
+
+ //return;
}
static void MC_region_destroy(mc_mem_region_t reg)
static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size)
{
+ switch(type){
+ case 0 :
+ XBT_DEBUG("New region heap");
+ break;
+ case 1 :
+ XBT_DEBUG("New region libsimgrid");
+ break;
+ case 2 :
+ XBT_DEBUG("New region program");
+ break;
+ case 3 :
+ XBT_DEBUG("New region stack");
+ break;
+ }
mc_mem_region_t new_reg = MC_region_new(type, start_addr, size);
snapshot->regions = xbt_realloc(snapshot->regions, (snapshot->num_reg + 1) * sizeof(mc_mem_region_t));
snapshot->regions[snapshot->num_reg] = new_reg;
s_map_region reg;
memory_map_t maps = get_memory_map();
+ for(i=0; i< snapshot->num_reg; i++){
+ MC_region_destroy(snapshot->regions[i]);
+ }
+
+ snapshot->num_reg = 0;
+
+ i = 0;
+
/* Save the std heap and the writable mapped pages of libsimgrid */
while (i < maps->mapsize) {
reg = maps->regions[i];
MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
} else {
if (!memcmp(basename(maps->regions[i].pathname), basename(prgm), strlen(basename(prgm)))){
- MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
- }
+ MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+ } else {
+ if (!memcmp(maps->regions[i].pathname, "[stack]", 7)){
+ MC_snapshot_add_region(snapshot, 3, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+ }
+ }
}
}
}
void MC_restore_snapshot(mc_snapshot_t snapshot)
{
unsigned int i;
- for(i=0; i < snapshot->num_reg; i++)
+ for(i=0; i < snapshot->num_reg; i++){
MC_region_restore(snapshot->regions[i]);
+ switch(snapshot->regions[i]->type){
+ case 0 :
+ XBT_DEBUG("heap restored");
+ break;
+ case 1:
+ XBT_DEBUG("libsimgrid (data) restored");
+ break;
+ case 2:
+ XBT_DEBUG("program (data) restored");
+ break;
+ case 3:
+ XBT_DEBUG("stack restored");
+ break;
+ }
+
+ }
+
}
void MC_free_snapshot(mc_snapshot_t snapshot)
xbt_free(snapshot);
}
+
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
"Logging specific to algorithms for liveness properties verification");
-xbt_dynar_t initial_pairs = NULL;
xbt_fifo_t reached_pairs;
xbt_fifo_t visited_pairs;
xbt_dynar_t successors = NULL;
-extern mc_snapshot_t initial_snapshot;
+
+//mc_snapshot_t snapshot;
int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
- XBT_DEBUG("Compare snapshot");
+ //XBT_DEBUG("Compare snapshot");
if(s1->num_reg != s2->num_reg){
XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
return 1;
}
+ //XBT_DEBUG("Num reg : %d", s1->num_reg);
+
int i;
int errors = 0;
for(i=0 ; i< s1->num_reg ; i++){
-
- if(s1->regions[i]->size != s2->regions[i]->size){
- XBT_DEBUG("Different size of region");
- return 1;
- }
-
- if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- XBT_DEBUG("Different start addr of region");
- return 1;
- }
-
+
if(s1->regions[i]->type != s2->regions[i]->type){
- XBT_DEBUG("Different type of region");
+ //XBT_DEBUG("Different type of region");
return 1;
}
-
- if(s1->regions[i]->type == 0){
+ switch(s1->regions[i]->type){
+ case 0:
+ //XBT_DEBUG("Region : heap");
+ if(s1->regions[i]->size != s2->regions[i]->size){
+ //XBT_DEBUG("Different size of heap (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ return 1;
+ }
+ if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+ //XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ return 1;
+ }
if(mmalloc_compare_heap(s1->regions[i]->start_addr, s2->regions[i]->start_addr)){
- XBT_DEBUG("Different heap (mmalloc_compare)");
+ //XBT_DEBUG("Different heap (mmalloc_compare)");
errors++;
}
- }else{
+ break;
+ case 1 :
+ //XBT_DEBUG("Region : libsimgrid");
+ if(s1->regions[i]->size != s2->regions[i]->size){
+ //XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ return 1;
+ }
+ if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+ //XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ return 1;
+ }
+ if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ //XBT_DEBUG("Different memcmp for data in libsimgrid");
+ errors++;
+ }
+ break;
+ case 2:
+ //XBT_DEBUG("Region : program");
+ if(s1->regions[i]->size != s2->regions[i]->size){
+ //XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ return 1;
+ }
+ if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+ //XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ return 1;
+ }
if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- XBT_DEBUG("Different memcmp for data in libsimgrid or program");
+ //XBT_DEBUG("Different memcmp for data in program");
errors++;
}
+ break;
+ case 3:
+ //XBT_DEBUG("Region : stack");
+ if(s1->regions[i]->size != s2->regions[i]->size){
+ //XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ return 1;
+ }
+ if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+ //XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ return 1;
+ }
+ if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ //XBT_DEBUG("Different memcmp for data in stack");
+ errors++;
+ }
+ break;
}
-
-
}
return (errors>0);
-
+
}
-int reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s){
+int reached(xbt_automaton_t a, xbt_state_t st, char *prgm){
if(xbt_fifo_size(reached_pairs) == 0){
return 0;
}else{
-
- MC_SET_RAW_MEM;
xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
xbt_dynar_push_as(prop_ato, int, res);
}
-
+ MC_SET_RAW_MEM;
+ mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(sn, prgm);
+ MC_UNSET_RAW_MEM;
int i=0;
xbt_fifo_item_t item = xbt_fifo_get_first_item(reached_pairs);
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(s, pair_test->system_state) == 0){
+ if(snapshot_compare(sn, pair_test->system_state) == 0){
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 1;
}
}
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 0;
}
}
-void set_pair_reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t sn){
+void set_pair_reached(xbt_automaton_t a, xbt_state_t st, char *prgm){
MC_SET_RAW_MEM;
pair = xbt_new0(s_mc_pair_reached_t, 1);
pair->automaton_state = st;
pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- pair->system_state = sn;
+ pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(pair->system_state, prgm);
/* Get values of propositional symbols */
unsigned int cursor = 0;
}
-int visited(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s, int sc){
+int visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){
if(xbt_fifo_size(visited_pairs) == 0){
return 0;
}else{
-
- MC_SET_RAW_MEM;
xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
xbt_dynar_push_as(prop_ato, int, res);
}
+ MC_SET_RAW_MEM;
+ mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(sn, prgm);
+ MC_UNSET_RAW_MEM;
int i=0;
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(s, pair_test->system_state) == 0){
+ if(snapshot_compare(sn, pair_test->system_state) == 0){
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 1;
}
}
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 0;
}
}
-void set_pair_visited(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t sn, int sc){
+void set_pair_visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){
MC_SET_RAW_MEM;
-
+
mc_pair_visited_t pair = NULL;
pair = xbt_new0(s_mc_pair_visited_t, 1);
pair->automaton_state = st;
pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- pair->system_state = sn;
+ pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(pair->system_state, prgm);
pair->search_cycle = sc;
/* Get values of propositional symbols */
visited_pairs = xbt_fifo_new();
successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
- initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(initial_snapshot, prgm);
+ /* Save the initial state */
+ initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(initial_snapshot_liveness, prgm);
MC_UNSET_RAW_MEM;
MC_UNSET_RAW_MEM;
if(cursor != 0){
- MC_restore_snapshot(initial_snapshot);
+ MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
}
xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
MC_UNSET_RAW_MEM;
- set_pair_reached(a, state, initial_snapshot);
+ set_pair_reached(a, state, prgm);
if(cursor != 0){
- MC_restore_snapshot(initial_snapshot);
+ MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
}
smx_process_t process;
mc_pair_stateless_t current_pair = NULL;
- mc_snapshot_t snapshot = NULL;
- mc_snapshot_t current_snapshot = NULL;
+
+ //mc_snapshot_t current_snapshot = NULL;
if(xbt_fifo_size(mc_stack_liveness_stateless) == 0)
return;
mc_stats_pair->visited_pairs++;
+ //sleep(1);
+
int value;
mc_state_t next_graph_state = NULL;
smx_req_t req = NULL;
if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){
- MC_SET_RAW_MEM;
- current_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(current_snapshot, prgm);
- MC_UNSET_RAW_MEM;
-
- set_pair_visited(a, current_pair->automaton_state, current_snapshot, search_cycle);
+ set_pair_visited(a, current_pair->automaton_state, search_cycle, prgm);
if(current_pair->requests > 0){
}
cursor = 0;
-
- MC_SET_RAW_MEM;
- snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(snapshot, prgm);
- MC_UNSET_RAW_MEM;
xbt_dynar_foreach(successors, cursor, pair_succ){
- if(!visited(a, pair_succ->automaton_state, snapshot, search_cycle)){
+ if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){
if(search_cycle == 1){
if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
- if(reached(a, pair_succ->automaton_state, snapshot) == 1){
+ if(reached(a, pair_succ->automaton_state, prgm) == 1){
XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1, MC_state_interleave_size(pair_succ->graph_state));
XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
}
XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
search_cycle = 1;
}
cursor = 0;
-
- MC_SET_RAW_MEM;
- snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(snapshot, prgm);
- MC_UNSET_RAW_MEM;
xbt_dynar_foreach(successors, cursor, pair_succ){
- if(!visited(a, pair_succ->automaton_state, snapshot, search_cycle)){
+ if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){
if(search_cycle == 1){
if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
- if(reached(a, pair_succ->automaton_state, snapshot) == 1){
+ if(reached(a, pair_succ->automaton_state, prgm) == 1){
XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1);
XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
}
if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)) && (xbt_fifo_size(mc_stack_liveness_stateless) < (MAX_DEPTH_LIVENESS - 1))){
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
search_cycle = 1;
}
if(xbt_fifo_size(mc_stack_liveness_stateless) == MAX_DEPTH_LIVENESS ){
- XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle);
+ XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness_stateless) );
}else{
- XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle);
+ XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness_stateless) );
}
if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
xbt_fifo_shift(reached_pairs);
}
- if(snapshot != NULL)
- MC_free_snapshot(snapshot);
- MC_pair_stateless_delete(current_pair);
MC_UNSET_RAW_MEM;