Iterate and remove nodes without container copy #11514

pull promag wants to merge 1 commits into bitcoin:master from promag:201710-node-iterate-and-erase changing 1 files +11 −10

promag commented at 2:08 PM on October 17, 2017: member

Removes the need forvNodesCopy and vNodesDisconnectedCopy.
Iterate and remove nodes without container copy 2964710164
fanquake added the label P2P on Oct 17, 2017
fanquake added the label Refactoring on Oct 17, 2017
promag force-pushed on Oct 17, 2017

in src/net.cpp:1174 in 2964710164

1168 | @@ -1171,14 +1169,15 @@ void CConnman::ThreadSocketHandler()
1169 |                      // hold in disconnected pool until all refs are released
1170 |                      pnode->Release();
1171 |                      vNodesDisconnected.push_back(pnode);
1172 | +                    continue;
1173 |                  }
1174 | +                it++;

laanwj commented at 2:16 PM on October 18, 2017:

Nit: ++it? (make no code difference probably, but I think it's good practice, and avoids later patches changing it around)

promag commented at 5:39 PM on October 18, 2017:

Ok.

theuni commented at 6:18 PM on October 18, 2017: member

This code goes away with #11227, which is in the process of being PR'd in batches. I have no objection to improvements here, but I'd prefer to avoid making changes that will only cause conflicts with deleted code.
laanwj commented at 9:12 AM on October 21, 2017: member

This code goes away with #11227, which is in the process of being PR'd in batches. I have no objection to improvements here, but I'd prefer to avoid making changes that will only cause conflicts with deleted code.

Good point, the review time is better spent elsewhere then.
promag commented at 12:46 AM on October 22, 2017: member

In that case.
promag closed this on Oct 22, 2017
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels