From 330c412486ad86896ffff897a620c2d253f32386 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sat, 28 Dec 2019 14:44:26 +0100 Subject: [PATCH] Cosmetics: use 's_xbt_mheap_t' instead of 'struct mdesc'. --- src/mc/compare.cpp | 4 ++-- src/mc/remote/Client.cpp | 4 ++-- src/mc/sosp/Snapshot.cpp | 2 +- src/mc/sosp/Snapshot.hpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index d23054c022..a93c6d1139 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1227,9 +1227,9 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) } /* Init heap information used in heap comparison algorithm */ - xbt_mheap_t heap1 = static_cast(s1->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc), + xbt_mheap_t heap1 = static_cast(s1->read_bytes(alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), remote(process.heap_address), ReadOptions::lazy())); - xbt_mheap_t heap2 = static_cast(s2->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc), + xbt_mheap_t heap2 = static_cast(s2->read_bytes(alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), remote(process.heap_address), ReadOptions::lazy())); if (state_comparator.initHeapInformation(heap1, heap2, s1->to_ignore_, s2->to_ignore_) == -1) { XBT_VERB("(%d - %d) Different heap information", s1->num_state_, s2->num_state_); diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp index 8d7b91568d..a1c92425e1 100644 --- a/src/mc/remote/Client.cpp +++ b/src/mc/remote/Client.cpp @@ -183,7 +183,7 @@ void Client::ignore_memory(void* addr, std::size_t size) void Client::ignore_heap(void* address, std::size_t size) { - const mdesc* heap = mmalloc_get_current_heap(); + const s_xbt_mheap_t* heap = mmalloc_get_current_heap(); s_mc_message_ignore_heap_t message; message.type = MC_MESSAGE_IGNORE_HEAP; @@ -227,7 +227,7 @@ void Client::declare_symbol(const char* name, int* value) void Client::declare_stack(void* stack, size_t size, ucontext_t* context) { - const mdesc* heap = mmalloc_get_current_heap(); + const s_xbt_mheap_t* heap = mmalloc_get_current_heap(); s_stack_region_t region; memset(®ion, 0, sizeof(region)); diff --git a/src/mc/sosp/Snapshot.cpp b/src/mc/sosp/Snapshot.cpp index 047ae88ce7..fb8e06f1a1 100644 --- a/src/mc/sosp/Snapshot.cpp +++ b/src/mc/sosp/Snapshot.cpp @@ -23,7 +23,7 @@ void Snapshot::snapshot_regions(RemoteClient* process) for (auto const& object_info : process->object_infos) add_region(RegionType::Data, object_info.get(), object_info->start_rw, object_info->end_rw - object_info->start_rw); - const mdesc* heap = process->get_heap(); + const s_xbt_mheap_t* heap = process->get_heap(); void* start_heap = heap->base; void* end_heap = heap->breakval; diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp index 92ea945340..11aee6d720 100644 --- a/src/mc/sosp/Snapshot.hpp +++ b/src/mc/sosp/Snapshot.hpp @@ -66,7 +66,7 @@ public: /* Regular use */ bool on_heap(const void* address) const { - const mdesc* heap = process()->get_heap(); + const s_xbt_mheap_t* heap = process()->get_heap(); return address >= heap->heapbase && address < heap->breakval; } -- 2.20.1