xbt_abort();
}
+int SIMIX_pre_mc_random(smx_simcall_t simcall, int min, int max){
+
+ return simcall->mc_value;
+}
+
int MC_random(int min, int max)
{
/*FIXME: return mc_current_state->executed_transition->random.value;*/
- return 0;
+ return simcall_mc_random(min, max);
}
/**
/************ MC_ignore ***********/
void heap_ignore_region_free(mc_heap_ignore_region_t r){
- if(r)
- xbt_free(r);
+ xbt_free(r);
}
void heap_ignore_region_free_voidp(void *r){
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), 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;
-
+
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 = ((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;
}
+
+ if(mc_heap_comparison_ignore == NULL){
+ mc_heap_comparison_ignore = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp);
+ xbt_dynar_push(mc_heap_comparison_ignore, ®ion);
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+ return;
+ }
unsigned int cursor = 0;
mc_heap_ignore_region_t current_region;
- xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region){
+ int start = 0;
+ int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1;
+
+ while(start <= end){
+ cursor = (start + end) / 2;
+ current_region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t);
+ if(current_region->address == address){
+ heap_ignore_region_free(region);
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+ return;
+ }
+ if(current_region->address < address)
+ start = cursor + 1;
if(current_region->address > address)
- break;
+ end = cursor - 1;
}
- xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, ®ion);
+ if(current_region->address < address)
+ xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor + 1, ®ion);
+ else
+ xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, ®ion);
MC_UNSET_RAW_MEM;
-void MC_ignore_stack(const char *var_name, const char *frame){
+void MC_ignore_stack(const char *var_name, const char *frame_name){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
mc_stack_ignore_variable_t var = NULL;
var = xbt_new0(s_mc_stack_ignore_variable_t, 1);
var->var_name = strdup(var_name);
- var->frame = strdup(frame);
+ var->frame = strdup(frame_name);
xbt_dynar_insert_at(mc_stack_comparison_ignore, 0, &var);
while(start <= end){
cursor = (start + end) / 2;
current_var = (mc_stack_ignore_variable_t)xbt_dynar_get_as(mc_stack_comparison_ignore, cursor, mc_stack_ignore_variable_t);
- if(strcmp(current_var->frame, frame) == 0){
+ if(strcmp(current_var->frame, frame_name) == 0){
if(strcmp(current_var->var_name, var_name) == 0){
MC_UNSET_RAW_MEM;
if(raw_mem_set)
if(strcmp(current_var->var_name, var_name) > 0)
end = cursor - 1;
}
- if(strcmp(current_var->frame, frame) < 0)
+ if(strcmp(current_var->frame, frame_name) < 0)
start = cursor + 1;
- if(strcmp(current_var->frame, frame) > 0)
+ if(strcmp(current_var->frame, frame_name) > 0)
end = cursor - 1;
}
mc_stack_ignore_variable_t var = NULL;
var = xbt_new0(s_mc_stack_ignore_variable_t, 1);
var->var_name = strdup(var_name);
- var->frame = strdup(frame);
+ var->frame = strdup(frame_name);
- if(strcmp(current_var->frame, frame) < 0)
+ if(strcmp(current_var->frame, frame_name) < 0)
xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor + 1, &var);
else
xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor, &var);
}
+ /* Remove variable from mc_local_variables */
+
+ if(mc_local_variables != NULL){
+
+ dw_frame_t frame = xbt_dict_get_or_null(mc_local_variables, frame_name);
+ if(frame != NULL)
+ xbt_dict_remove(frame->variables, var_name);
+
+ }
+
MC_UNSET_RAW_MEM;
if(raw_mem_set)
int cursor_remove;
xbt_dynar_t split = NULL;
- while ((read = getline(&line, &n, fp)) != -1) {
+ while ((read = xbt_getline(&line, &n, fp)) != -1) {
/* Wipeout the new line character */
line[read - 1] = '\0';
xbt_dynar_free(&split);
free(loc_expr);
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
if(read != -1){
line[read - 1] = '\0';
xbt_str_strip_spaces(line);
int new_frame = 0, new_variable = 0;
dw_frame_t variable_frame, subroutine_frame = NULL;
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
while (read != -1) {
if(n == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
line[read - 1] = '\0';
if(strlen(line) == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
xbt_str_strip_spaces(line);
if(line[0] != '<'){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
subprogram_start = strdup(strtok(NULL, "<"));
xbt_str_rtrim(subprogram_start, ">:");
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
while(read != -1){
if(n == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
line[read - 1] = '\0';
if(strlen(line) == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
}
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
}
}
xbt_free(subprogram_start);
- if(subprogram_end != NULL){
- xbt_free(subprogram_end);
- subprogram_end = NULL;
- }
+ xbt_free(subprogram_end);
+ subprogram_end = NULL;
}else if(strcmp(node_type, "(DW_TAG_variable)") == 0){ /* New variable */
origin = strdup(strtok(NULL, "<"));
xbt_str_rtrim(origin, ">:");
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
while(read != -1){
if(n == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
line[read - 1] = '\0';
if(strlen(line) == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
}
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
}
origin = strdup(strtok(NULL, "<"));
xbt_str_rtrim(origin, ">:");
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
while(read != -1){
line[read - 1] = '\0';
if(n == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
if(strlen(line) == 0){
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
continue;
}
subroutine_frame->high_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16);
}
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
}
}else{
- read = getline(&line, &n, fp);
+ read = xbt_getline(&line, &n, fp);
}
int type = strcmp(elf_file, xbt_binary_name); /* 0 = binary, other = libsimgrid */
- while ((read = getline(&line, &n, fp)) != -1){
+ while ((read = xbt_getline(&line, &n, fp)) != -1){
if(n == 0)
continue;