-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "internal_config.h"
-#include "mc_object_info.h"
+#include "mc_dwarf.hpp"
#include "mc_private.h"
#include "smpi/private.h"
#include "mc/mc_snapshot.h"
if (mc_mode != MC_MODE_CLIENT)
return;
+ xbt_mheap_t heap = mmalloc_get_current_heap();
+
s_mc_heap_ignore_region_t region;
memset(®ion, 0, sizeof(region));
region.address = address;
region.size = size;
region.block =
((char *) address -
- (char *) std_heap->heapbase) / BLOCKSIZE + 1;
- if (std_heap->heapinfo[region.block].type == 0) {
+ (char *) heap->heapbase) / BLOCKSIZE + 1;
+ if (heap->heapinfo[region.block].type == 0) {
region.fragment = -1;
- std_heap->heapinfo[region.block].busy_block.ignore++;
+ heap->heapinfo[region.block].busy_block.ignore++;
} else {
region.fragment =
- ((uintptr_t) (ADDR2UINT(address) % (BLOCKSIZE))) >> std_heap->
- heapinfo[region.block].type;
- std_heap->heapinfo[region.block].busy_frag.ignore[region.fragment]++;
+ ((uintptr_t) (ADDR2UINT(address) % (BLOCKSIZE))) >>
+ heap->heapinfo[region.block].type;
+ heap->heapinfo[region.block].busy_frag.ignore[region.fragment]++;
}
s_mc_ignore_heap_message_t message;
s_mc_ignore_memory_message_t message;
message.type = MC_MESSAGE_UNIGNORE_HEAP;
- message.addr = address;
+ message.addr = (std::uintptr_t) address;
message.size = size;
MC_client_send_message(&message, sizeof(message));
}
if (mc_mode != MC_MODE_CLIENT)
return;
+ xbt_mheap_t heap = mmalloc_get_current_heap();
+
s_stack_region_t region;
memset(®ion, 0, sizeof(region));
region.address = stack;
region.size = size;
region.block =
((char *) stack -
- (char *) std_heap->heapbase) / BLOCKSIZE + 1;
+ (char *) heap->heapbase) / BLOCKSIZE + 1;
#ifdef HAVE_SMPI
if (smpi_privatize_global_variables && process) {
region.process_index = smpi_process_index_of_smx_process(process);