Skip to content

Fix get_data/get_client_filters livelock in tx and filter out protocols. #5

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
echennells wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix get_data/get_client_filters livelock in tx and filter out protocols. #5

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
5 changes: 4 additions & 1 deletion src/protocols/protocol_filter_out_70015.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,11 @@ bool protocol_filter_out_70015::handle_receive_get_filters(const code& ec,
return false;
}

// Post send and desubscribe. Posting prevents a synchronous completion
// (an empty ancestry) from resubscribing re-entrantly within the channel
// subscriber notification.
span<milliseconds>(events::ancestry_msecs, start);
send_filter(error::success, ancestry);
POST(send_filter, error::success, ancestry);
return false;
}

Expand Down
7 changes: 4 additions & 3 deletions src/protocols/protocol_transaction_out_106.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,10 @@ bool protocol_transaction_out_106::handle_receive_get_data(const code& ec,
if (stopped(ec))
return false;

// Send and desubscribe.
send_transaction(error::success, zero, message);
// Post send and desubscribe. Posting prevents a synchronous completion
// (a get_data with no transaction items) from resubscribing re-entrantly
// within the channel subscriber notification.
POST(send_transaction, error::success, zero, message);
return false;
}

Expand All @@ -175,7 +177,6 @@ void protocol_transaction_out_106::send_transaction(const code& ec,
if (message->items.at(index).is_transaction_type())
break;

// BUGBUG: registration race.
if (index >= message->items.size())
{
// Complete, resubscribe to transaction requests.
Expand Down
Loading