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
Define master_socket_name only once, and embed it with the request to fork.
[simgrid.git]
/
src
/
mc
/
remote
/
CheckerSide.hpp
diff --git
a/src/mc/remote/CheckerSide.hpp
b/src/mc/remote/CheckerSide.hpp
index
17fb33c
..
d89f712
100644
(file)
--- a/
src/mc/remote/CheckerSide.hpp
+++ b/
src/mc/remote/CheckerSide.hpp
@@
-21,17
+21,24
@@
class CheckerSide {
event* socket_event_;
event* signal_event_;
std::unique_ptr<event_base, decltype(&event_base_free)> base_{nullptr, &event_base_free};
event* socket_event_;
event* signal_event_;
std::unique_ptr<event_base, decltype(&event_base_free)> base_{nullptr, &event_base_free};
+#if SIMGRID_HAVE_STATEFUL_MC
std::unique_ptr<RemoteProcessMemory> remote_memory_;
std::unique_ptr<RemoteProcessMemory> remote_memory_;
+#endif
Channel channel_;
bool running_ = false;
pid_t pid_;
Channel channel_;
bool running_ = false;
pid_t pid_;
+ // When forking (no meminfo), the real app is our grandchild. In this case,
+ // child_checker_ is a CheckerSide to our child that can waitpid our grandchild on our behalf
+ CheckerSide* child_checker_ = nullptr;
- void setup_events(); // Part of the initialization
+ void setup_events(
bool socket_only
); // Part of the initialization
void clear_memory_cache();
void clear_memory_cache();
- void handle_waitpid();
+ void handle_dead_child(int status); // Launched when the dying child is the PID we follow
+ void handle_waitpid(); // Launched when receiving a sigchild
public:
public:
+ explicit CheckerSide(int socket, CheckerSide* child_checker);
explicit CheckerSide(const std::vector<char*>& args, bool need_memory_introspection);
~CheckerSide();
explicit CheckerSide(const std::vector<char*>& args, bool need_memory_introspection);
~CheckerSide();
@@
-49,6
+56,9
@@
public:
void break_loop() const;
void wait_for_requests();
void break_loop() const;
void wait_for_requests();
+ /* Create a new CheckerSide by forking the currently existing one, and connect it through the master_socket */
+ std::unique_ptr<CheckerSide> clone(int master_socket, const std::string& master_socket_name);
+
/** Ask the application to run post-mortem analysis, and maybe to stop ASAP */
void finalize(bool terminate_asap = false);
/** Ask the application to run post-mortem analysis, and maybe to stop ASAP */
void finalize(bool terminate_asap = false);
@@
-56,7
+66,9
@@
public:
pid_t get_pid() const { return pid_; }
bool running() const { return running_; }
void terminate() { running_ = false; }
pid_t get_pid() const { return pid_; }
bool running() const { return running_; }
void terminate() { running_ = false; }
+#if SIMGRID_HAVE_STATEFUL_MC
RemoteProcessMemory* get_remote_memory() { return remote_memory_.get(); }
RemoteProcessMemory* get_remote_memory() { return remote_memory_.get(); }
+#endif
};
} // namespace simgrid::mc
};
} // namespace simgrid::mc