Skip to content

Fix connection manager #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
everoddandeven merged 1 commit into from
Apr 16, 2026
Merged

Fix connection manager #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/cpp/common/py_monero_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void PyThreadPoller::set_is_polling(bool is_polling) {
m_poll_cv.notify_one();
// TODO: in emscripten, m_sync_cv.notify_one() returns without waiting, so sleep; bug in emscripten upstream llvm?
std::this_thread::sleep_for(std::chrono::milliseconds(1));
m_thread.join();
if (m_thread.joinable()) m_thread.join();
}
}
}
Expand All @@ -46,8 +46,7 @@ void PyThreadPoller::set_period_in_ms(uint64_t period_ms) {
}

void PyThreadPoller::run_poll_loop() {
if (m_poll_loop_running) return; // only run one loop at a time
m_poll_loop_running = true;
if (m_poll_loop_running.exchange(true)) return; // only run one loop at a time

// start pool loop thread
// TODO: use global threadpool, background sync wasm wallet in c++ thread
Expand All @@ -63,11 +62,11 @@ void PyThreadPoller::run_poll_loop() {
if (m_is_polling) {
boost::mutex::scoped_lock lock(m_polling_mutex);
boost::posix_time::milliseconds wait_for_ms(m_poll_period_ms.load());
m_poll_cv.timed_wait(lock, wait_for_ms);
m_poll_cv.timed_wait(lock, wait_for_ms, [&]() { return !m_is_polling; });
}
}

m_poll_loop_running = false;
m_poll_loop_running.exchange(false);
});
}

Expand Down Expand Up @@ -725,7 +724,7 @@ void PyMoneroConnectionManager::check_connection() {
std::shared_ptr<PyMoneroRpcConnection> connection = get_connection();
if (connection != nullptr) {
// check current connection
if (connection->check_connection(m_timeout)) connection_changed = true;
if (connection->check_connection(m_timeout.load())) connection_changed = true;
std::vector<std::shared_ptr<PyMoneroRpcConnection>> cons;
cons.push_back(connection);
process_responses(cons);
Expand Down Expand Up @@ -794,7 +793,7 @@ std::shared_ptr<PyMoneroRpcConnection> PyMoneroConnectionManager::get_best_avail
remaining++;

boost::asio::post(pool, [&, connection]() {
connection->check_connection(m_timeout);
connection->check_connection(m_timeout.load());

{
boost::lock_guard<boost::mutex> lock(mtx);
Expand Down Expand Up @@ -939,7 +938,7 @@ bool PyMoneroConnectionManager::check_connections(const std::vector<std::shared_
num_tasks++;

boost::asio::post(pool, [this, connection, &result_mutex, &result_cv, &completed]() {
bool change = connection->check_connection(m_timeout);
bool change = connection->check_connection(m_timeout.load());

if (change && connection == get_connection()) {
on_connection_changed(connection);
Expand Down
5 changes: 2 additions & 3 deletions src/cpp/common/py_monero_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,9 +775,8 @@ class PyMoneroConnectionManager : public PyThreadPoller {
std::shared_ptr<PyMoneroRpcConnection> m_current_connection;
std::set<std::shared_ptr<PyMoneroRpcConnection>> m_excluded_connections;

bool m_is_polling = false;
bool m_auto_switch = true;
uint64_t m_timeout = 5000;
std::atomic<bool> m_auto_switch = true;
std::atomic<uint64_t> m_timeout = 5000;

std::map<std::shared_ptr<PyMoneroRpcConnection>, std::vector<boost::optional<long>>> m_response_times;

Expand Down
Loading