Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fix atomicity violation in network-devp2p #11277

Merged
merged 1 commit into from Dec 10, 2019
Merged

Fix atomicity violation in network-devp2p #11277

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions util/network-devp2p/src/connection.rs
View file
Open in desktop
Expand Up @@ -220,14 +220,13 @@ impl Connection {

/// Register this connection with the IO event loop.
pub fn register_socket<Host: Handler>(&self, reg: Token, event_loop: &mut EventLoop<Host>) -> io::Result<()> {
if self.registered.load(AtomicOrdering::SeqCst) {
if self.registered.compare_and_swap(false, true, AtomicOrdering::SeqCst) {
return Ok(());
}
trace!(target: "network", "connection register; token={:?}", reg);
if let Err(e) = event_loop.register(&self.socket, reg, self.interest, PollOpt::edge() /* | PollOpt::oneshot() */) { // TODO: oneshot is broken on windows
trace!(target: "network", "Failed to register {:?}, {:?}", reg, e);
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wonder why we don't return here (and set self.registered back to false).

Copy link
Collaborator

Choose a reason for hiding this comment

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

I wonder the same, @arkpar cfb8671#diff-c378e114f762560f980403b3e66392dcL140-L142?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@arkpar I'll go ahead and merge this now, but I'm still curious. :)

}
self.registered.store(true, AtomicOrdering::SeqCst);
Ok(())
}

Expand Down