switch(fork()){
case 0:
// We are the child process -- run the actual program
- abort();
+ xbt_abort();
break;
case -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);
+ new_pair->system_state = MC_take_snapshot_liveness();
/* Get values of propositional symbols */
int res;
MC_UNSET_RAW_MEM;
- if(xbt_dynar_is_empty(reached_pairs) || !compare){
+ if(xbt_dynar_is_empty(reached_pairs)/* || !compare*/){
MC_SET_RAW_MEM;
/* New pair reached */
xbt_dynar_push(reached_pairs, &new_pair);
MC_UNSET_RAW_MEM;
-
- create_dump(xbt_dynar_length(reached_pairs));
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
return 0;
}else{
}
}
- create_dump(xbt_dynar_length(reached_pairs));
-
/* New pair reached */
xbt_dynar_push(reached_pairs, &new_pair);
if(raw_mem_set)
MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
+
compare = 0;
return 0;
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);
- MC_take_snapshot_liveness(pair->system_state);
+ pair->system_state = MC_take_snapshot_liveness();
/* Get values of propositional symbols */
unsigned int cursor = 0;
MC_UNSET_RAW_MEM;
- create_dump(xbt_dynar_length(reached_pairs));
-
if(raw_mem_set)
MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
}
/********************* Double-DFS stateless *******************/
-void MC_pair_stateless_delete(mc_pair_stateless_t pair){
+void pair_stateless_free(mc_pair_stateless_t pair){
+ xbt_free(pair->graph_state->system_state);
xbt_free(pair->graph_state->proc_status);
xbt_free(pair->graph_state);
xbt_free(pair);
}
+void pair_stateless_free_voidp(void *p){
+ pair_stateless_free((mc_pair_stateless_t) * (void **) p);
+}
+
mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){
mc_pair_stateless_t p = NULL;
p = xbt_new0(s_mc_pair_stateless_t, 1);
return p;
}
+void pair_reached_free(mc_pair_reached_t pair){
+ if(pair){
+ pair->automaton_state = NULL;
+ xbt_dynar_free(&(pair->prop_ato));
+ MC_free_snapshot(pair->system_state);
+ xbt_free(pair);
+ }
+}
+
+void pair_reached_free_voidp(void *p){
+ pair_reached_free((mc_pair_reached_t) * (void **) p);
+}
+
void MC_ddfs_init(void){
raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
}
}
- reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
+ reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), pair_reached_free_voidp);
successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
/* Save the initial state */
- initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(initial_snapshot_liveness);
+ initial_state_liveness->initial_snapshot = MC_take_snapshot_liveness();
MC_UNSET_RAW_MEM;
-
+
unsigned int cursor = 0;
xbt_state_t state;
MC_UNSET_RAW_MEM;
if(cursor != 0){
- MC_restore_snapshot(initial_snapshot_liveness);
+ MC_restore_snapshot(initial_state_liveness->initial_snapshot);
MC_UNSET_RAW_MEM;
}
set_pair_reached(state);
if(cursor != 0){
- MC_restore_snapshot(initial_snapshot_liveness);
+ MC_restore_snapshot(initial_state_liveness->initial_snapshot);
MC_UNSET_RAW_MEM;
}
_mc_property_automaton->current_state = current_pair->automaton_state;
- XBT_INFO("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
+ XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
mc_stats_pair->visited_pairs++;
mc_pair_stateless_t next_pair = NULL;
mc_pair_stateless_t pair_succ;
+
+ mc_pair_stateless_t remove_pair;
+ mc_pair_reached_t remove_pair_reached;
if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){
/* Debug information */
req_str = MC_request_to_string(req, value);
- XBT_INFO("Execute: %s", req_str);
+ XBT_DEBUG("Execute: %s", req_str);
xbt_free(req_str);
MC_state_set_executed_request(current_pair->graph_state, req, value);
next_graph_state = MC_state_pair_new();
/* Get enabled process and insert it in the interleave set of the next graph_state */
+
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call);
+ }
+ }
+
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
MC_state_interleave_process(next_graph_state, process);
MC_show_stack_liveness(mc_stack_liveness);
MC_dump_stack_liveness(mc_stack_liveness);
MC_print_statistics_pairs(mc_stats_pair);
- exit(0);
+ xbt_abort();
}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);
+ XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
- XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
MC_SET_RAW_MEM;
xbt_fifo_unshift(mc_stack_liveness, pair_succ);
if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
- 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);
+ XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
set_pair_reached(pair_succ->automaton_state);
search_cycle = 1;
- XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
}
}
if(MC_state_interleave_size(current_pair->graph_state) > 0){
- XBT_INFO("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));
+ XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));
MC_replay_liveness(mc_stack_liveness, 0);
}
}
- }else{ /*No request to execute, search evolution in Büchi automaton */
+ }else{
+
+ XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton.");
MC_SET_RAW_MEM;
}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);
+ XBT_INFO("Next pair (depth = %d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
if(cursor != xbt_dynar_length(successors) - 1)
MC_replay_liveness(mc_stack_liveness, 1);
-
- }
-
+ }
+
}
}else{
- XBT_INFO("Max depth reached");
+ XBT_DEBUG("Max depth reached");
}
if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){
- XBT_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
+ XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) );
}else{
- XBT_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
+ XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) );
}
MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_liveness);
+ remove_pair = xbt_fifo_shift(mc_stack_liveness);
+ xbt_fifo_remove(mc_stack_liveness, remove_pair);
+ remove_pair = NULL;
if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
- xbt_dynar_pop(reached_pairs, NULL);
+ remove_pair_reached = xbt_dynar_pop_as(reached_pairs, mc_pair_reached_t);
+ pair_reached_free(remove_pair_reached);
+ remove_pair_reached = NULL;
}
MC_UNSET_RAW_MEM;
if(raw_mem_set)
MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
}