A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[windows] pexport is a dead project anyway
[simgrid.git]
/
src
/
mc
/
mc_snapshot.h
diff --git
a/src/mc/mc_snapshot.h
b/src/mc/mc_snapshot.h
index
8d9ce91
..
72965f4
100644
(file)
--- a/
src/mc/mc_snapshot.h
+++ b/
src/mc/mc_snapshot.h
@@
-1,11
+1,11
@@
-/* Copyright (c) 2007-201
4
. The SimGrid Team.
+/* Copyright (c) 2007-201
5
. 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. */
* 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. */
-#ifndef MC_SNAPSHOT_H
-#define MC_SNAPSHOT_H
+#ifndef
SIMGRID_
MC_SNAPSHOT_H
+#define
SIMGRID_
MC_SNAPSHOT_H
#include <sys/types.h> // off_t
#include <stdint.h> // size_t
#include <sys/types.h> // off_t
#include <stdint.h> // size_t
@@
-18,8
+18,9
@@
#include "../xbt/mmalloc/mmprivate.h"
#include <xbt/asserts.h>
#include <xbt/dynar.h>
#include "../xbt/mmalloc/mmprivate.h"
#include <xbt/asserts.h>
#include <xbt/dynar.h>
+#include <xbt/base.h>
-#include "mc_forward.h"
+#include "mc_forward.h
pp
"
#include "ModelChecker.hpp"
#include "PageStore.hpp"
#include "mc_mmalloc.h"
#include "ModelChecker.hpp"
#include "PageStore.hpp"
#include "mc_mmalloc.h"
@@
-31,7
+32,7
@@
SG_BEGIN_DECL()
// ***** Snapshot region
// ***** Snapshot region
-XBT_
INTERNAL void mc_region_restore_sparse(mc_process_t
process, mc_mem_region_t reg);
+XBT_
PRIVATE void mc_region_restore_sparse(simgrid::mc::Process*
process, mc_mem_region_t reg);
static inline __attribute__((always_inline))
void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region)
static inline __attribute__((always_inline))
void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region)
@@
-53,7
+54,7
@@
void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int pr
case simgrid::mc::StorageType::Flat:
{
uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address();
case simgrid::mc::StorageType::Flat:
{
uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address();
- return (void *) ((uintptr_t) region->flat_data()
.data()
+ offset);
+ return (void *) ((uintptr_t) region->flat_data() + offset);
}
case simgrid::mc::StorageType::Chunked:
}
case simgrid::mc::StorageType::Chunked:
@@
-71,8
+72,8
@@
void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int pr
}
}
}
}
-XBT_
INTERNAL
mc_mem_region_t mc_get_snapshot_region(
- const void* addr, const s
_mc_snapshot_
t *snapshot, int process_index);
+XBT_
PRIVATE
mc_mem_region_t mc_get_snapshot_region(
+ const void* addr, const s
imgrid::mc::Snapsho
t *snapshot, int process_index);
}
}
@@
-104,21
+105,21
@@
typedef struct s_mc_stack_frame {
/** Stack pointer */
unw_word_t sp;
unw_word_t frame_base;
/** Stack pointer */
unw_word_t sp;
unw_word_t frame_base;
-
dw_frame_t
frame;
+
simgrid::mc::Frame*
frame;
std::string frame_name;
unw_cursor_t unw_cursor;
} s_mc_stack_frame_t, *mc_stack_frame_t;
typedef struct s_local_variable{
std::string frame_name;
unw_cursor_t unw_cursor;
} s_mc_stack_frame_t, *mc_stack_frame_t;
typedef struct s_local_variable{
-
dw_frame_t
subprogram;
+
simgrid::mc::Frame*
subprogram;
unsigned long ip;
std::string name;
unsigned long ip;
std::string name;
-
dw_type_t
type;
+
simgrid::mc::Type*
type;
void *address;
int region;
} s_local_variable_t, *local_variable_t;
void *address;
int region;
} s_local_variable_t, *local_variable_t;
-typedef struct s_mc_snapshot_stack {
+typedef struct
XBT_PRIVATE
s_mc_snapshot_stack {
std::vector<s_local_variable> local_variables;
s_mc_unw_context_t context;
std::vector<s_mc_stack_frame_t> stack_frames;
std::vector<s_local_variable> local_variables;
s_mc_unw_context_t context;
std::vector<s_mc_stack_frame_t> stack_frames;
@@
-139,15
+140,15
@@
typedef struct s_mc_global_t {
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
-class Snapshot : public AddressSpace {
+class
XBT_PRIVATE
Snapshot : public AddressSpace {
public:
Snapshot();
~Snapshot();
const void* read_bytes(void* buffer, std::size_t size,
remote_ptr<void> address, int process_index = ProcessIndexAny,
public:
Snapshot();
~Snapshot();
const void* read_bytes(void* buffer, std::size_t size,
remote_ptr<void> address, int process_index = ProcessIndexAny,
- ReadMode mode = Normal) const
MC_OVERRIDE
;
+ ReadMode mode = Normal) const
override
;
public: // To be private
public: // To be private
-
mc_process_t
process;
+
simgrid::mc::Process*
process;
int num_state;
size_t heap_bytes_used;
std::vector<std::unique_ptr<s_mc_mem_region_t>> snapshot_regions;
int num_state;
size_t heap_bytes_used;
std::vector<std::unique_ptr<s_mc_mem_region_t>> snapshot_regions;
@@
-177,20
+178,20
@@
mc_mem_region_t mc_get_region_hinted(void* addr, mc_snapshot_t snapshot, int pro
static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
-XBT_
INTERNAL
mc_snapshot_t MC_take_snapshot(int num_state);
-XBT_
INTERNAL
void MC_restore_snapshot(mc_snapshot_t);
+XBT_
PRIVATE
mc_snapshot_t MC_take_snapshot(int num_state);
+XBT_
PRIVATE
void MC_restore_snapshot(mc_snapshot_t);
-XBT_
INTERNAL
void mc_restore_page_snapshot_region(
-
mc_process_t
process,
+XBT_
PRIVATE
void mc_restore_page_snapshot_region(
+
simgrid::mc::Process*
process,
void* start_addr, simgrid::mc::PerPageCopy const& pagenos);
void* start_addr, simgrid::mc::PerPageCopy const& pagenos);
-
MC_SHOULD_BE_INTERNAL
const void* MC_region_read_fragmented(
+const void* MC_region_read_fragmented(
mc_mem_region_t region, void* target, const void* addr, size_t size);
mc_mem_region_t region, void* target, const void* addr, size_t size);
-
MC_SHOULD_BE_INTERNAL
int MC_snapshot_region_memcmp(
+int MC_snapshot_region_memcmp(
const void* addr1, mc_mem_region_t region1,
const void* addr2, mc_mem_region_t region2, size_t size);
const void* addr1, mc_mem_region_t region1,
const void* addr2, mc_mem_region_t region2, size_t size);
-XBT_
INTERNAL
int MC_snapshot_memcmp(
+XBT_
PRIVATE
int MC_snapshot_memcmp(
const void* addr1, mc_snapshot_t snapshot1,
const void* addr2, mc_snapshot_t snapshot2, int process_index, size_t size);
const void* addr1, mc_snapshot_t snapshot1,
const void* addr2, mc_snapshot_t snapshot2, int process_index, size_t size);
@@
-226,7
+227,7
@@
const void* MC_region_read(mc_mem_region_t region, void* target, const void* add
xbt_die("Storage type not supported");
case simgrid::mc::StorageType::Flat:
xbt_die("Storage type not supported");
case simgrid::mc::StorageType::Flat:
- return (char*) region->flat_data()
.data()
+ offset;
+ return (char*) region->flat_data() + offset;
case simgrid::mc::StorageType::Chunked:
{
case simgrid::mc::StorageType::Chunked:
{
@@
-257,7
+258,7
@@
void* MC_region_read_pointer(mc_mem_region_t region, const void* addr)
SG_END_DECL()
SG_END_DECL()
-XBT_
INTERNAL
int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
+XBT_
PRIVATE
int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
std::vector<s_mc_heap_ignore_region_t>* i1,
std::vector<s_mc_heap_ignore_region_t>* i2);
std::vector<s_mc_heap_ignore_region_t>* i1,
std::vector<s_mc_heap_ignore_region_t>* i2);