#include <sys/types.h>
#include <sys/wait.h>
#include <sys/time.h>
+#include <sys/mman.h>
#include <libgen.h>
#include "simgrid/sg_config.h"
// ***** Helpers
void* MC_object_base_address(mc_object_info_t info) {
+ if(info->flags & MC_OBJECT_INFO_EXECUTABLE)
+ return 0;
void* result = info->start_exec;
if(info->start_rw!=NULL && result > (void*) info->start_rw) result = info->start_rw;
if(info->start_ro!=NULL && result > (void*) info->start_ro) result = info->start_ro;
MC_UNSET_RAW_MEM;
}
-static void mc_ignore_local_variable_in_scope(const char *var_name, dw_frame_t scope) {
+/** \brief Ignore a local variable in a scope
+ *
+ * Ignore all instances of variables with a given name in
+ * any (possibly inlined) subprogram with a given namespaced
+ * name.
+ *
+ * \param var_name Name of the local variable (or parameter to ignore)
+ * \param subprogram_name Name of the subprogram fo ignore (NULL for any)
+ * \param subprogram (possibly inlined) Subprogram of the scope
+ * \param scope Current scope
+ */
+static void mc_ignore_local_variable_in_scope(
+ const char *var_name, const char *subprogram_name,
+ dw_frame_t subprogram, dw_frame_t scope) {
// Processing of direct variables:
- int start = 0;
- int end = xbt_dynar_length(scope->variables) - 1;
- while(start <= end){
- int cursor = (start + end) / 2;
- dw_variable_t current_var = (dw_variable_t)xbt_dynar_get_as(scope->variables, cursor, dw_variable_t);
-
- int compare = strcmp(current_var->name, var_name);
- if(compare == 0){
- xbt_dynar_remove_at(scope->variables, cursor, NULL);
- start = 0;
- end = xbt_dynar_length(scope->variables) - 1;
- }else if(compare < 0){
- start = cursor + 1;
- }else{
- end = cursor - 1;
+
+ // If the current subprogram matche the given name:
+ if(subprogram_name==NULL || strcmp(subprogram_name, subprogram->name)==0) {
+
+ // Try to find the variable and remove it:
+ int start = 0;
+ int end = xbt_dynar_length(scope->variables) - 1;
+
+ // Dichotomic search:
+ while(start <= end){
+ int cursor = (start + end) / 2;
+ dw_variable_t current_var = (dw_variable_t)xbt_dynar_get_as(scope->variables, cursor, dw_variable_t);
+
+ int compare = strcmp(current_var->name, var_name);
+ if(compare == 0){
+ // Variable found, remove it:
+ xbt_dynar_remove_at(scope->variables, cursor, NULL);
+
+ // and start again:
+ start = 0;
+ end = xbt_dynar_length(scope->variables) - 1;
+ }else if(compare < 0){
+ start = cursor + 1;
+ }else{
+ end = cursor - 1;
+ }
}
+
}
// And recursive processing in nested scopes:
unsigned cursor = 0;
dw_frame_t nested_scope = NULL;
xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
- mc_ignore_local_variable_in_scope(var_name, nested_scope);
+ // The new scope may be an inlined subroutine, in this case we want to use its
+ // namespaced name in recursive calls:
+ dw_frame_t nested_subprogram = nested_scope->tag == DW_TAG_inlined_subroutine ? nested_scope : subprogram;
+
+ mc_ignore_local_variable_in_scope(var_name, subprogram_name, nested_subprogram, nested_scope);
}
}
-static void MC_ignore_local_variable_in_object(const char *var_name, const char *frame_name, mc_object_info_t info) {
+static void MC_ignore_local_variable_in_object(const char *var_name, const char *subprogram_name, mc_object_info_t info) {
xbt_dict_cursor_t cursor2;
dw_frame_t frame;
char* key;
xbt_dict_foreach(info->subprograms, cursor2, key, frame) {
- if(frame_name && strcmp(frame_name, frame->name))
- continue;
- mc_ignore_local_variable_in_scope(var_name, frame);
+ mc_ignore_local_variable_in_scope(var_name, subprogram_name, frame, frame);
}
}
mc_state_t state;
smx_process_t process = NULL;
int comm_pattern = 0;
+ smx_action_t current_comm;
XBT_DEBUG("**** Begin Replay ****");
}
MC_SET_RAW_MEM;
- xbt_dict_reset(first_enabled_state);
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
+
+ if(mc_reduce_kind == e_mc_reduce_dpor){
+ xbt_dict_reset(first_enabled_state);
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
char *key = bprintf("%lu", process->pid);
char *data = bprintf("%d", count);
xbt_dict_set(first_enabled_state, key, data, NULL);
xbt_free(key);
+ }
}
}
- if(_sg_mc_comms_determinism || _sg_mc_send_determinism)
+
+ if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
xbt_dynar_reset(communications_pattern);
+ xbt_dynar_reset(incomplete_communications_pattern);
+ }
+
MC_UNSET_RAW_MEM;
state = (mc_state_t) xbt_fifo_get_item_content(item);
saved_req = MC_state_get_executed_request(state, &value);
- MC_SET_RAW_MEM;
- char *key = bprintf("%lu", saved_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", saved_req->issuer->pid);
+ xbt_dict_remove(first_enabled_state, key);
+ xbt_free(key);
+ MC_UNSET_RAW_MEM;
+ }
if(saved_req){
/* because we got a copy of the executed request, we have to fetch the
XBT_DEBUG("Replay: %s (%p)", req_str, state);
xbt_free(req_str);
}
- }
- 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;
- }
+ /* 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;
+ }
- SIMIX_simcall_pre(req, value);
+ SIMIX_simcall_pre(req, value);
- if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
- MC_SET_RAW_MEM;
- if(comm_pattern != 0){
- get_comm_pattern(communications_pattern, req, comm_pattern);
+ if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
+ MC_SET_RAW_MEM;
+ if(comm_pattern == 1 || comm_pattern == 2){
+ get_comm_pattern(communications_pattern, req, comm_pattern);
+ }else if (comm_pattern == 3/* || comm_pattern == 4*/){
+ current_comm = simcall_comm_wait__get__comm(req);
+ if(current_comm->comm.refcount == 1){ /* First wait only must be considered */
+ complete_comm_pattern(communications_pattern, current_comm);
+ }
+ }else if (comm_pattern == 4/* || 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 */
+ complete_comm_pattern(communications_pattern, current_comm);
+ }
+ }
+ MC_UNSET_RAW_MEM;
+ comm_pattern = 0;
}
- MC_UNSET_RAW_MEM;
- comm_pattern = 0;
- }
- MC_wait_for_requests();
-
- count++;
-
- MC_SET_RAW_MEM;
- /* Insert in dict all enabled processes */
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process) /*&& !MC_state_process_is_done(state, process)*/){
- char *key = bprintf("%lu", process->pid);
- if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){
- char *data = bprintf("%d", count);
- xbt_dict_set(first_enabled_state, key, data, NULL);
+
+ MC_wait_for_requests();
+
+ count++;
+
+ if(mc_reduce_kind == e_mc_reduce_dpor){
+ MC_SET_RAW_MEM;
+ /* Insert in dict all enabled processes */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process) /*&& !MC_state_process_is_done(state, process)*/){
+ char *key = bprintf("%lu", process->pid);
+ if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){
+ char *data = bprintf("%d", count);
+ xbt_dict_set(first_enabled_state, key, data, NULL);
+ }
+ xbt_free(key);
+ }
}
- xbt_free(key);
+ MC_UNSET_RAW_MEM;
}
}
- MC_UNSET_RAW_MEM;
/* Update statistics */
mc_stats->visited_states++;