#include <sys/wait.h>
#include <sys/time.h>
+#include "simgrid/sg_config.h"
#include "../surf/surf_private.h"
#include "../simix/smx_private.h"
#include "../xbt/mmalloc/mmprivate.h"
/* Configuration support */
e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset;
+int _sg_do_model_check = 0;
+int _sg_mc_checkpoint=0;
+char* _sg_mc_property_file=NULL;
+int _sg_mc_timeout=0;
+int _sg_mc_max_depth=1000;
+int _sg_mc_visited=0;
-extern int _surf_init_status;
+extern int _sg_init_status;
void _mc_cfg_cb_reduce(const char *name, int pos) {
- if (_surf_init_status && !_surf_do_model_check) {
+ if (_sg_init_status && !_sg_do_model_check) {
xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
}
- char *val= xbt_cfg_get_string(_surf_cfg_set, name);
+ char *val= xbt_cfg_get_string(_sg_cfg_set, name);
if (!strcasecmp(val,"none")) {
mc_reduce_kind = e_mc_reduce_none;
} else if (!strcasecmp(val,"dpor")) {
} else {
xbt_die("configuration option %s can only take 'none' or 'dpor' as a value",name);
}
- xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
}
void _mc_cfg_cb_checkpoint(const char *name, int pos) {
- if (_surf_init_status && !_surf_do_model_check) {
+ if (_sg_init_status && !_sg_do_model_check) {
xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
}
- _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name);
- xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+ _sg_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name);
}
void _mc_cfg_cb_property(const char *name, int pos) {
- if (_surf_init_status && !_surf_do_model_check) {
+ if (_sg_init_status && !_sg_do_model_check) {
xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
}
- _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name);
- xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+ _sg_mc_property_file= xbt_cfg_get_string(_sg_cfg_set, name);
}
void _mc_cfg_cb_timeout(const char *name, int pos) {
- if (_surf_init_status && !_surf_do_model_check) {
+ if (_sg_init_status && !_sg_do_model_check) {
xbt_die("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
}
- _surf_mc_timeout= xbt_cfg_get_int(_surf_cfg_set, name);
- xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+ _sg_mc_timeout= xbt_cfg_get_int(_sg_cfg_set, name);
}
void _mc_cfg_cb_max_depth(const char *name, int pos) {
- if (_surf_init_status && !_surf_do_model_check) {
+ if (_sg_init_status && !_sg_do_model_check) {
xbt_die("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
}
- _surf_mc_max_depth= xbt_cfg_get_int(_surf_cfg_set, name);
- xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+ _sg_mc_max_depth= xbt_cfg_get_int(_sg_cfg_set, name);
}
-void _mc_cfg_cb_stateful(const char *name, int pos) {
- if (_surf_init_status && !_surf_do_model_check) {
- xbt_die("You are trying to change stateful mode after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+void _mc_cfg_cb_visited(const char *name, int pos) {
+ if (_sg_init_status && !_sg_do_model_check) {
+ xbt_die("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
}
- _surf_mc_stateful= xbt_cfg_get_int(_surf_cfg_set, name);
- xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+ _sg_mc_visited= xbt_cfg_get_int(_sg_cfg_set, name);
}
mc_state_t mc_current_state = NULL;
char mc_replay_mode = FALSE;
double *mc_time = NULL;
-mc_snapshot_t initial_snapshot = NULL;
+mc_comparison_times_t mc_comp_times = NULL;
+double mc_snapshot_comparison_time;
/* Safety */
xbt_fifo_t mc_stack_safety = NULL;
mc_stats_t mc_stats = NULL;
+mc_global_t initial_state_safety = NULL;
/* Liveness */
/* Local */
xbt_dict_t mc_local_variables = NULL;
+/* Global */
+xbt_dynar_t mc_global_variables = NULL;
/* Ignore mechanism */
xbt_dynar_t mc_stack_comparison_ignore;
static void MC_assert_pair(int prop);
static dw_location_t get_location(xbt_dict_t location_list, char *expr);
static dw_frame_t get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset);
+static size_t data_bss_ignore_size(void *address);
+static void MC_get_global_variables(char *elf_file);
void MC_do_the_modelcheck_for_real() {
- if (!_surf_mc_property_file || _surf_mc_property_file[0]=='\0') {
+
+ MC_SET_RAW_MEM;
+ mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1);
+ MC_UNSET_RAW_MEM;
+
+ if (!_sg_mc_property_file || _sg_mc_property_file[0]=='\0') {
if (mc_reduce_kind==e_mc_reduce_unset)
mc_reduce_kind=e_mc_reduce_dpor;
XBT_INFO("Check a safety property");
- MC_modelcheck();
+ MC_modelcheck_safety();
} else {
if (mc_reduce_kind==e_mc_reduce_unset)
mc_reduce_kind=e_mc_reduce_none;
- XBT_INFO("Check the liveness property %s",_surf_mc_property_file);
- MC_automaton_load(_surf_mc_property_file);
+ XBT_INFO("Check the liveness property %s",_sg_mc_property_file);
+ MC_automaton_load(_sg_mc_property_file);
MC_modelcheck_liveness();
}
}
-/**
- * \brief Initialize the model-checker data structures
- */
-void MC_init_safety(void)
-{
-
- int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- /* Check if MC is already initialized */
- if (initial_snapshot)
- return;
-
- mc_time = xbt_new0(double, simix_process_maxpid);
-
- /* Initialize the data structures that must be persistent across every
- iteration of the model-checker (in RAW memory) */
-
- MC_SET_RAW_MEM;
-
- /* Initialize statistics */
- mc_stats = xbt_new0(s_mc_stats_t, 1);
- mc_stats->state_size = 1;
-
- /* Create exploration stack */
- mc_stack_safety = xbt_fifo_new();
-
- MC_UNSET_RAW_MEM;
-
- MC_dpor_init();
-
- MC_SET_RAW_MEM;
- /* Save the initial state */
- initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(initial_snapshot);
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
-}
void MC_compare(void){
compare = 1;
}
-
-void MC_modelcheck(void)
-{
- MC_init_safety();
- MC_dpor();
- MC_exit();
-}
-
-void MC_init_liveness(){
+void MC_init(){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
- char *ls_path = get_libsimgrid_path();
+ MC_init_memory_map_info();
mc_local_variables = xbt_dict_new_homogeneous(NULL);
MC_get_local_variables(xbt_binary_name, binary_location_list, &mc_local_variables);
/* Get local variables in libsimgrid for state equality detection */
- xbt_dict_t libsimgrid_location_list = MC_get_location_list(ls_path);
- MC_get_local_variables(ls_path, libsimgrid_location_list, &mc_local_variables);
+ xbt_dict_t libsimgrid_location_list = MC_get_location_list(libsimgrid_path);
+ MC_get_local_variables(libsimgrid_path, libsimgrid_location_list, &mc_local_variables);
- initial_state_liveness = xbt_new0(s_mc_global_t, 1);
+ xbt_dict_free(&libsimgrid_location_list);
+ xbt_dict_free(&binary_location_list);
+
+ /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */
+ get_libsimgrid_plt_section();
+ get_binary_plt_section();
+
+ MC_ignore_data_bss(&mc_comp_times, sizeof(mc_comp_times));
+ MC_ignore_data_bss(&mc_snapshot_comparison_time, sizeof(mc_snapshot_comparison_time));
+
+ /* Get global variables */
+ MC_get_global_variables(xbt_binary_name);
+ MC_get_global_variables(libsimgrid_path);
MC_UNSET_RAW_MEM;
- MC_init_memory_map_info();
+ /* Ignore some variables from xbt/ex.h used by exception e for stacks comparison */
+ MC_ignore_stack("e", "*");
+ MC_ignore_stack("__ex_cleanup", "*");
+ MC_ignore_stack("__ex_mctx_en", "*");
+ MC_ignore_stack("__ex_mctx_me", "*");
+ MC_ignore_stack("__xbt_ex_ctx_ptr", "*");
+ MC_ignore_stack("_log_ev", "*");
+ MC_ignore_stack("_throw_ctx", "*");
+ MC_ignore_stack("ctx", "*");
- /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */
- get_libsimgrid_plt_section();
- get_binary_plt_section();
+ MC_ignore_stack("next_context", "smx_ctx_sysv_suspend_serial");
+ MC_ignore_stack("i", "smx_ctx_sysv_suspend_serial");
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
+}
+
+void MC_modelcheck_safety(void)
+{
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ /* Check if MC is already initialized */
+ if (initial_state_safety)
+ return;
+
+ mc_time = xbt_new0(double, simix_process_maxpid);
+
+ /* Initialize the data structures that must be persistent across every
+ iteration of the model-checker (in RAW memory) */
+
+ MC_SET_RAW_MEM;
+
+ /* Initialize statistics */
+ mc_stats = xbt_new0(s_mc_stats_t, 1);
+ mc_stats->state_size = 1;
+
+ /* Create exploration stack */
+ mc_stack_safety = xbt_fifo_new();
+
+ MC_UNSET_RAW_MEM;
+
+ if(_sg_mc_visited > 0){
+ MC_init();
+ }else{
+ MC_SET_RAW_MEM;
+ MC_init_memory_map_info();
+ get_libsimgrid_plt_section();
+ get_binary_plt_section();
+ MC_UNSET_RAW_MEM;
+ }
+
+ MC_dpor_init();
+
+ 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();
+ MC_UNSET_RAW_MEM;
+
+ MC_dpor();
if(raw_mem_set)
MC_SET_RAW_MEM;
+ MC_exit();
}
void MC_modelcheck_liveness(){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
- MC_init_liveness();
+ MC_init();
MC_SET_RAW_MEM;
/* Initialize statistics */
mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1);
- XBT_DEBUG("Creating stack");
-
/* Create exploration stack */
mc_stack_liveness = xbt_fifo_new();
+ initial_state_liveness = xbt_new0(s_mc_global_t, 1);
+
MC_UNSET_RAW_MEM;
MC_ddfs_init();
void MC_exit(void)
{
- MC_print_statistics(mc_stats);
xbt_free(mc_time);
MC_memory_exit();
+ xbt_abort();
}
if(start == -1){
/* Restore the initial state */
- MC_restore_snapshot(initial_snapshot);
+ MC_restore_snapshot(initial_state_safety->snapshot);
/* At the moment of taking the snapshot the raw heap was set, so restoring
* it will set it back again, we have to unset it to continue */
MC_UNSET_RAW_MEM;
MC_show_stack_safety(stack);
- if(!_surf_mc_checkpoint){
+ if(!_sg_mc_checkpoint){
mc_state_t state;
/************ MC_ignore ***********/
+void heap_ignore_region_free(mc_heap_ignore_region_t r){
+ if(r)
+ xbt_free(r);
+}
+
+void heap_ignore_region_free_voidp(void *r){
+ heap_ignore_region_free((mc_heap_ignore_region_t) * (void **) r);
+}
+
void MC_ignore_heap(void *address, size_t size){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
if(mc_heap_comparison_ignore == NULL)
- mc_heap_comparison_ignore = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), NULL);
+ mc_heap_comparison_ignore = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp);
mc_heap_ignore_region_t region = NULL;
region = xbt_new0(s_mc_heap_ignore_region_t, 1);
region->address = address;
region->size = size;
- if((address >= std_heap) && (address <= (void*)((char *)std_heap + STD_HEAP_SIZE))){
-
- region->block = ((char*)address - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1;
-
- if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){
- region->fragment = -1;
- }else{
- region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type;
- }
-
+ region->block = ((char*)address - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1;
+
+ if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){
+ region->fragment = -1;
+ ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_block.ignore = 1;
+ }else{
+ region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type;
+ ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_frag.ignore[region->fragment] = 1;
}
unsigned int cursor = 0;
MC_SET_RAW_MEM;
}
+void MC_remove_ignore_heap(void *address, size_t size){
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
+
+ unsigned int cursor = 0;
+ int start = 0;
+ int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1;
+ mc_heap_ignore_region_t region;
+ int ignore_found = 0;
+
+ while(start <= end){
+ cursor = (start + end) / 2;
+ region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t);
+ if(region->address == address){
+ ignore_found = 1;
+ break;
+ }
+ if(region->address < address)
+ start = cursor + 1;
+ if(region->address > address){
+ if((char * )region->address <= ((char *)address + size)){
+ ignore_found = 1;
+ break;
+ }else
+ end = cursor - 1;
+ }
+ }
+
+ if(ignore_found == 1){
+ xbt_dynar_remove_at(mc_heap_comparison_ignore, cursor, NULL);
+ MC_remove_ignore_heap(address, size);
+ }
+
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
+}
+
void MC_ignore_data_bss(void *address, size_t size){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
var->address = address;
var->size = size;
- if(current_var->address > address)
+ if(current_var->address < address)
xbt_dynar_insert_at(mc_data_bss_comparison_ignore, cursor + 1, &var);
else
xbt_dynar_insert_at(mc_data_bss_comparison_ignore, cursor, &var);
MC_SET_RAW_MEM;
}
+static size_t data_bss_ignore_size(void *address){
+ unsigned int cursor = 0;
+ int start = 0;
+ int end = xbt_dynar_length(mc_data_bss_comparison_ignore) - 1;
+ mc_data_bss_ignore_variable_t var;
+
+ while(start <= end){
+ cursor = (start + end) / 2;
+ var = (mc_data_bss_ignore_variable_t)xbt_dynar_get_as(mc_data_bss_comparison_ignore, cursor, mc_data_bss_ignore_variable_t);
+ if(var->address == address)
+ return var->size;
+ if(var->address < address){
+ if((void *)((char *)var->address + var->size) > address)
+ return (char *)var->address + var->size - (char*)address;
+ else
+ start = cursor + 1;
+ }
+ if(var->address > address)
+ end = cursor - 1;
+ }
+
+ return 0;
+}
+
+
+
void MC_ignore_stack(const char *var_name, const char *frame){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
region->process_name = strdup(name);
region->context = context;
region->size = size;
+ region->block = ((char*)stack - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1;
xbt_dynar_push(stacks_areas, ®ion);
MC_UNSET_RAW_MEM;
FILE *fp = popen(command, "r");
- if(fp == NULL)
+ if(fp == NULL){
perror("popen for objdump failed");
+ xbt_abort();
+ }
int debug = 0; /*Detect if the program has been compiled with -g */
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);
xbt_dynar_free(&split);
}
- free(line);
- free(command);
+ xbt_free(line);
+ xbt_free(command);
pclose(fp);
return location_list;
}
-char *get_libsimgrid_path(){
-
- char *command = bprintf("ldd %s", xbt_binary_name);
-
- FILE *fp = popen(command, "r");
- if(fp == NULL)
- perror("popen for ldd failed");
-
- char *line;
- ssize_t read;
- size_t n = 0;
- xbt_dynar_t split;
-
- while((read = getline(&line, &n, fp)) != -1){
-
- if(n == 0)
- continue;
-
- /* Wipeout the new line character */
- line[read - 1] = '\0';
-
- xbt_str_strip_spaces(line);
- xbt_str_ltrim(line, NULL);
- split = xbt_str_split(line, " ");
-
- if(strncmp((char *)xbt_dynar_get_as(split, 0, char *), "libsimgrid.so", 13) == 0){
- free(line);
- free(command);
- pclose(fp);
- return ((char *)xbt_dynar_get_as(split, 2, char *));
- }
-
- xbt_dynar_free(&split);
-
- }
-
- free(line);
- free(command);
- pclose(fp);
-
- return NULL;
-
-}
-
static dw_frame_t get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset){
xbt_dict_cursor_t cursor = NULL;
dw_frame_t res;
xbt_dict_foreach(all_variables, cursor, name, res) {
- if(offset >= res->start && offset < res->end)
+ if(offset >= res->start && offset < res->end){
+ xbt_dict_cursor_free(&cursor);
return res;
+ }
}
+ xbt_dict_cursor_free(&cursor);
return NULL;
}
xbt_str_rtrim(abstract_origin, ">");
subprogram_name = (char *)xbt_dict_get_or_null(subprograms_origin, abstract_origin);
frame = xbt_dict_get_or_null(*all_variables, subprogram_name);
+ xbt_free(abstract_origin);
}else if(strcmp(node_type, "DW_AT_name") == 0){
new_frame = 1;
- free(current_frame);
+ xbt_free(current_frame);
frame = xbt_new0(s_dw_frame_t, 1);
frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *));
frame->variables = xbt_dict_new_homogeneous(NULL);
xbt_str_rtrim(loc_expr, ")");
frame->frame_base = get_location(NULL, loc_expr);
xbt_dynar_free(&split2);
+ xbt_free(loc_expr);
}
}else if(strcmp(node_type, "DW_AT_MIPS_linkage_name:") == 0){
- free(frame->name);
- free(current_frame);
+ xbt_free(frame->name);
+ xbt_free(current_frame);
frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *));
current_frame = strdup(frame->name);
xbt_dict_set(subprograms_origin, subprogram_start, frame->name, NULL);
xbt_dict_set(*all_variables, frame->name, frame, NULL);
}
- free(subprogram_start);
+ xbt_free(subprogram_start);
if(subprogram_end != NULL){
- free(subprogram_end);
+ xbt_free(subprogram_end);
subprogram_end = NULL;
}
xbt_str_rtrim(loc_expr, ")");
var->location = get_location(NULL, loc_expr);
xbt_dynar_free(&split2);
+ xbt_free(loc_expr);
}
}
xbt_dynar_free(&split);
- free(line);
- free(command);
+ xbt_free(line);
+ xbt_free(command);
pclose(fp);
}
char *key = bprintf("%d", (int)strtoul(expr, NULL, 16));
loc->type = e_dw_loclist;
loc->location.loclist = (xbt_dynar_t)xbt_dict_get_or_null(location_list, key);
- if(loc == NULL)
+ if(loc->location.loclist == NULL)
XBT_INFO("Key not found in loclist");
+ xbt_free(key);
return loc;
}else{
}else if(strcmp(tok2, "DW_OP_fbreg:") == 0){
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_fbregister_op;
- new_element->location.fbreg_op = atoi(xbt_dynar_get_as(tokens2, 1, char*));
+ new_element->location.fbreg_op = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*));
xbt_dynar_push(loc->location.compose, &new_element);
}else if(strncmp(tok2, "DW_OP_breg", 10) == 0){
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_bregister_op;
new_element->location.breg_op.reg = atoi(strtok(tok2, "DW_OP_breg"));
- new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, 1, char*));
+ new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*));
xbt_dynar_push(loc->location.compose, &new_element);
}else if(strncmp(tok2, "DW_OP_lit", 9) == 0){
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
}else if(strcmp(tok2, "DW_OP_piece:") == 0){
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_piece;
- new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, 1, char*));
+ new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*));
/*if(strlen(xbt_dynar_get_as(tokens2, 1, char*)) > 1)
new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, 1, char*));
else
}else if(strcmp(tok2, "DW_OP_plus_uconst:") == 0){
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_plus_uconst;
- new_element->location.plus_uconst = atoi(xbt_dynar_get_as(tokens2, 1, char *));
+ new_element->location.plus_uconst = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char *));
xbt_dynar_push(loc->location.compose, &new_element);
}else if(strcmp(tok, "DW_OP_abs") == 0 ||
strcmp(tok, "DW_OP_and") == 0 ||
}else if(strcmp(tok2, "DW_OP_deref_size:") == 0){
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_deref;
- new_element->location.deref_size = (unsigned int short) atoi(xbt_dynar_get_as(tokens2, 1, char*));
+ new_element->location.deref_size = (unsigned int short) atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*));
/*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1)
new_element->location.deref_size = atoi(xbt_dynar_get_as(tokens, cursor, char*));
else
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_uconstant;
new_element->location.uconstant.bytes = 1;
- new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*)));
+ new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)));
/*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1)
new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens, cursor, char*)));
else
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_sconstant;
new_element->location.sconstant.bytes = 1;
- new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*)));
+ new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)));
xbt_dynar_push(loc->location.compose, &new_element);
}else if(strcmp(tok2, "DW_OP_const1u:") == 0 ||
strcmp(tok2, "DW_OP_const2u:") == 0 ||
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_uconstant;
new_element->location.uconstant.bytes = tok2[11] - '0';
- new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*)));
+ new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)));
/*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1)
new_element->location.constant.value = atoi(xbt_dynar_get_as(tokens, cursor, char*));
else
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
new_element->type = e_dw_sconstant;
new_element->location.sconstant.bytes = tok2[11] - '0';
- new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*)));
+ new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)));
xbt_dynar_push(loc->location.compose, &new_element);
}else{
dw_location_t new_element = xbt_new0(s_dw_location_t, 1);
}
}
+
+static void MC_get_global_variables(char *elf_file){
+
+ FILE *fp;
+
+ char *command = bprintf("objdump -t -j .data -j .bss %s", elf_file);
+
+ fp = popen(command, "r");
+
+ if(fp == NULL){
+ perror("popen failed");
+ xbt_abort();
+ }
+
+ if(mc_global_variables == NULL)
+ mc_global_variables = xbt_dynar_new(sizeof(global_variable_t), global_variable_free_voidp);
+
+ char *line = NULL;
+ ssize_t read;
+ size_t n = 0;
+
+ xbt_dynar_t line_tokens = NULL;
+ unsigned long offset;
+
+ int type = strcmp(elf_file, xbt_binary_name); /* 0 = binary, other = libsimgrid */
+
+ while ((read = getline(&line, &n, fp)) != -1){
+
+ if(n == 0)
+ continue;
+
+ /* Wipeout the new line character */
+ line[read - 1] = '\0';
+
+ xbt_str_strip_spaces(line);
+ xbt_str_ltrim(line, NULL);
+
+ line_tokens = xbt_str_split(line, NULL);
+
+ if(xbt_dynar_length(line_tokens) <= 4 || strcmp(xbt_dynar_get_as(line_tokens, 0, char *), "SYMBOL") == 0)
+ continue;
+
+ if((strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "__gcov", 6) == 0)
+ || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "gcov", 4) == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), ".data") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), ".bss") == 0)
+ || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "stderr", 6) == 0)
+ || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "counter", 7) == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "heapinfo1") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "heapinfo2") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "heapbase1") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "heapbase2") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "heapsize1") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "heapsize2") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "heaplimit") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "ignore_done") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "s_heap") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "to_ignore1") == 0)
+ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "to_ignore2") == 0)
+ || ((size_t)strtoul(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 2, char*), NULL, 16) == 0))
+ continue;
+
+ global_variable_t var = xbt_new0(s_global_variable_t, 1);
+
+ if(type == 0){
+ var->address = (void *)strtoul(xbt_dynar_get_as(line_tokens, 0, char*), NULL, 16);
+ }else{
+ offset = strtoul(xbt_dynar_get_as(line_tokens, 0, char*), NULL, 16);
+ var->address = (char *)start_text_libsimgrid+offset;
+ }
+
+ var->size = (size_t)strtoul(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 2, char*), NULL, 16);
+ var->name = strdup(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*));
+
+ if(data_bss_ignore_size(var->address) > 0)
+ global_variable_free(var);
+ else
+ xbt_dynar_push(mc_global_variables, &var);
+
+ xbt_dynar_free(&line_tokens);
+
+ }
+
+ xbt_free(command);
+ xbt_free(line);
+ pclose(fp);
+
+}
+
+void global_variable_free(global_variable_t v){
+ xbt_free(v->name);
+ xbt_free(v);
+}
+
+void global_variable_free_voidp(void *v){
+ global_variable_free((global_variable_t) * (void **) v);
+}
