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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
Process.hpp
diff --git
a/src/mc/Process.hpp
b/src/mc/Process.hpp
index 8780e3cc5a64479b5c150dafa896e283f45a4498..4ab4e06ef9f5a15fd93b11604bb149818996fa46 100644
(file)
--- a/
src/mc/Process.hpp
+++ b/
src/mc/Process.hpp
@@
-7,17
+7,19
@@
#ifndef SIMGRID_MC_PROCESS_H
#define SIMGRID_MC_PROCESS_H
#ifndef SIMGRID_MC_PROCESS_H
#define SIMGRID_MC_PROCESS_H
-#include <type_traits>
-
-#include <sys/types.h>
+#include <cstdint>
+#include <cstddef>
+#include <type_traits>
#include <vector>
#include <memory>
#include <vector>
#include <memory>
-#include "simgrid_config.h"
#include <sys/types.h>
#include <sys/types.h>
+#include <simgrid_config.h>
+
#include <xbt/base.h>
#include <xbt/base.h>
+#include <xbt/dynar.h>
#include <xbt/mmalloc.h>
#ifdef HAVE_MC
#include <xbt/mmalloc.h>
#ifdef HAVE_MC
@@
-32,7
+34,6
@@
#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_base.h"
#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_base.h"
-#include "src/mc/mc_mmalloc.h" // std_heap
#include "src/mc/AddressSpace.hpp"
#include "src/mc/mc_protocol.h"
#include "src/mc/ObjectInformation.hpp"
#include "src/mc/AddressSpace.hpp"
#include "src/mc/mc_protocol.h"
#include "src/mc/ObjectInformation.hpp"
@@
-50,14
+51,14
@@
namespace mc {
struct IgnoredRegion {
std::uint64_t addr;
struct IgnoredRegion {
std::uint64_t addr;
- size_t size;
+ s
td::s
ize_t size;
};
struct IgnoredHeapRegion {
int block;
int fragment;
void *address;
};
struct IgnoredHeapRegion {
int block;
int fragment;
void *address;
- size_t size;
+ s
td::s
ize_t size;
};
/** Representation of a process
};
/** Representation of a process
@@
-66,6
+67,7
@@
class Process final : public AddressSpace {
public:
Process(pid_t pid, int sockfd);
~Process();
public:
Process(pid_t pid, int sockfd);
~Process();
+ void init();
Process(Process const&) = delete;
Process(Process &&) = delete;
Process(Process const&) = delete;
Process(Process &&) = delete;
@@
-191,22
+193,24
@@
public:
void unignore_heap(void *address, size_t size);
void ignore_local_variable(const char *var_name, const char *frame_name);
void unignore_heap(void *address, size_t size);
void ignore_local_variable(const char *var_name, const char *frame_name);
+ int socket() { return socket_; }
private:
void init_memory_map_info();
void refresh_heap();
void refresh_malloc_info();
private:
void init_memory_map_info();
void refresh_heap();
void refresh_malloc_info();
+
private:
private:
- pid_t pid_;
- int socket_;
- bool running_;
+ pid_t pid_
= -1
;
+ int socket_
= -1
;
+ bool running_
= false
;
std::vector<simgrid::xbt::VmMap> memory_map_;
remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
std::vector<simgrid::xbt::VmMap> memory_map_;
remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
- int memory_file;
+ int memory_file
= -1
;
std::vector<IgnoredRegion> ignored_regions_;
std::vector<IgnoredRegion> ignored_regions_;
- int clear_refs_fd_;
- int pagemap_fd_;
- bool privatized_;
+ int clear_refs_fd_
= -1
;
+ int pagemap_fd_
= -1
;
+ bool privatized_
= false
;
std::vector<s_stack_region_t> stack_areas_;
std::vector<IgnoredHeapRegion> ignored_heap_;
std::vector<s_stack_region_t> stack_areas_;
std::vector<IgnoredHeapRegion> ignored_heap_;
@@
-221,16
+225,16
@@
public: // Copies of MCed SMX data structures
*
* See mc_smx.c.
*/
*
* See mc_smx.c.
*/
- xbt_dynar_t smx_process_infos;
+ xbt_dynar_t smx_process_infos
= nullptr
;
/** Copy of `simix_global->process_to_destroy`
*
* See mc_smx.c.
*/
/** Copy of `simix_global->process_to_destroy`
*
* See mc_smx.c.
*/
- xbt_dynar_t smx_old_process_infos;
+ xbt_dynar_t smx_old_process_infos
= nullptr
;
/** State of the cache (which variables are up to date) */
/** State of the cache (which variables are up to date) */
- mc_process_cache_flags_t cache_flags;
+ mc_process_cache_flags_t cache_flags
= MC_PROCESS_CACHE_FLAG_NONE
;
/** Address of the heap structure in the MCed process. */
void* heap_address;
/** Address of the heap structure in the MCed process. */
void* heap_address;