Skip to content

Faster opening of masternode connections #3375

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
codablock merged 1 commit into from
Mar 26, 2020
Merged

Faster opening of masternode connections #3375

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/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,11 +2102,18 @@ void CConnman::ThreadOpenMasternodeConnections()

auto& chainParams = Params();

bool didConnect = false;
while (!interruptNet)
{
if (!interruptNet.sleep_for(std::chrono::milliseconds(1000)))
int sleepTime = 1000;
if (didConnect) {
sleepTime = 100;
}

@PastaPastaPasta PastaPastaPasta Mar 24, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be, sleepTime = didConnect ? 100 : 1000;

@codablock codablock Mar 25, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, I'm not a fan of the ternary operator. It's horrible to read and understand.

if (!interruptNet.sleep_for(std::chrono::milliseconds(sleepTime)))

@PastaPastaPasta PastaPastaPasta Mar 24, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same line or brackets

@codablock codablock Mar 25, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not in the scope of this PR

@PastaPastaPasta PastaPastaPasta Mar 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really out of scope since you changed 1000 to sleepTime, but this is non-blocking.

return;

didConnect = false;

std::set<CService> connectedNodes;
std::set<uint256> connectedProRegTxHashes;
ForEachNode([&](const CNode* pnode) {
Expand Down Expand Up @@ -2170,6 +2177,8 @@ void CConnman::ThreadOpenMasternodeConnections()
continue;
}

didConnect = true;

mmetaman.GetMetaInfo(connectToDmn->proTxHash)->SetLastOutboundAttempt(nANow);

OpenMasternodeConnection(CAddress(connectToDmn->pdmnState->addr, NODE_NETWORK));
Expand Down