#include "mc_private.h"
#include <unistd.h>
+#include <sys/wait.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
"Logging specific to algorithms for liveness properties verification");
xbt_dynar_t reached_pairs;
-xbt_dynar_t reached_pairs_hash;
-xbt_dynar_t visited_pairs;
-xbt_dynar_t visited_pairs_hash;
xbt_dynar_t successors;
-xbt_dynar_t hosts_table;
-
-
-/* fast implementation of djb2 algorithm */
-unsigned int hash_region(char *str, int str_len){
-
- int c;
- register unsigned int hash = 5381;
-
- while (str_len--) {
- c = *str++;
- hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
- }
-
- return hash;
-
-}
-
-int data_program_region_compare(void *d1, void *d2, size_t size){
- int distance = 0;
- int i;
-
- for(i=0; i<size; i++){
- if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
- fprintf(stderr,"Different byte (offset=%d) (%p - %p) in data program region\n", i, (char *)d1 + i, (char *)d2 + i);
- distance++;
- }
- }
-
- fprintf(stderr, "Hamming distance between data program regions : %d\n", distance);
-
- return distance;
-}
-
-int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
- int distance = 0;
- int i;
-
- for(i=0; i<size; i++){
- if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
- fprintf(stderr, "Different byte (offset=%d) (%p - %p) in data libsimgrid region\n", i, (char *)d1 + i, (char *)d2 + i);
- distance++;
- }
- }
-
- fprintf(stderr, "Hamming distance between data libsimgrid regions : %d\n", distance);
-
- return distance;
-}
-
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
-
-
- if(s1->num_reg != s2->num_reg){
- XBT_INFO("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
- return 1;
- }
-
- int i;
- int errors = 0;
-
- for(i=0 ; i< s1->num_reg ; i++){
-
- if(s1->regions[i]->type != s2->regions[i]->type){
- XBT_INFO("Different type of region");
- errors++;
- }
-
- switch(s1->regions[i]->type){
- case 0:
- if(s1->regions[i]->size != s2->regions[i]->size){
- XBT_INFO("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
- errors++;
- }
- if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- 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)){
- XBT_INFO("Different heap (mmalloc_compare)");
- errors++;
- }
- break;
- case 1 :
- if(s1->regions[i]->size != s2->regions[i]->size){
- XBT_INFO("Different size of libsimgrid (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
- errors++;
- }
- if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- XBT_INFO("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
- errors++;
- }
- if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- XBT_INFO("Different memcmp for data in libsimgrid");
- errors++;
- }
- break;
- case 2 :
- if(s1->regions[i]->size != s2->regions[i]->size){
- XBT_INFO("Different size of data program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
- errors++;
- }
- if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- XBT_INFO("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
- errors++;
- }
- if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- XBT_INFO("Different memcmp for data in program");
- errors++;
- }
- break;
- default:
- break;
- }
- }
-
- return (errors > 0);
-
-}
-
-int reached(xbt_state_t st){
-
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
-
- if(xbt_dynar_is_empty(reached_pairs)){
-
- return 0;
-
- }else{
-
- MC_SET_RAW_MEM;
-
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
-
- xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
- int res;
- int_f_void_t f;
-
- /* Get values of propositional symbols */
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = (*f)();
- xbt_dynar_push_as(prop_ato, int, res);
- }
-
- cursor = 0;
- mc_pair_reached_t pair_test = NULL;
-
- //xbt_dict_t current_rdv_points = SIMIX_get_rdv_points();
-
- xbt_dynar_foreach(reached_pairs, cursor, pair_test){
- 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) == 0){
-
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
- return 1;
- }
- /* }
- }else{
- XBT_INFO("Different size of rdv points (%d - %d)",xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points) );
- }*/
- }else{
- XBT_INFO("Different values of propositional symbols");
- }
- }else{
- XBT_INFO("Different automaton state");
- }
- }
-
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
+int create_dump(int pair)
+{
+ // Try to enable core dumps
+ struct rlimit core_limit;
+ core_limit.rlim_cur = RLIM_INFINITY;
+ core_limit.rlim_max = RLIM_INFINITY;
+
+ if(setrlimit(RLIMIT_CORE, &core_limit) < 0)
+ fprintf(stderr, "setrlimit: %s\nWarning: core dumps may be truncated or non-existant\n", strerror(errno));
+
+ int status;
+ switch(fork()){
+ case 0:
+ // We are the child process -- run the actual program
+ abort();
+ break;
- return 0;
+ case -1:
+ // An error occurred, shouldn't happen
+ perror("fork");
+ return -1;
- }
-}
-
-int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2){ /* d1 = pair_test, d2 = current_pair */
-
- xbt_dict_cursor_t cursor_dict = NULL;
- char *key;
- char *data;
- smx_rdv_t rdv1, rdv2;
- xbt_fifo_item_t item1, item2;
- smx_action_t action1, action2;
- xbt_fifo_item_t item_req1, item_req2;
- smx_simcall_t req1, req2;
- int i=0;
- int j=0;
-
- xbt_dict_foreach(d1, cursor_dict, key, data){
- rdv1 = (smx_rdv_t)data;
- rdv2 = xbt_dict_get_or_null(d2, rdv1->name);
- if(rdv2 == NULL){
- XBT_INFO("Rdv point unknown");
- return 1;
- }else{
- if(xbt_fifo_size(rdv1->comm_fifo) != xbt_fifo_size(rdv2->comm_fifo)){
- XBT_INFO("Different total of actions in mailbox \"%s\" (%d - %d)", rdv1->name, xbt_fifo_size(rdv1->comm_fifo),xbt_fifo_size(rdv2->comm_fifo) );
- return 1;
- }else{
-
- XBT_INFO("Total of actions in mailbox \"%s\" : %d", rdv1->name, xbt_fifo_size(rdv1->comm_fifo));
-
- item1 = xbt_fifo_get_first_item(rdv1->comm_fifo);
- item2 = xbt_fifo_get_first_item(rdv2->comm_fifo);
-
- while(i<xbt_fifo_size(rdv1->comm_fifo)){
- action1 = (smx_action_t) xbt_fifo_get_item_content(item1);
- action2 = (smx_action_t) xbt_fifo_get_item_content(item2);
-
- if(action1->type != action2->type){
- XBT_INFO("Different type of action");
- return 1;
- }
-
- if(action1->state != action2->state){
- XBT_INFO("Different state of action");
- return 1;
- }
-
- if(xbt_fifo_size(action1->simcalls) != xbt_fifo_size(action2->simcalls)){
- XBT_INFO("Different size of simcall list (%d - %d", xbt_fifo_size(action1->simcalls), xbt_fifo_size(action2->simcalls));
- return 1;
- }else{
-
- item_req1 = xbt_fifo_get_first_item(action1->simcalls);
- item_req2 = xbt_fifo_get_first_item(action2->simcalls);
-
- while(j<xbt_fifo_size(action1->simcalls)){
-
- req1 = (smx_simcall_t) xbt_fifo_get_item_content(item_req1);
- req2 = (smx_simcall_t) xbt_fifo_get_item_content(item_req2);
-
- if(req1->call != req2->call){
- XBT_INFO("Different simcall call in simcalls of action (%d - %d)", (int)req1->call, (int)req2->call);
- return 1;
- }
- if(req1->issuer->pid != req2->issuer->pid){
- XBT_INFO("Different simcall issuer in simcalls of action (%lu- %lu)", req1->issuer->pid, req2->issuer->pid);
- return 1;
- }
-
- item_req1 = xbt_fifo_get_next_item(item_req1);
- item_req2 = xbt_fifo_get_next_item(item_req2);
- j++;
-
- }
- }
-
- switch(action1->type){
- case 0: /* execution */
- case 1: /* parallel execution */
- if(strcmp(action1->execution.host->name, action2->execution.host->name) != 0)
- return 1;
- break;
- case 2: /* comm */
- if(action1->comm.type != action2->comm.type)
- return 1;
- //XBT_INFO("Type of comm : %d", action1->comm.type);
-
- switch(action1->comm.type){
- case 0: /* SEND */
- if(action1->comm.src_proc->pid != action2->comm.src_proc->pid)
- return 1;
- if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0)
- return 1;
- break;
- case 1: /* RECEIVE */
- if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid)
- return 1;
- if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0)
- return 1;
- break;
- case 2: /* READY */
- if(action1->comm.src_proc->pid != action2->comm.src_proc->pid)
- return 1;
- if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0)
- return 1;
- if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid)
- return 1;
- if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0)
- return 1;
- break;
- case 3: /* DONE */
- if(action1->comm.src_proc->pid != action2->comm.src_proc->pid)
- return 1;
- if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0)
- return 1;
- if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid)
- return 1;
- if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0)
- return 1;
- break;
-
- } /* end of switch on type of comm */
-
- if(action1->comm.refcount != action2->comm.refcount)
- return 1;
- if(action1->comm.detached != action2->comm.detached)
- return 1;
- if(action1->comm.rate != action2->comm.rate)
- return 1;
- if(action1->comm.task_size != action2->comm.task_size)
- return 1;
- if(action1->comm.src_buff != action2->comm.src_buff)
- return 1;
- if(action1->comm.dst_buff != action2->comm.dst_buff)
- return 1;
- if(action1->comm.src_data != action2->comm.src_data)
- return 1;
- if(action1->comm.dst_data != action2->comm.dst_data)
- return 1;
-
- break;
- case 3: /* sleep */
- if(strcmp(action1->sleep.host->name, action2->sleep.host->name) != 0)
- return 1;
- break;
- case 4: /* synchro */
-
- break;
- default:
- break;
- }
-
- item1 = xbt_fifo_get_next_item(item1);
- item2 = xbt_fifo_get_next_item(item2);
- i++;
- }
- }
+ default:
+ // We are the parent process -- wait for the child process to exit
+ if(wait(&status) < 0)
+ perror("wait");
+ if(WIFSIGNALED(status) && WCOREDUMP(status)){
+ char *core_name = malloc(20);
+ sprintf(core_name,"core_%d", pair);
+ rename("core", core_name);
+ free(core_name);
}
}
return 0;
-
}
-void set_pair_reached(xbt_state_t st){
+int reached(xbt_state_t st){
raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
+
MC_SET_RAW_MEM;
-
- 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);
- //pair->rdv_points = xbt_dict_new();
- MC_take_snapshot_liveness(pair->system_state);
+ mc_pair_reached_t new_pair = NULL;
+ new_pair = xbt_new0(s_mc_pair_reached_t, 1);
+ 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->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(new_pair->system_state);
+
/* Get values of propositional symbols */
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
int res;
int_f_void_t f;
-
+ unsigned int cursor = 0;
+ xbt_propositional_symbol_t ps = NULL;
xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
f = (int_f_void_t)ps->function;
res = (*f)();
- xbt_dynar_push_as(pair->prop_ato, int, res);
+ xbt_dynar_push_as(new_pair->prop_ato, int, res);
}
-
- /*xbt_dict_t rdv_points = SIMIX_get_rdv_points();
-
- xbt_dict_cursor_t cursor_dict = NULL;
- char *key;
- char *data;
- xbt_fifo_item_t item;
- smx_action_t action;
-
- xbt_dict_foreach(rdv_points, cursor_dict, key, data){
- smx_rdv_t new_rdv = xbt_new0(s_smx_rvpoint_t, 1);
- new_rdv->name = strdup(((smx_rdv_t)data)->name);
- new_rdv->comm_fifo = xbt_fifo_new();
- xbt_fifo_foreach(((smx_rdv_t)data)->comm_fifo, item, action, smx_action_t) {
- smx_action_t a = xbt_new0(s_smx_action_t, 1);
- memcpy(a, action, sizeof(s_smx_action_t));
- xbt_fifo_push(new_rdv->comm_fifo, a);
- XBT_INFO("New action (type = %d, state = %d) in mailbox \"%s\"", action->type, action->state, key);
- if(action->type==2)
- XBT_INFO("Type of communication : %d, Ref count = %d", action->comm.type, action->comm.refcount);
- }
- //new_rdv->comm_fifo = xbt_fifo_copy(((smx_rdv_t)data)->comm_fifo);
- xbt_dict_set(pair->rdv_points, new_rdv->name, new_rdv, NULL);
- }*/
-
- xbt_dynar_push(reached_pairs, &pair);
-
+
MC_UNSET_RAW_MEM;
+
+ if(xbt_dynar_is_empty(reached_pairs) || !compare){
- if(raw_mem_set)
MC_SET_RAW_MEM;
- else
+ /* New pair reached */
+ xbt_dynar_push(reached_pairs, &new_pair);
MC_UNSET_RAW_MEM;
-}
-
-
-int reached_hash(xbt_state_t st){
-
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- if(xbt_dynar_is_empty(reached_pairs_hash)){
+ create_dump(xbt_dynar_length(reached_pairs));
return 0;
}else{
MC_SET_RAW_MEM;
-
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
-
- int j;
- unsigned int hash_regions[sn->num_reg];
- for(j=0; j<sn->num_reg; j++){
- hash_regions[j] = hash_region(sn->regions[j]->data, sn->regions[j]->size);
- }
-
-
- /* Get values of propositional symbols */
- xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- int res;
- int_f_void_t f;
-
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = (*f)();
- xbt_dynar_push_as(prop_ato, int, res);
- }
-
- mc_pair_reached_hash_t pair_test = NULL;
-
- int region_diff = 0;
-
+
cursor = 0;
-
- xbt_dynar_foreach(reached_pairs_hash, cursor, pair_test){
-
+ mc_pair_reached_t pair_test = NULL;
+
+ xbt_dynar_foreach(reached_pairs, cursor, pair_test){
+ 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){
- for(j=0 ; j< sn->num_reg ; j++){
- if(hash_regions[j] != pair_test->hash_regions[j]){
- region_diff++;
- }
- }
- if(region_diff == 0){
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
- MC_UNSET_RAW_MEM;
-
+ 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) == 0){
+
if(raw_mem_set)
MC_SET_RAW_MEM;
else
MC_UNSET_RAW_MEM;
return 1;
- }else{
- XBT_INFO("Different snapshot");
- }
+ }
}else{
XBT_INFO("Different values of propositional symbols");
}
}else{
XBT_INFO("Different automaton state");
}
-
- region_diff = 0;
- }
-
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
- return 0;
-
- }
-}
-
-void set_pair_reached_hash(xbt_state_t st){
-
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- MC_SET_RAW_MEM;
-
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
-
- mc_pair_reached_hash_t pair = NULL;
- pair = xbt_new0(s_mc_pair_reached_hash_t, 1);
- pair->automaton_state = st;
- pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- pair->hash_regions = malloc(sizeof(unsigned int) * sn->num_reg);
-
- int i;
-
- for(i=0 ; i< sn->num_reg ; i++){
- pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size);
- }
-
- /* Get values of propositional symbols */
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- int res;
- int_f_void_t f;
-
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = (*f)();
- xbt_dynar_push_as(pair->prop_ato, int, res);
- }
-
- xbt_dynar_push(reached_pairs_hash, &pair);
-
- MC_free_snapshot(sn);
-
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
-}
-
-
-int visited(xbt_state_t st, int sc){
-
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- if(xbt_dynar_is_empty(visited_pairs)){
-
- return 0;
-
- }else{
-
- MC_SET_RAW_MEM;
-
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
-
- xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
-
- /* Get values of propositional symbols */
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- int res;
- int_f_void_t f;
-
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = (*f)();
- xbt_dynar_push_as(prop_ato, int, res);
}
- cursor = 0;
- mc_pair_visited_t pair_test = NULL;
+ create_dump(xbt_dynar_length(reached_pairs));
- xbt_dynar_foreach(visited_pairs, cursor, pair_test){
- 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) == 0){
-
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
- MC_UNSET_RAW_MEM;
+ /* New pair reached */
+ xbt_dynar_push(reached_pairs, &new_pair);
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
- return 1;
-
- }else{
- XBT_INFO("Different snapshot");
- }
- }else{
- XBT_INFO("Different values of propositional symbols");
- }
- }else{
- XBT_INFO("Different automaton state");
- }
- }else{
- XBT_INFO("Different value of search_cycle");
- }
- }
-
-
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
if(raw_mem_set)
MC_SET_RAW_MEM;
else
MC_UNSET_RAW_MEM;
-
- return 0;
-
- }
-}
-
-
-int visited_hash(xbt_state_t st, int sc){
-
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- if(xbt_dynar_is_empty(visited_pairs_hash)){
-
- return 0;
-
- }else{
-
- MC_SET_RAW_MEM;
-
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
-
- int j;
- unsigned int hash_regions[sn->num_reg];
- for(j=0; j<sn->num_reg; j++){
- hash_regions[j] = hash_region(sn->regions[j]->data, sn->regions[j]->size);
- }
+ compare = 0;
- /* Get values of propositional symbols */
- xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- int res;
- int_f_void_t f;
-
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = (*f)();
- xbt_dynar_push_as(prop_ato, int, res);
- }
-
- mc_pair_visited_hash_t pair_test = NULL;
-
- int region_diff = 0;
- cursor = 0;
-
- xbt_dynar_foreach(visited_pairs_hash, cursor, pair_test){
-
- 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){
- for(j=0 ; j< sn->num_reg ; j++){
- if(hash_regions[j] != pair_test->hash_regions[j]){
- region_diff++;
- }
- }
- if(region_diff == 0){
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
- return 1;
- }else{
- //XBT_INFO("Different snapshot");
- }
- }else{
- //XBT_INFO("Different values of propositional symbols");
- }
- }else{
- //XBT_INFO("Different automaton state");
- }
- }else{
- //XBT_INFO("Different value of search_cycle");
- }
-
- region_diff = 0;
- }
-
- MC_free_snapshot(sn);
- xbt_dynar_reset(prop_ato);
- xbt_free(prop_ato);
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
return 0;
}
}
-void set_pair_visited_hash(xbt_state_t st, int sc){
+
+void set_pair_reached(xbt_state_t st){
raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
-
- mc_pair_visited_hash_t pair = NULL;
- pair = xbt_new0(s_mc_pair_visited_hash_t, 1);
+ 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->search_cycle = sc;
- pair->hash_regions = malloc(sizeof(unsigned int) * sn->num_reg);
-
- int i;
+ pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(pair->system_state);
- for(i=0 ; i< sn->num_reg ; i++){
- pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size);
- }
-
/* Get values of propositional symbols */
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
res = (*f)();
xbt_dynar_push_as(pair->prop_ato, int, res);
}
-
- xbt_dynar_push(visited_pairs_hash, &pair);
- MC_free_snapshot(sn);
+ xbt_dynar_push(reached_pairs, &pair);
MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
-}
-void set_pair_visited(xbt_state_t st, int sc){
+ create_dump(xbt_dynar_length(reached_pairs));
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- 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->search_cycle = sc;
- pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(pair->system_state);
-
-
- /* Get values of propositional symbols */
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- int res;
- int_f_void_t f;
-
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = (*f)();
- xbt_dynar_push_as(pair->prop_ato, int, res);
- }
-
- xbt_dynar_push(visited_pairs, &pair);
-
- MC_UNSET_RAW_MEM;
-
if(raw_mem_set)
MC_SET_RAW_MEM;
else
MC_UNSET_RAW_MEM;
-
+
}
void MC_pair_delete(mc_pair_t pair){
}
reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
- //reached_pairs_hash = xbt_dynar_new(sizeof(mc_pair_reached_hash_t), NULL);
- //visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), NULL);
- //visited_pairs_hash = xbt_dynar_new(sizeof(mc_pair_visited_hash_t), NULL);
successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
/* Save the initial state */
MC_UNSET_RAW_MEM;
set_pair_reached(state);
- //set_pair_reached_hash(state);
if(cursor != 0){
MC_restore_snapshot(initial_snapshot_liveness);
XBT_INFO("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
- XBT_INFO("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id, MC_state_interleave_size(current_pair->graph_state));
mc_stats_pair->visited_pairs++;
if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){
- //set_pair_visited(current_pair->automaton_state, search_cycle);
- //set_pair_visited_hash(current_pair->automaton_state, search_cycle);
-
- //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs));
- //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash));
-
if(current_pair->requests > 0){
while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){
/* Debug information */
-
+
req_str = MC_request_to_string(req, value);
XBT_INFO("Execute: %s", req_str);
xbt_free(req_str);
/* Wait for requests (schedules processes) */
MC_wait_for_requests();
-
MC_SET_RAW_MEM;
/* Create the new expanded graph_state */
if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
if(reached(pair_succ->automaton_state)){
- //if(reached_hash(pair_succ->automaton_state)){
XBT_INFO("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));
}else{
XBT_INFO("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
-
- set_pair_reached(pair_succ->automaton_state);
- //set_pair_reached_hash(pair_succ->automaton_state);
XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
MC_SET_RAW_MEM;
xbt_fifo_unshift(mc_stack_liveness, pair_succ);
}else{
- //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
- //if(!visited(pair_succ->automaton_state, search_cycle)){
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
-
- /*}else{
-
- XBT_INFO("Next pair already visited ! ");
-
- }*/
-
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs(search_cycle);
+
}
}else{
XBT_INFO("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
set_pair_reached(pair_succ->automaton_state);
- //set_pair_reached_hash(pair_succ->automaton_state);
search_cycle = 1;
XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
}
- //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
- //if(!visited(pair_succ->automaton_state, search_cycle)){
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
-
- /*}else{
-
- XBT_INFO("Next pair already visited ! ");
-
- }*/
-
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs(search_cycle);
+
}
if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
if(reached(pair_succ->automaton_state)){
- //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("Next pair (depth = %d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- set_pair_reached(pair_succ->automaton_state);
- //set_pair_reached_hash(pair_succ->automaton_state);
-
XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
MC_SET_RAW_MEM;
xbt_fifo_unshift(mc_stack_liveness, pair_succ);
}else{
- //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
- //if(!visited(pair_succ->automaton_state, search_cycle)){
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
-
- /*}else{
-
- XBT_INFO("Next pair already visited ! ");
-
- }*/
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs(search_cycle);
+
}
if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
set_pair_reached(pair_succ->automaton_state);
- //set_pair_reached_hash(pair_succ->automaton_state);
-
+
search_cycle = 1;
XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
}
- //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
- //if(!visited(pair_succ->automaton_state, search_cycle)){
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
-
- /*}else{
-
- XBT_INFO("Next pair already visited ! ");
-
- }*/
-
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs(search_cycle);
+
}
/* Restore system before checking others successors */
xbt_fifo_shift(mc_stack_liveness);
if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
xbt_dynar_pop(reached_pairs, NULL);
- //xbt_dynar_pop(reached_pairs_hash, NULL);
}
MC_UNSET_RAW_MEM;
MC_UNSET_RAW_MEM;
}
-
-
-#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
