From: Gabriel Corona Date: Thu, 26 Jun 2014 12:35:40 +0000 (+0200) Subject: [mc] Inline mc_snapshot_read_region() X-Git-Tag: v3_12~956^2~1^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/76fcd6c75256746e4292484155108ab63f364ab5 [mc] Inline mc_snapshot_read_region() --- diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h index 7f601c1f25..f188da7446 100644 --- a/src/mc/mc_mmu.h +++ b/src/mc/mc_mmu.h @@ -10,7 +10,8 @@ #include #include -#include "mc_private.h" +extern int xbt_pagesize; +extern int xbt_pagebits; /** @brief How many memory pages are necessary to store size bytes? * diff --git a/src/mc/mc_page_snapshot.cpp b/src/mc/mc_page_snapshot.cpp index 58ea9e7393..2d095213af 100644 --- a/src/mc/mc_page_snapshot.cpp +++ b/src/mc/mc_page_snapshot.cpp @@ -1,5 +1,6 @@ #include "mc_page_store.h" #include "mc_mmu.h" +#include "mc_private.h" #include diff --git a/src/mc/mc_page_store.cpp b/src/mc/mc_page_store.cpp index b6ba6f74cb..cac7e0f306 100644 --- a/src/mc/mc_page_store.cpp +++ b/src/mc/mc_page_store.cpp @@ -7,6 +7,8 @@ #include #include // memcpy, memcp +#include + #include #include diff --git a/src/mc/mc_page_store.h b/src/mc/mc_page_store.h index de67f55da2..453d103231 100644 --- a/src/mc/mc_page_store.h +++ b/src/mc/mc_page_store.h @@ -16,11 +16,10 @@ #include -#include "mc_private.h" #include "mc_mmu.h" -#ifndef MC_PAGE_SNAPSHOT_H -#define MC_PAGE_SNAPSHOT_H +#ifndef MC_PAGE_STORE_H +#define MC_PAGE_STORE_H struct s_mc_pages_store; @@ -195,6 +194,11 @@ size_t s_mc_pages_store::capacity() { #endif +SG_BEGIN_DECL() + +typedef struct s_mc_pages_store s_mc_pages_store_t, * mc_pages_store_t; +mc_pages_store_t mc_pages_store_new(); + /** */ static inline __attribute__((always_inline)) @@ -205,4 +209,6 @@ const void* mc_page_store_get_page(mc_pages_store_t page_store, size_t pageno) return mc_page_from_number(memory, pageno); } +SG_END_DECL() + #endif diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index ef2afff19e..68102ece81 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -30,6 +30,7 @@ #include "xbt/strbuff.h" #include "xbt/parmap.h" #include "mc_mmu.h" +#include "mc_page_store.h" SG_BEGIN_DECL() @@ -144,15 +145,13 @@ mc_mem_region_t mc_region_new_sparse(int type, void *start_addr, size_t size, mc void mc_region_restore_sparse(mc_mem_region_t reg, mc_mem_region_t ref_reg); void mc_softdirty_reset(); -typedef struct s_mc_pages_store s_mc_pages_store_t, * mc_pages_store_t; -mc_pages_store_t mc_pages_store_new(); - static inline __attribute__((always_inline)) bool mc_snapshot_region_linear(mc_mem_region_t region) { return !region || !region->data; } -void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target, size_t size); +void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, void* target, size_t size); + void* mc_snapshot_read(void* addr, mc_snapshot_t snapshot, void* target, size_t size); int mc_snapshot_region_memcp( void* addr1, mc_mem_region_t region1, @@ -655,7 +654,62 @@ bool mc_address_test(mc_address_set_t p, const void* value); * */ uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks); -// +/* *********** Snapshot *********** */ + +static inline __attribute__((always_inline)) +void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region) +{ + size_t pageno = mc_page_number(region->start_addr, (void*) addr); + size_t snapshot_pageno = region->page_numbers[pageno]; + const void* snapshot_page = mc_page_store_get_page(mc_model_checker->pages, snapshot_pageno); + return (char*) snapshot_page + mc_page_offset((void*) addr); +} + +/** \brief Translate a pointer from process address space to snapshot address space + * + * The address space contains snapshot of the main/application memory: + * this function finds the address in a given snaphot for a given + * real/application address. + * + * For read only memory regions and other regions which are not int the + * snapshot, the address is not changed. + * + * \param addr Application address + * \param snapshot The snapshot of interest (if NULL no translation is done) + * \return Translated address in the snapshot address space + * */ +static inline __attribute__((always_inline)) +void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot) +{ + + // If not in a process state/clone: + if (!snapshot) { + return (uintptr_t *) addr; + } + + mc_mem_region_t region = mc_get_snapshot_region((void*) addr, snapshot); + + xbt_assert(mc_region_contain(region, (void*) addr), "Trying to read out of the region boundary."); + + if (!region) { + return (void *) addr; + } + + // Flat snapshot: + else if (region->data) { + uintptr_t offset = addr - (uintptr_t) region->start_addr; + return (void *) ((uintptr_t) region->data + offset); + } + + // Per-page snapshot: + else if (region->page_numbers) { + return mc_translate_address_region(addr, region); + } + + else { + xbt_die("No data for this memory region"); + } +} static inline __attribute__ ((always_inline)) void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) { @@ -672,6 +726,45 @@ void* mc_snapshot_read_pointer(void* addr, mc_snapshot_t snapshot) return *(void**) mc_snapshot_read(addr, snapshot, &res, sizeof(void*)); } +/** @brief Read memory from a snapshot region + * + * @param addr Process (non-snapshot) address of the data + * @param region Snapshot memory region where the data is located + * @param target Buffer to store the value + * @param size Size of the data to read in bytes + * @return Pointer where the data is located (target buffer of original location) + */ +static inline __attribute__((always_inline)) +void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target, size_t size) +{ + uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start_addr; + + xbt_assert(addr >= region->start_addr && (char*) addr+size < (char*)region->start_addr+region->size, + "Trying to read out of the region boundary."); + + // Linear memory region: + if (region->data) { + return (void*) ((uintptr_t) region->data + offset); + } + + // Fragmented memory region: + else if (region->page_numbers) { + void* end = (char*) addr + size - 1; + if( mc_same_page(addr, end) ) { + // The memory is contained in a single page: + return mc_translate_address_region((uintptr_t) addr, region); + } else { + // The memory spans several pages: + return mc_snapshot_read_fragmented(addr, region, target, size); + } + } + + else { + xbt_die("No data available for this region"); + } +} + + SG_END_DECL() #endif diff --git a/src/mc/mc_snapshot.c b/src/mc/mc_snapshot.c index 7f3629145b..a7bd4dfea8 100644 --- a/src/mc/mc_snapshot.c +++ b/src/mc/mc_snapshot.c @@ -25,61 +25,6 @@ mc_mem_region_t mc_get_snapshot_region(void* addr, mc_snapshot_t snapshot) return NULL; } -static inline __attribute__((always_inline)) -void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region) -{ - size_t pageno = mc_page_number(region->start_addr, (void*) addr); - size_t snapshot_pageno = region->page_numbers[pageno]; - const void* snapshot_page = mc_page_store_get_page(mc_model_checker->pages, snapshot_pageno); - return (char*) snapshot_page + mc_page_offset((void*) addr); -} - -/** \brief Translate a pointer from process address space to snapshot address space - * - * The address space contains snapshot of the main/application memory: - * this function finds the address in a given snaphot for a given - * real/application address. - * - * For read only memory regions and other regions which are not int the - * snapshot, the address is not changed. - * - * \param addr Application address - * \param snapshot The snapshot of interest (if NULL no translation is done) - * \return Translated address in the snapshot address space - * */ -static inline __attribute__((always_inline)) -void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot) -{ - - // If not in a process state/clone: - if (!snapshot) { - return (uintptr_t *) addr; - } - - mc_mem_region_t region = mc_get_snapshot_region((void*) addr, snapshot); - - xbt_assert(mc_region_contain(region, (void*) addr), "Trying to read out of the region boundary."); - - if (!region) { - return (void *) addr; - } - - // Flat snapshot: - else if (region->data) { - uintptr_t offset = addr - (uintptr_t) region->start_addr; - return (void *) ((uintptr_t) region->data + offset); - } - - // Per-page snapshot: - else if (region->page_numbers) { - return mc_translate_address_region(addr, region); - } - - else { - xbt_die("No data for this memory region"); - } -} - /** @brief Read memory from a snapshot region broken across fragmented pages * * @param addr Process (non-snapshot) address of the data @@ -88,7 +33,7 @@ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot) * @param size Size of the data to read in bytes * @return Pointer where the data is located (target buffer of original location) */ -static void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, void* target, size_t size) +void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, void* target, size_t size) { void* end = (char*) addr + size - 1; size_t page_end = mc_page_number(NULL, end); @@ -112,43 +57,6 @@ static void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, voi return target; } -/** @brief Read memory from a snapshot region - * - * @param addr Process (non-snapshot) address of the data - * @param region Snapshot memory region where the data is located - * @param target Buffer to store the value - * @param size Size of the data to read in bytes - * @return Pointer where the data is located (target buffer of original location) - */ -void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target, size_t size) -{ - uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start_addr; - - xbt_assert(addr >= region->start_addr && (char*) addr+size < (char*)region->start_addr+region->size, - "Trying to read out of the region boundary."); - - // Linear memory region: - if (region->data) { - return (void*) ((uintptr_t) region->data + offset); - } - - // Fragmented memory region: - else if (region->page_numbers) { - void* end = (char*) addr + size - 1; - if( mc_same_page(addr, end) ) { - // The memory is contained in a single page: - return mc_translate_address_region((uintptr_t) addr, region); - } else { - // The memory spans several pages: - return mc_snapshot_read_fragmented(addr, region, target, size); - } - } - - else { - xbt_die("No data available for this region"); - } -} - /** @brief Read memory from a snapshot * * @param addr Process (non-snapshot) address of the data