aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-12 14:09:30 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-12 19:17:55 +0000
commit3b04e2e3d4d0b50e5e109b3e6019a725ff22b793 (patch)
tree55cbbe256e97c39d4667a1738bf19d63df7a624d /src
parentMerge pull request #4544 (diff)
downloadmonero-3b04e2e3d4d0b50e5e109b3e6019a725ff22b793.tar.xz
daemon: do not run complex code in a signal handler
instead, delegate the work to a one off thread and notify it from the signal handler
Diffstat (limited to 'src')
-rw-r--r--src/daemon/daemon.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index ea24e32eb..f53649518 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -136,7 +136,14 @@ bool t_daemon::run(bool interactive)
{
throw std::runtime_error{"Can't run stopped daemon"};
}
- tools::signal_handler::install(std::bind(&daemonize::t_daemon::stop_p2p, this));
+
+ std::atomic<bool> stop(false);
+ boost::thread([&stop, this] {
+ while (!stop)
+ epee::misc_utils::sleep_no_w(100);
+ this->stop_p2p();
+ }).detach();
+ tools::signal_handler::install([&stop](int){ stop = true; });
try
{