#include "src/internal_config.h"
#include "src/smpi/include/private.hpp"
-#include "src/mc/mc_snapshot.hpp"
-#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_mmu.hpp"
#include "src/mc/PageStore.hpp"
+#include "src/mc/mc_mmu.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_snapshot.hpp"
extern "C" {
bool stack_alloc = size < 64;
const bool region1_need_buffer = region1==nullptr || region1->storage_type()==simgrid::mc::StorageType::Flat;
const bool region2_need_buffer = region2==nullptr || region2->storage_type()==simgrid::mc::StorageType::Flat;
- void* buffer1a = region1_need_buffer ? nullptr : stack_alloc ? alloca(size) : malloc(size);
- void* buffer2a = region2_need_buffer ? nullptr : stack_alloc ? alloca(size) : malloc(size);
+ void* buffer1a = region1_need_buffer ? nullptr : stack_alloc ? alloca(size) : ::operator new(size);
+ void* buffer2a = region2_need_buffer ? nullptr : stack_alloc ? alloca(size) : ::operator new(size);
const void* buffer1 = MC_region_read(region1, buffer1a, addr1, size);
const void* buffer2 = MC_region_read(region2, buffer2a, addr2, size);
int res;
else
res = memcmp(buffer1, buffer2, size);
if (not stack_alloc) {
- free(buffer1a);
- free(buffer2a);
+ ::operator delete(buffer1a);
+ ::operator delete(buffer2a);
}
return res;
}
return MC_snapshot_region_memcmp(addr1, region1, addr2, region2, size);
}
+} // extern "C"
+
namespace simgrid {
namespace mc {
}
}
-}
-
#ifdef SIMGRID_TEST
#include <cstdlib>
#include <sys/mman.h>
+#include "src/mc/mc_mmu.hpp"
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_snapshot.hpp"
-#include "src/mc/mc_mmu.hpp"
XBT_TEST_SUITE("mc_snapshot", "Snapshots");