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] Remove Process:status_
[simgrid.git]
/
src
/
mc
/
Process.hpp
diff --git
a/src/mc/Process.hpp
b/src/mc/Process.hpp
index
819e8ec
..
5d50961
100644
(file)
--- a/
src/mc/Process.hpp
+++ b/
src/mc/Process.hpp
@@
-21,20
+21,23
@@
#include <xbt/mmalloc.h>
#ifdef HAVE_MC
#include <xbt/mmalloc.h>
#ifdef HAVE_MC
-#include "xbt/mmalloc/mmprivate.h"
+#include "
src/
xbt/mmalloc/mmprivate.h"
#endif
#include <simgrid/simix.h>
#endif
#include <simgrid/simix.h>
-#include "simix/popping_private.h"
-#include "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 "mc_forward.hpp"
#include "mc_base.h"
#include "mc_mmalloc.h" // std_heap
-#include "mc_memory_map.h"
#include "AddressSpace.hpp"
#include "mc_protocol.h"
#include "AddressSpace.hpp"
#include "mc_protocol.h"
+#include "ObjectInformation.hpp"
+
// Those flags are used to track down which cached information
// is still up to date and which information needs to be updated.
typedef int mc_process_cache_flags_t;
// Those flags are used to track down which cached information
// is still up to date and which information needs to be updated.
typedef int mc_process_cache_flags_t;
@@
-58,6
+61,11
@@
public:
Process(pid_t pid, int sockfd);
~Process();
Process(pid_t pid, int sockfd);
~Process();
+ Process(Process const&) = delete;
+ Process(Process &&) = delete;
+ Process& operator=(Process const&) = delete;
+ Process& operator=(Process &&) = delete;
+
// Read memory:
const void* read_bytes(void* buffer, std::size_t size,
remote_ptr<void> address, int process_index = ProcessIndexAny,
// Read memory:
const void* read_bytes(void* buffer, std::size_t size,
remote_ptr<void> address, int process_index = ProcessIndexAny,
@@
-89,13
+97,13
@@
public:
{
if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
this->refresh_heap();
{
if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
this->refresh_heap();
- return this->heap;
+ return this->heap
.get()
;
}
malloc_info* get_malloc_info()
{
if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_MALLOC_INFO))
this->refresh_malloc_info();
}
malloc_info* get_malloc_info()
{
if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_MALLOC_INFO))
this->refresh_malloc_info();
- return this->heap_info;
+ return this->heap_info
.data()
;
}
std::vector<IgnoredRegion> const& ignored_regions() const
}
std::vector<IgnoredRegion> const& ignored_regions() const
@@
-116,17
+124,11
@@
public:
return running_;
}
return running_;
}
- void terminate(
int status
)
+ void terminate()
{
{
- status_ = status;
running_ = false;
}
running_ = false;
}
- int status() const
- {
- return status_;
- }
-
template<class M>
typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, int >::type
send_message(M const& m)
template<class M>
typename std::enable_if< std::is_class<M>::value && std::is_trivial<M>::value, int >::type
send_message(M const& m)
@@
-149,6
+151,16
@@
public:
void reset_soft_dirty();
void read_pagemap(uint64_t* pagemap, size_t start_page, size_t page_count);
void reset_soft_dirty();
void read_pagemap(uint64_t* pagemap, size_t start_page, size_t page_count);
+ bool privatized(ObjectInformation const& info) const
+ {
+ return privatized_ && info.executable();
+ }
+ bool privatized() const
+ {
+ return privatized_;
+ }
+ void privatized(bool privatized) { privatized_ = privatized; }
+
private:
void init_memory_map_info();
void refresh_heap();
private:
void init_memory_map_info();
void refresh_heap();
@@
-156,14
+168,14
@@
private:
private:
pid_t pid_;
int socket_;
private:
pid_t pid_;
int socket_;
- int status_;
bool running_;
bool running_;
- std::vector<VmMap> memory_map_;
+ std::vector<
simgrid::xbt::
VmMap> memory_map_;
remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
int memory_file;
std::vector<IgnoredRegion> ignored_regions_;
int clear_refs_fd_;
int pagemap_fd_;
remote_ptr<void> maestro_stack_start_, maestro_stack_end_;
int memory_file;
std::vector<IgnoredRegion> ignored_regions_;
int clear_refs_fd_;
int pagemap_fd_;
+ bool privatized_;
public: // object info
// TODO, make private (first, objectify simgrid::mc::ObjectInformation*)
std::vector<std::shared_ptr<simgrid::mc::ObjectInformation>> object_infos;
public: // object info
// TODO, make private (first, objectify simgrid::mc::ObjectInformation*)
std::vector<std::shared_ptr<simgrid::mc::ObjectInformation>> object_infos;
@@
-195,7
+207,7
@@
public: // Copies of MCed SMX data structures
* This is not used if the process is the current one:
* use `get_heap_info()` in order to use it.
*/
* This is not used if the process is the current one:
* use `get_heap_info()` in order to use it.
*/
-
xbt_mheap_t
heap;
+
std::unique_ptr<s_xbt_mheap_t>
heap;
/** Copy of the allocation info structure
*
/** Copy of the allocation info structure
*
@@
-203,7
+215,7
@@
public: // Copies of MCed SMX data structures
* This is not used if the process is the current one:
* use `get_malloc_info()` in order to use it.
*/
* This is not used if the process is the current one:
* use `get_malloc_info()` in order to use it.
*/
-
malloc_info*
heap_info;
+
std::vector<malloc_info>
heap_info;
public: // Libunwind-data
public: // Libunwind-data