Skip to content

shared_recv updates #7

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

Open
angainor wants to merge 1 commit into
base: shared_request
Choose a base branch
from
Open

shared_recv updates #7

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
11 changes: 10 additions & 1 deletion src/ucx/communicator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,16 @@ class communicator_impl : public communicator_base<communicator_impl>
}
else
{
while (ucp_worker_progress(m_recv_worker->get())) {}
for (unsigned int i=0; i<10; ++i)
{
if (m_mutex.try_lock())
{
auto p = ucp_worker_progress(m_recv_worker->get());
m_mutex.unlock();
if (!p) break;
}
}
//while (ucp_worker_progress(m_recv_worker->get())) {}
}
// work through ready recv callbacks, which were pushed to the queue by other threads
// (including this thread)
Expand Down
4 changes: 3 additions & 1 deletion src/ucx/context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class context_impl : public context_base
if (m_thread_safe) m_mutex.lock();
ucp_request_cancel(m_worker->get(), s->m_ucx_ptr);
while (ucp_worker_progress(m_worker->get())) {}
if (m_thread_safe) m_mutex.unlock();

// check whether the cancelled callback was enqueued by consuming all queued cancelled
// callbacks and putting them in a temporary vector
bool found = false;
Expand All @@ -212,6 +212,8 @@ class context_impl : public context_base
for (auto x : m_cancel_recv_req_vec)
while (!m_cancel_recv_req_queue.push(x)) {}

if (m_thread_safe) m_mutex.unlock();

// delete callback here if it was actually cancelled
if (found)
{
Expand Down