static int is_visited_state(){
- if(_surf_mc_stateful == 0)
+ if(_sg_mc_visited == 0)
return 0;
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
}
}
- if(xbt_dynar_length(visited_states) == _surf_mc_stateful){
+ if(xbt_dynar_length(visited_states) == _sg_mc_visited){
mc_snapshot_t state_to_remove = NULL;
xbt_dynar_shift(visited_states, &state_to_remove);
MC_free_snapshot(state_to_remove);
MC_wait_for_requests();
MC_SET_RAW_MEM;
-
- 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);
- }
- }
-
+
/* Get an enabled process and insert it in the interleave set of the initial state */
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
MC_state_interleave_process(initial_state, process);
- break;
+ XBT_DEBUG("Process %lu enabled with simcall %d", process->pid, process->simcall.call);
}
}
else
MC_UNSET_RAW_MEM;
-
- /* FIXME: Update Statistics
- mc_stats->state_size +=
- xbt_setset_set_size(initial_state->enabled_transitions); */
}
char *req_str;
int value;
smx_simcall_t req = NULL, prev_req = NULL;
+ s_smx_simcall_t req2;
mc_state_t state = NULL, prev_state = NULL, next_state = NULL, restore_state=NULL;
smx_process_t process = NULL;
xbt_fifo_item_t item = NULL;
- int pos;
+ int pos, i;
+ int interleave_proc[simix_process_maxpid];
while (xbt_fifo_size(mc_stack_safety) > 0) {
/* If there are processes to interleave and the maximum depth has not been reached
then perform one step of the exploration algorithm */
- if (xbt_fifo_size(mc_stack_safety) < _surf_mc_max_depth &&
+ if (xbt_fifo_size(mc_stack_safety) < _sg_mc_max_depth &&
(req = MC_state_get_request(state, &value))) {
/* Debug information */
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
MC_state_interleave_process(next_state, process);
- XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call);
- //break;
+ XBT_DEBUG("Process %lu enabled with simcall %d", process->pid, process->simcall.call);
}
}
- if(_surf_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_mc_checkpoint == 0)){
+ if(_sg_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _sg_mc_checkpoint == 0)){
next_state->system_state = MC_take_snapshot();
}
xbt_fifo_unshift(mc_stack_safety, next_state);
MC_UNSET_RAW_MEM;
- /* FIXME: Update Statistics
- mc_stats->state_size +=
- xbt_setset_set_size(next_state->enabled_transitions);*/
-
/* Let's loop again */
/* The interleave set is empty or the maximum depth is reached, let's back-track */
} else {
- if(xbt_fifo_size(mc_stack_safety) == _surf_mc_max_depth){
-
+ if(xbt_fifo_size(mc_stack_safety) == _sg_mc_max_depth)
XBT_WARN("/!\\ Max depth reached ! /!\\ ");
- if(req != NULL){
- XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ ");
- XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value.");
- }
-
- }else{
-
+ else
XBT_DEBUG("There are no more processes to interleave.");
- }
-
/* Trash the current state, no longer needed */
MC_SET_RAW_MEM;
xbt_fifo_shift(mc_stack_safety);
state that executed that previous request. */
while ((state = xbt_fifo_shift(mc_stack_safety)) != NULL) {
- if(MC_state_interleave_size(state) == 0){
- req = MC_state_get_internal_request(state);
- xbt_fifo_foreach(mc_stack_safety, item, prev_state, mc_state_t) {
- if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){
- if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
- XBT_DEBUG("Dependent Transitions:");
- prev_req = MC_state_get_executed_request(prev_state, &value);
- req_str = MC_request_to_string(prev_req, value);
- XBT_DEBUG("%s (state=%p)", req_str, prev_state);
- xbt_free(req_str);
- prev_req = MC_state_get_executed_request(state, &value);
- req_str = MC_request_to_string(prev_req, value);
- XBT_DEBUG("%s (state=%p)", req_str, state);
- xbt_free(req_str);
- }
+ req = MC_state_get_internal_request(state);
+ xbt_fifo_foreach(mc_stack_safety, item, prev_state, mc_state_t) {
+ if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
+ XBT_DEBUG("Dependent Transitions:");
+ prev_req = MC_state_get_executed_request(prev_state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (state=%p)", req_str, prev_state);
+ xbt_free(req_str);
+ prev_req = MC_state_get_executed_request(state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (state=%p)", req_str, state);
+ xbt_free(req_str);
+ }
- /*if(!MC_state_process_is_done(prev_state, req->issuer))
- MC_state_interleave_process(prev_state, req->issuer);
- else
- XBT_DEBUG("Process %p is in done set", req->issuer);*/
-
+ break;
- break;
+ }else if(req->issuer == MC_state_get_internal_request(prev_state)->issuer){
- }else{
-
- //XBT_DEBUG("Independant transitions : (%lu) %d - (%lu) %d", req->issuer->pid, req->call, MC_state_get_internal_request(prev_state)->issuer->pid, MC_state_get_internal_request(prev_state)->call);
- MC_state_remove_interleave_process(prev_state, req->issuer);
+ XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call);
+ break;
+
+ }else{
+
+ MC_state_remove_interleave_process(prev_state, req->issuer);
+ XBT_DEBUG("Simcall %d in process %lu independant with simcall %d process %lu", req->call, req->issuer->pid, MC_state_get_internal_request(prev_state)->call, MC_state_get_internal_request(prev_state)->issuer->pid);
- }
}
}
+
if (MC_state_interleave_size(state)) {
/* We found a back-tracking point, let's loop */
- if(_surf_mc_checkpoint){
+ if(_sg_mc_checkpoint){
if(state->system_state != NULL){
MC_restore_snapshot(state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
}else{
pos = xbt_fifo_size(mc_stack_safety);
}
MC_restore_snapshot(restore_state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, pos);
}
}else{
xbt_fifo_unshift(mc_stack_safety, state);
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, -1);
}
+
+ MC_SET_RAW_MEM;
+ req2 = *req;
+ for(i=0; i<simix_process_maxpid; i++)
+ interleave_proc[i] = 0;
+ i=0;
+ while((i < MC_state_interleave_size(state))){
+ i++;
+ prev_req = MC_state_get_request(state, &value);
+ if(prev_req != NULL){
+ MC_state_set_executed_request(state, prev_req, value);
+ prev_req = MC_state_get_internal_request(state);
+ if(MC_request_depend(&req2, prev_req)){
+ XBT_DEBUG("Simcall %d in process %lu dependant with simcall %d in process %lu", req2.call, req2.issuer->pid, prev_req->call, prev_req->issuer->pid);
+ interleave_proc[prev_req->issuer->pid] = 1;
+ }else{
+ XBT_DEBUG("Simcall %d in process %lu independant with simcall %d in process %lu", req2.call, req2.issuer->pid, prev_req->call, prev_req->issuer->pid);
+ MC_state_remove_interleave_process(state, prev_req->issuer);
+ }
+ }
+ }
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(interleave_proc[process->pid] == 1)
+ MC_state_interleave_process(state, process);
+ }
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
+ MC_UNSET_RAW_MEM;
break;
} else {
MC_state_delete(state);
