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
[mc] Move s_local_variable in mc_snapshot.h
[simgrid.git]
/
src
/
mc
/
mc_snapshot.h
diff --git
a/src/mc/mc_snapshot.h
b/src/mc/mc_snapshot.h
index
b860dd9
..
30c9e1c
100644
(file)
--- a/
src/mc/mc_snapshot.h
+++ b/
src/mc/mc_snapshot.h
@@
-12,6
+12,7
@@
#include <vector>
#include <set>
#include <vector>
#include <set>
+#include <memory>
#include <simgrid_config.h>
#include "../xbt/mmalloc/mmprivate.h"
#include <simgrid_config.h>
#include "../xbt/mmalloc/mmprivate.h"
@@
-84,8
+85,7
@@
XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region(
* */
typedef struct s_mc_snapshot_ignored_data {
void* start;
* */
typedef struct s_mc_snapshot_ignored_data {
void* start;
- size_t size;
- void* data;
+ std::vector<char> data;
} s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t;
typedef struct s_fd_infos{
} s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t;
typedef struct s_fd_infos{
@@
-109,6
+109,15
@@
typedef struct s_mc_stack_frame {
unw_cursor_t unw_cursor;
} s_mc_stack_frame_t, *mc_stack_frame_t;
unw_cursor_t unw_cursor;
} s_mc_stack_frame_t, *mc_stack_frame_t;
+typedef struct s_local_variable{
+ dw_frame_t subprogram;
+ unsigned long ip;
+ char *name;
+ dw_type_t type;
+ void *address;
+ int region;
+} s_local_variable_t, *local_variable_t;
+
typedef struct s_mc_snapshot_stack{
xbt_dynar_t local_variables;
mc_unw_context_t context;
typedef struct s_mc_snapshot_stack{
xbt_dynar_t local_variables;
mc_unw_context_t context;
@@
-141,15
+150,14
@@
public: // To be private
mc_process_t process;
int num_state;
size_t heap_bytes_used;
mc_process_t process;
int num_state;
size_t heap_bytes_used;
- mc_mem_region_t* snapshot_regions;
- size_t snapshot_regions_count;
+ std::vector<std::unique_ptr<s_mc_mem_region_t>> snapshot_regions;
std::set<pid_t> enabled_processes;
int privatization_index;
std::vector<size_t> stack_sizes;
xbt_dynar_t stacks;
std::set<pid_t> enabled_processes;
int privatization_index;
std::vector<size_t> stack_sizes;
xbt_dynar_t stacks;
-
xbt_dynar_t
to_ignore;
+
std::vector<s_mc_heap_ignore_region_t>
to_ignore;
uint64_t hash;
uint64_t hash;
-
xbt_dynar_t
ignored_data;
+
std::vector<s_mc_snapshot_ignored_data>
ignored_data;
std::vector<s_fd_infos_t> current_fds;
};
std::vector<s_fd_infos_t> current_fds;
};
@@
-249,4
+257,8
@@
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,
+ std::vector<s_mc_heap_ignore_region_t>* i1,
+ std::vector<s_mc_heap_ignore_region_t>* i2);
+
#endif
#endif