X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..452237878ed316508bdfa05e3af625f549628842:/src/mc/RegionSnapshot.cpp diff --git a/src/mc/RegionSnapshot.cpp b/src/mc/RegionSnapshot.cpp index 445daedb89..eee6962303 100644 --- a/src/mc/RegionSnapshot.cpp +++ b/src/mc/RegionSnapshot.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. +/* Copyright (c) 2007-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ Buffer::Buffer(std::size_t size, Type type) : size_(size), type_(type) { switch(type_) { case Type::Malloc: - data_ = ::malloc(size_); + data_ = ::operator new(size_); break; case Type::Mmap: data_ = ::mmap(nullptr, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0); @@ -62,7 +62,7 @@ void Buffer::clear() noexcept { switch(type_) { case Type::Malloc: - std::free(data_); + ::operator delete(data_); break; case Type::Mmap: if (munmap(data_, size_) != 0) @@ -137,8 +137,8 @@ RegionSnapshot sparse_region(RegionType region_type, "Not at the beginning of a page"); size_t page_count = simgrid::mc::mmu::chunkCount(size); - simgrid::mc::ChunkedData page_data( - mc_model_checker->page_store(), *process, permanent_addr, page_count); + simgrid::mc::ChunkedData page_data(mc_model_checker->page_store(), *process, RemotePtr(permanent_addr), + page_count); simgrid::mc::RegionSnapshot region( region_type, start_addr, permanent_addr, size);