xbt_dynar_t mc_global_variables_binary = NULL;
xbt_dict_t mc_variables_type_libsimgrid = NULL;
xbt_dict_t mc_variables_type_binary = NULL;
+mc_object_info_t mc_libsimgrid_info = NULL;
+mc_object_info_t mc_binary_info = NULL;
/* Ignore mechanism */
xbt_dynar_t mc_stack_comparison_ignore;
dw_variable_free((dw_variable_t) * (void **) t);
}
+// object_info
+
+mc_object_info_t MC_new_object_info() {
+ mc_object_info_t res = xbt_new(s_mc_object_info_t, 1);
+ res->local_variables = xbt_dict_new_homogeneous(NULL);
+ res->global_variables = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp);
+ res->types = xbt_dict_new_homogeneous(NULL);
+ return res;
+}
+
+void MC_free_object_info(mc_object_info_t* info) {
+ xbt_dict_free(&(*info)->local_variables);
+ xbt_dynar_free(&(*info)->global_variables);
+ xbt_dict_free(&(*info)->types);
+ xbt_free(info);
+ info = NULL;
+}
+
/*************************************************************************/
static dw_location_t MC_dwarf_get_location(xbt_dict_t location_list, char *expr){
}
+/** @brief Extract the location lists from an ELF file (.debug_loc)
+ *
+ * @return A map from the offset in the list (in hexadecimal string)
+ * into a location list (dynar of dw_location_entry_t).
+ */
static xbt_dict_t MC_dwarf_get_location_list(const char *elf_file){
- char *command = bprintf("objdump -Wo %s", elf_file);
+ char *command = bprintf("LANG=C objdump -Wo %s", elf_file);
FILE *fp = popen(command, "r");
xbt_str_strip_spaces(line);
split = xbt_str_split(line, " ");
+ char *key = NULL;
while(read != -1 && strcmp("<End", (char *)xbt_dynar_get_as(split, 1, char *)) != 0){
+ // Take the key from the first line of the list:
+ if(key==NULL){
+ key = bprintf("%d", (int)strtoul((char *)xbt_dynar_get_as(split, 0, char *), NULL, 16));
+ }
+
dw_location_entry_t new_entry = xbt_new0(s_dw_location_entry_t, 1);
new_entry->lowpc = strtoul((char *)xbt_dynar_get_as(split, 1, char *), NULL, 16);
new_entry->highpc = strtoul((char *)xbt_dynar_get_as(split, 2, char *), NULL, 16);
}
- char *key = bprintf("%d", (int)strtoul((char *)xbt_dynar_get_as(split, 0, char *), NULL, 16));
xbt_dict_set(location_list, key, loclist, NULL);
xbt_free(key);
}
+static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){
-static void MC_dwarf_get_variables(const char *elf_file, xbt_dict_t location_list, xbt_dict_t *local_variables, xbt_dynar_t *global_variables, xbt_dict_t *types){
+ xbt_dict_t location_list = MC_dwarf_get_location_list(elf_file);
- char *command = bprintf("objdump -Wi %s", elf_file);
+ char *command = bprintf("LANG=C objdump -Wi %s", elf_file);
FILE *fp = popen(command, "r");
if(fp == NULL)
perror("popen for objdump failed");
+ mc_object_info_t result = MC_new_object_info();
+ xbt_dict_t *local_variables = &result->local_variables;
+ xbt_dynar_t *global_variables = &result->global_variables;
+ xbt_dict_t *types = &result->types;
+
char *line = NULL, *origin, *abstract_origin, *current_frame = NULL,
*subprogram_name = NULL, *subprogram_start = NULL, *subprogram_end = NULL,
*node_type = NULL, *location_type = NULL, *variable_name = NULL,
node_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *);
if(strcmp(node_type, "(DW_TAG_subprogram)") == 0){ /* New frame */
+ /* We build/complete a dw_frame_t object
+ * and append it if necessary to the local_variables dictionnary */
dw_frame_t frame = NULL;
}else if(strcmp(node_type, "(DW_TAG_variable)") == 0){ /* New variable */
+ /* We build a dw_variable_t object and append it either to
+ the list of variables of the frame (local variable)
+ or to the list of global variables (global variables). */
dw_variable_t var = NULL;
new_variable = 1;
}else if(strcmp(node_type, "(DW_TAG_inlined_subroutine)") == 0){
+ /* Update the information on the frame (we should duplicate it instead). */
read = xbt_getline(&line, &n, fp);
|| strcmp(node_type, "(DW_TAG_volatile_type)") == 0
|| (is_pointer = !strcmp(node_type, "(DW_TAG_pointer_type)"))){
+ /* Create the and add it to the types dictionnary */
+
if(strcmp(node_type, "(DW_TAG_base_type)") == 0)
type_type = e_dw_base_type;
else if(strcmp(node_type, "(DW_TAG_enumeration_type)") == 0)
xbt_dict_free(&subprograms_origin);
xbt_free(line);
xbt_free(command);
+ xbt_dict_free(&location_list);
+
pclose(fp);
-
+ return result;
}
MC_SET_RAW_MEM;
- if(mc_global_variables_libsimgrid){
+ if(mc_local_variables_libsimgrid){
unsigned int cursor = 0;
dw_variable_t current_var;
MC_SET_RAW_MEM;
- if(mc_local_variables_libsimgrid){
+ if(mc_libsimgrid_info){
unsigned int cursor = 0;
dw_variable_t current_var;
int start, end;
MC_SET_RAW_MEM;
MC_init_memory_map_info();
-
- mc_local_variables_libsimgrid = xbt_dict_new_homogeneous(NULL);
- mc_local_variables_binary = xbt_dict_new_homogeneous(NULL);
- mc_global_variables_libsimgrid = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp);
- mc_global_variables_binary = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp);
- mc_variables_type_libsimgrid = xbt_dict_new_homogeneous(NULL);
- mc_variables_type_binary = xbt_dict_new_homogeneous(NULL);
XBT_INFO("Get debug information ...");
- /* Get local variables in binary for state equality detection */
- xbt_dict_t binary_location_list = MC_dwarf_get_location_list(xbt_binary_name);
- MC_dwarf_get_variables(xbt_binary_name, binary_location_list, &mc_local_variables_binary, &mc_global_variables_binary, &mc_variables_type_binary);
-
- /* Get local variables in libsimgrid for state equality detection */
- xbt_dict_t libsimgrid_location_list = MC_dwarf_get_location_list(libsimgrid_path);
- MC_dwarf_get_variables(libsimgrid_path, libsimgrid_location_list, &mc_local_variables_libsimgrid, &mc_global_variables_libsimgrid, &mc_variables_type_libsimgrid);
+ /* Get local variables for state equality detection */
+ mc_binary_info = MC_dwarf_get_variables(xbt_binary_name);
+ mc_libsimgrid_info = MC_dwarf_get_variables(libsimgrid_path);
- xbt_dict_free(&libsimgrid_location_list);
- xbt_dict_free(&binary_location_list);
+ mc_local_variables_libsimgrid = mc_libsimgrid_info->local_variables;
+ mc_local_variables_binary = mc_binary_info->local_variables;
+ mc_global_variables_libsimgrid = mc_libsimgrid_info->global_variables;
+ mc_global_variables_binary = mc_binary_info->global_variables;
+ mc_variables_type_libsimgrid = mc_libsimgrid_info->types;
+ mc_variables_type_binary = mc_binary_info->types;
XBT_INFO("Get debug information done !");
MC_ignore_global_variable("mc_snapshot_comparison_time");
MC_ignore_global_variable("mc_time");
MC_ignore_global_variable("smpi_current_rank");
- MC_ignore_global_variable("smx_current_context_serial");
- MC_ignore_global_variable("smx_current_context_key");
- MC_ignore_global_variable("sysv_maestro_context");
MC_ignore_global_variable("counter"); /* Static variable used for tracing */
-
+ MC_ignore_global_variable("maestro_stack_start");
+ MC_ignore_global_variable("maestro_stack_end");
+
+ MC_ignore_heap(&(simix_global->process_to_run), sizeof(simix_global->process_to_run));
+ MC_ignore_heap(&(simix_global->process_that_ran), sizeof(simix_global->process_that_ran));
+ MC_ignore_heap(simix_global->process_to_run, sizeof(*(simix_global->process_to_run)));
+ MC_ignore_heap(simix_global->process_that_ran, sizeof(*(simix_global->process_that_ran)));
+
+ smx_process_t process;
+ xbt_swag_foreach(process, simix_global->process_list){
+ MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup));
+ }
if(raw_mem_set)
MC_SET_RAW_MEM;
MC_SET_RAW_MEM;
/* Save the initial state */
initial_state_safety = xbt_new0(s_mc_global_t, 1);
- initial_state_safety->snapshot = MC_take_snapshot();
+ initial_state_safety->snapshot = MC_take_snapshot(0);
MC_UNSET_RAW_MEM;
MC_dpor();