Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-22 19:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed a deadlock on shutdown

Browse source
This commit is contained in:
SChernykh 2024-02-18 17:46:47 +01:00
parent 785aaec4c3
commit 6f22dfca11
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/merge_mining_client_tari.cpp
View file

@ -93,7 +93,10 @@ MergeMiningClientTari::~MergeMiningClientTari()
LOGINFO(1, "stopping"); LOGINFO(1, "stopping");
m_workerStop.exchange(1); m_workerStop.exchange(1);
uv_cond_signal(&m_workerCond); {
MutexLock lock(m_workerLock);
uv_cond_signal(&m_workerCond);
}
uv_thread_join(&m_worker); uv_thread_join(&m_worker);
m_server->shutdown_tcp(); m_server->shutdown_tcp();
@ -137,7 +140,11 @@ void MergeMiningClientTari::run()
{ {
LOGINFO(1, "worker thread ready"); LOGINFO(1, "worker thread ready");
do { using namespace std::chrono;
for (;;) {
const auto t1 = high_resolution_clock::now();
MutexLock lock(m_workerLock); MutexLock lock(m_workerLock);
LOGINFO(6, "Getting new block template from Tari node"); LOGINFO(6, "Getting new block template from Tari node");
@ -179,7 +186,17 @@ void MergeMiningClientTari::run()
} }
LOGINFO(6, "Tari height = " << response2.block().header().height()); LOGINFO(6, "Tari height = " << response2.block().header().height());
} while ((uv_cond_timedwait(&m_workerCond, &m_workerLock, 500'000'000) == UV_ETIMEDOUT) && (m_workerStop.load() == 0));
if (m_workerStop.load() != 0) {
return;
}
const int64_t timeout = std::max<int64_t>(500'000'000 - duration_cast<nanoseconds>(high_resolution_clock::now() - t1).count(), 1'000'000);
if (uv_cond_timedwait(&m_workerCond, &m_workerLock, timeout) != UV_ETIMEDOUT) {
return;
}
}
} }
// TariServer and TariClient are simply a proxy from a localhost TCP port to the external Tari node // TariServer and TariClient are simply a proxy from a localhost TCP port to the external Tari node
@ -293,6 +310,8 @@ bool MergeMiningClientTari::TariClient::on_connect()
return server->connect_upstream(this); return server->connect_upstream(this);
} }
else { else {
// The outgoing connection is ready now
// Check if the incoming connection (downstream) has already sent something that needs to be relayed
TariClient* downstream = m_pairedClient; TariClient* downstream = m_pairedClient;
downstream->m_pairedClient = this; downstream->m_pairedClient = this;
downstream->m_pairedClientSavedResetCounter = m_resetCounter; downstream->m_pairedClientSavedResetCounter = m_resetCounter;

2
src/side_chain.cpp
View file

@ -2346,8 +2346,8 @@ void SideChain::launch_precalc(const PoolBlock* block)
{ {
MutexLock lock2(m_precalcJobsMutex); MutexLock lock2(m_precalcJobsMutex);
m_precalcJobs.push_back(job); m_precalcJobs.push_back(job);
uv_cond_signal(&m_precalcJobsCond);
} }
uv_cond_signal(&m_precalcJobsCond);
} }
} }
} }