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
Coding style: camel case RemotePtr
[simgrid.git]
/
src
/
mc
/
Process.hpp
diff --git
a/src/mc/Process.hpp
b/src/mc/Process.hpp
index
0b47eac
..
62fad58
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
@@
-28,15
+30,13
@@
#include "src/simix/popping_private.h"
#include "src/simix/smx_private.h"
#include "src/simix/popping_private.h"
#include "src/simix/smx_private.h"
-#include "../xbt/memory_map.hpp"
-
-#include "mc_forward.hpp"
-#include "mc_base.h"
-#include "mc_mmalloc.h" // std_heap
-#include "AddressSpace.hpp"
-#include "mc_protocol.h"
+#include "src/xbt/memory_map.hpp"
-#include "ObjectInformation.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_base.h"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/ObjectInformation.hpp"
// Those flags are used to track down which cached information
// is still up to date and which information needs to be updated.
// Those flags are used to track down which cached information
// is still up to date and which information needs to be updated.
@@
-51,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
@@
-67,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;
@@
-75,8
+76,8
@@
public:
// Read memory:
const void* read_bytes(void* buffer, std::size_t size,
// Read memory:
const void* read_bytes(void* buffer, std::size_t size,
-
remote_p
tr<void> address, int process_index = ProcessIndexAny,
- Read
Mode mode = Normal
) const override;
+
RemoteP
tr<void> address, int process_index = ProcessIndexAny,
+ Read
Options options = ReadOptions::none()
) const override;
void read_variable(const char* name, void* target, size_t size) const;
template<class T>
T read_variable(const char *name) const
void read_variable(const char* name, void* target, size_t size) const;
template<class T>
T read_variable(const char *name) const
@@
-86,17
+87,17
@@
public:
read_variable(name, &res, sizeof(T));
return res;
}
read_variable(name, &res, sizeof(T));
return res;
}
- char* read_string(
remote_p
tr<void> address) const;
+ char* read_string(
RemoteP
tr<void> address) const;
// Write memory:
// Write memory:
- void write_bytes(const void* buffer, size_t len,
remote_p
tr<void> address);
- void clear_bytes(
remote_p
tr<void> address, size_t len);
+ void write_bytes(const void* buffer, size_t len,
RemoteP
tr<void> address);
+ void clear_bytes(
RemoteP
tr<void> address, size_t len);
// Debug information:
// Debug information:
- std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info(
remote_p
tr<void> addr) const;
- std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_exec(
remote_p
tr<void> addr) const;
- std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_rw(
remote_p
tr<void> addr) const;
- simgrid::mc::Frame* find_function(
remote_p
tr<void> ip) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info(
RemoteP
tr<void> addr) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_exec(
RemoteP
tr<void> addr) const;
+ std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_rw(
RemoteP
tr<void> addr) const;
+ simgrid::mc::Frame* find_function(
RemoteP
tr<void> ip) const;
simgrid::mc::Variable* find_variable(const char* name) const;
// Heap access:
simgrid::mc::Variable* find_variable(const char* name) const;
// Heap access:
@@
-121,7
+122,7
@@
public:
pid_t pid() const { return pid_; }
pid_t pid() const { return pid_; }
- bool in_maestro_stack(
remote_p
tr<void> p) const
+ bool in_maestro_stack(
RemoteP
tr<void> p) const
{
return p >= this->maestro_stack_start_ && p < this->maestro_stack_end_;
}
{
return p >= this->maestro_stack_start_ && p < this->maestro_stack_end_;
}
@@
-192,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_;
std::vector<simgrid::xbt::VmMap> memory_map_;
-
remote_p
tr<void> maestro_stack_start_, maestro_stack_end_;
- int memory_file;
+
RemoteP
tr<void> maestro_stack_start_, maestro_stack_end_;
+ 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_;
@@
-222,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;