-/* Copyright (c) 2008-2013. The SimGrid Team.
+/* Copyright (c) 2008-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "mc_private.h"
+#include "xbt/mmalloc/mmprivate.h"
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
"Logging specific to MC DPOR exploration");
xbt_dynar_t visited_states;
xbt_dict_t first_enabled_state;
xbt_dynar_t initial_communications_pattern;
+xbt_dynar_t incomplete_communications_pattern;
xbt_dynar_t communications_pattern;
int nb_comm_pattern;
}
static void deterministic_pattern(xbt_dynar_t initial_pattern, xbt_dynar_t pattern){
+
+ if(!xbt_dynar_is_empty(incomplete_communications_pattern))
+ xbt_die("Oh oh ...");
+
unsigned int cursor = 0, send_index = 0, recv_index = 0;
mc_comm_pattern_t comm1, comm2;
int comm_comparison = 0;
comm_comparison = compare_comm_pattern(comm1, comm2);
if(comm_comparison == 1){
initial_state_safety->comm_deterministic = 0;
+ if(!_sg_mc_send_determinism)
+ return;
}
recv_index++;
}
}
}
-static int complete_comm_pattern(xbt_dynar_t list, mc_comm_pattern_t pattern){
+void complete_comm_pattern(xbt_dynar_t list, smx_action_t comm){
mc_comm_pattern_t current_pattern;
unsigned int cursor = 0;
- xbt_dynar_foreach(list, cursor, current_pattern){
- if(current_pattern->comm == pattern->comm){
- if(!current_pattern->completed){
- current_pattern->src_proc = pattern->comm->comm.src_proc->pid;
- current_pattern->src_host = simcall_host_get_name(pattern->comm->comm.src_proc->smx_host);
- current_pattern->dst_proc = pattern->comm->comm.dst_proc->pid;
- current_pattern->dst_host = simcall_host_get_name(pattern->comm->comm.dst_proc->smx_host);
- current_pattern->data_size = pattern->comm->comm.src_buff_size;
+ int index;
+ int completed = 0;
+ void *addr_pointed;
+ xbt_dynar_foreach(incomplete_communications_pattern, cursor, index){
+ current_pattern = (mc_comm_pattern_t)xbt_dynar_get_as(list, index, mc_comm_pattern_t);
+ if(current_pattern->comm == comm){
+ current_pattern->src_proc = comm->comm.src_proc->pid;
+ current_pattern->dst_proc = comm->comm.dst_proc->pid;
+ current_pattern->src_host = simcall_host_get_name(comm->comm.src_proc->smx_host);
+ current_pattern->dst_host = simcall_host_get_name(comm->comm.dst_proc->smx_host);
+ if(current_pattern->data_size == -1){
+ current_pattern->data_size = *(comm->comm.dst_buff_size);
current_pattern->data = xbt_malloc0(current_pattern->data_size);
- current_pattern->matched_comm = pattern->num;
- memcpy(current_pattern->data, current_pattern->comm->comm.src_buff, current_pattern->data_size);
- current_pattern->completed = 1;
- return current_pattern->num;
+ addr_pointed = *(void **)comm->comm.src_buff;
+ if(addr_pointed > std_heap && addr_pointed < ((xbt_mheap_t)std_heap)->breakval)
+ memcpy(current_pattern->data, addr_pointed, current_pattern->data_size);
+ else
+ memcpy(current_pattern->data, comm->comm.src_buff, current_pattern->data_size);
}
+ xbt_dynar_remove_at(incomplete_communications_pattern, cursor, NULL);
+ completed++;
+ if(completed == 2)
+ return;
+ cursor--;
}
}
- return -1;
}
void get_comm_pattern(xbt_dynar_t list, smx_simcall_t request, int call){
mc_comm_pattern_t pattern = NULL;
pattern = xbt_new0(s_mc_comm_pattern_t, 1);
pattern->num = ++nb_comm_pattern;
- pattern->completed = 0;
+ pattern->data_size = -1;
+ void * addr_pointed;
if(call == 1){ // ISEND
pattern->comm = simcall_comm_isend__get__result(request);
pattern->type = SIMIX_COMM_SEND;
- if(pattern->comm->comm.dst_proc != NULL){
- pattern->matched_comm = complete_comm_pattern(list, pattern);
- pattern->dst_proc = pattern->comm->comm.dst_proc->pid;
- pattern->completed = 1;
- pattern->dst_host = simcall_host_get_name(pattern->comm->comm.dst_proc->smx_host);
- }
pattern->src_proc = pattern->comm->comm.src_proc->pid;
pattern->src_host = simcall_host_get_name(request->issuer->smx_host);
pattern->data_size = pattern->comm->comm.src_buff_size;
- pattern->data=xbt_malloc0(pattern->data_size);
- memcpy(pattern->data, pattern->comm->comm.src_buff, pattern->data_size);
+ pattern->data = xbt_malloc0(pattern->data_size);
+ addr_pointed = *(void **)pattern->comm->comm.src_buff;
+ if(addr_pointed > std_heap && addr_pointed < ((xbt_mheap_t)std_heap)->breakval)
+ memcpy(pattern->data, addr_pointed, pattern->data_size);
+ else
+ memcpy(pattern->data, pattern->comm->comm.src_buff, pattern->data_size);
}else{ // IRECV
pattern->comm = simcall_comm_irecv__get__result(request);
pattern->type = SIMIX_COMM_RECEIVE;
- if(pattern->comm->comm.src_proc != NULL){
- pattern->matched_comm = complete_comm_pattern(list, pattern);
- pattern->src_proc = pattern->comm->comm.src_proc->pid;
- pattern->src_host = simcall_host_get_name(pattern->comm->comm.src_proc->smx_host);
- pattern->completed = 1;
- pattern->data_size = pattern->comm->comm.src_buff_size;
- pattern->data=xbt_malloc0(pattern->data_size);
- memcpy(pattern->data, pattern->comm->comm.src_buff, pattern->data_size);
- }
pattern->dst_proc = pattern->comm->comm.dst_proc->pid;
- pattern->dst_host = simcall_host_get_name(request->issuer->smx_host);
+ pattern->dst_host = simcall_host_get_name(pattern->comm->comm.dst_proc->smx_host);
}
+
if(pattern->comm->comm.rdv != NULL)
pattern->rdv = strdup(pattern->comm->comm.rdv->name);
else
pattern->rdv = strdup(pattern->comm->comm.rdv_cpy->name);
+
xbt_dynar_push(list, &pattern);
+
+ xbt_dynar_push_as(incomplete_communications_pattern, int, xbt_dynar_length(list) - 1);
+
}
static void print_communications_pattern(xbt_dynar_t comms_pattern){
mc_comm_pattern_t current_comm;
xbt_dynar_foreach(comms_pattern, cursor, current_comm){
if(current_comm->type == SIMIX_COMM_SEND)
- XBT_INFO("[(%lu) %s -> %s] %s ", current_comm->src_proc, current_comm->src_host, current_comm->dst_host, "iSend");
+ XBT_INFO("[(%lu) %s -> (%lu) %s] %s ", current_comm->src_proc, current_comm->src_host, current_comm->dst_proc, current_comm->dst_host, "iSend");
else
- XBT_INFO("[(%lu) %s <- %s] %s ", current_comm->dst_proc, current_comm->dst_host, current_comm->src_host, "iRecv");
+ XBT_INFO("[(%lu) %s <- (%lu) %s] %s ", current_comm->dst_proc, current_comm->dst_host, current_comm->src_proc, current_comm->src_host, "iRecv");
}
}
* The subrange is the subrange of "equivalence" of the given state.
*/
static int get_search_interval(xbt_dynar_t all_states, mc_visited_state_t state, int *min, int *max){
+ XBT_VERB("Searching interval for state %i: nd_processes=%zu heap_bytes_used=%zu",
+ state->num, (size_t)state->nb_processes, (size_t)state->heap_bytes_used);
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
if(_sg_mc_visited > 0)
visited_states = xbt_dynar_new(sizeof(mc_visited_state_t), visited_state_free_voidp);
- first_enabled_state = xbt_dict_new_homogeneous(&xbt_free_f);
+ if(mc_reduce_kind == e_mc_reduce_dpor)
+ first_enabled_state = xbt_dict_new_homogeneous(&xbt_free_f);
- initial_communications_pattern = xbt_dynar_new(sizeof(mc_comm_pattern_t), comm_pattern_free_voidp);
- communications_pattern = xbt_dynar_new(sizeof(mc_comm_pattern_t), comm_pattern_free_voidp);
- nb_comm_pattern = 0;
+ if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
+ initial_communications_pattern = xbt_dynar_new(sizeof(mc_comm_pattern_t), comm_pattern_free_voidp);
+ communications_pattern = xbt_dynar_new(sizeof(mc_comm_pattern_t), comm_pattern_free_voidp);
+ incomplete_communications_pattern = xbt_dynar_new(sizeof(int), NULL);
+ nb_comm_pattern = 0;
+ }
initial_state = MC_state_new();
xbt_fifo_unshift(mc_stack_safety, initial_state);
- /* To ensure the soundness of DPOR, we have to keep a list of
- processes which are still enabled at each step of the exploration.
- If max depth is reached, we interleave them in the state in which they have
- been enabled for the first time. */
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- char *key = bprintf("%lu", process->pid);
- char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety));
- xbt_dict_set(first_enabled_state, key, data, NULL);
- xbt_free(key);
+ if(mc_reduce_kind == e_mc_reduce_dpor){
+ /* To ensure the soundness of DPOR, we have to keep a list of
+ processes which are still enabled at each step of the exploration.
+ If max depth is reached, we interleave them in the state in which they have
+ been enabled for the first time. */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ char *key = bprintf("%lu", process->pid);
+ char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety));
+ xbt_dict_set(first_enabled_state, key, data, NULL);
+ xbt_free(key);
+ }
}
}
int enabled = 0;
int interleave_size = 0;
int comm_pattern = 0;
+ smx_action_t current_comm;
while (xbt_fifo_size(mc_stack_safety) > 0) {
MC_state_set_executed_request(state, req, value);
mc_stats->executed_transitions++;
- MC_SET_RAW_MEM;
- char *key = bprintf("%lu", req->issuer->pid);
- xbt_dict_remove(first_enabled_state, key);
- xbt_free(key);
- MC_UNSET_RAW_MEM;
-
+ if(mc_reduce_kind == e_mc_reduce_dpor){
+ MC_SET_RAW_MEM;
+ char *key = bprintf("%lu", req->issuer->pid);
+ xbt_dict_remove(first_enabled_state, key);
+ xbt_free(key);
+ MC_UNSET_RAW_MEM;
+ }
+
+ /* TODO : handle test and testany simcalls */
if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
if(req->call == SIMCALL_COMM_ISEND)
comm_pattern = 1;
else if(req->call == SIMCALL_COMM_IRECV)
comm_pattern = 2;
+ else if(req->call == SIMCALL_COMM_WAIT)
+ comm_pattern = 3;
+ else if(req->call == SIMCALL_COMM_WAITANY)
+ comm_pattern = 4;
}
/* Answer the request */
if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
MC_SET_RAW_MEM;
- if(comm_pattern != 0){
+ if(comm_pattern == 1 || comm_pattern == 2){
if(!initial_state_safety->initial_communications_pattern_done)
get_comm_pattern(initial_communications_pattern, req, comm_pattern);
else
get_comm_pattern(communications_pattern, req, comm_pattern);
+ }else if(comm_pattern == 3){
+ current_comm = simcall_comm_wait__get__comm(req);
+ if(current_comm->comm.refcount == 1){ /* First wait only must be considered */
+ if(!initial_state_safety->initial_communications_pattern_done)
+ complete_comm_pattern(initial_communications_pattern, current_comm);
+ else
+ complete_comm_pattern(communications_pattern, current_comm);
+ }
+ }else if(comm_pattern == 4){
+ current_comm = xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_action_t);
+ if(current_comm->comm.refcount == 1){ /* First wait only must be considered */
+ if(!initial_state_safety->initial_communications_pattern_done)
+ complete_comm_pattern(initial_communications_pattern, current_comm);
+ else
+ complete_comm_pattern(communications_pattern, current_comm);
+ }
}
MC_UNSET_RAW_MEM;
comm_pattern = 0;
xbt_fifo_unshift(mc_stack_safety, next_state);
- /* Insert in dict all enabled processes, if not included yet */
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- char *key = bprintf("%lu", process->pid);
- if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){
- char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety));
- xbt_dict_set(first_enabled_state, key, data, NULL);
+ if(mc_reduce_kind == e_mc_reduce_dpor){
+ /* Insert in dict all enabled processes, if not included yet */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ char *key = bprintf("%lu", process->pid);
+ if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){
+ char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety));
+ xbt_dict_set(first_enabled_state, key, data, NULL);
+ }
+ xbt_free(key);
}
- xbt_free(key);
}
}
visited_state = -1;
- /* Interleave enabled processes in the state in which they have been enabled for the first time */
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- char *key = bprintf("%lu", process->pid);
- enabled = (int)strtoul(xbt_dict_get_or_null(first_enabled_state, key), 0, 10);
- xbt_free(key);
- int cursor = xbt_fifo_size(mc_stack_safety);
- xbt_fifo_foreach(mc_stack_safety, item, state_test, mc_state_t){
- if(cursor-- == enabled){
- if(!MC_state_process_is_done(state_test, process) && state_test->num != state->num){
- XBT_DEBUG("Interleave process %lu in state %d", process->pid, state_test->num);
- MC_state_interleave_process(state_test, process);
- break;
+ if(mc_reduce_kind == e_mc_reduce_dpor){
+ /* Interleave enabled processes in the state in which they have been enabled for the first time */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ char *key = bprintf("%lu", process->pid);
+ enabled = (int)strtoul(xbt_dict_get_or_null(first_enabled_state, key), 0, 10);
+ xbt_free(key);
+ int cursor = xbt_fifo_size(mc_stack_safety);
+ xbt_fifo_foreach(mc_stack_safety, item, state_test, mc_state_t){
+ if(cursor-- == enabled){
+ if(!MC_state_process_is_done(state_test, process) && state_test->num != state->num){
+ XBT_DEBUG("Interleave process %lu in state %d", process->pid, state_test->num);
+ MC_state_interleave_process(state_test, process);
+ break;
+ }
}
}
}
state that executed that previous request. */
while ((state = xbt_fifo_shift(mc_stack_safety)) != NULL) {
- if(mc_reduce_kind != e_mc_reduce_none){
+ if(mc_reduce_kind == e_mc_reduce_dpor){
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))){
XBT_DEBUG("Back-tracking to state %d at depth %d done", state->num, xbt_fifo_size(mc_stack_safety));
break;
} else {
- req = MC_state_get_internal_request(state);
- if(_sg_mc_comms_determinism){
+ /*req = MC_state_get_internal_request(state);
+ if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
if(req->call == SIMCALL_COMM_ISEND || req->call == SIMCALL_COMM_IRECV){
if(!xbt_dynar_is_empty(communications_pattern))
xbt_dynar_remove_at(communications_pattern, xbt_dynar_length(communications_pattern) - 1, NULL);
}
- }
+ }*/
XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1);
MC_state_delete(state);
}
