grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing warnings

Browse Source
This commit is contained in:
Tomasz Drwięga
2016-06-03 11:36:30 +02:00
parent ae2deaaf72
commit 3905717d5d
11 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
util/src/network/discovery.rs
View File

@@ -494,10 +494,11 @@ impl Discovery {
}
pub fn update_registration<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
let mut registration = EventSet::readable();
if !self.send_queue.is_empty() {
registration = registration | EventSet::writable();
}
let registration = if !self.send_queue.is_empty() {
EventSet::readable() | EventSet::writable()
} else {
EventSet::readable()
};
event_loop.reregister(&self.udp_socket, Token(self.token), registration, PollOpt::edge()).expect("Error reregistering UDP socket");
Ok(())
}

33
util/src/network/host.rs
View File

@@ -712,28 +712,25 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
let mut failure_id = None;
let mut deregister = false;
let mut expired_session = None;
match token {
FIRST_SESSION ... LAST_SESSION => {
let sessions = self.sessions.write().unwrap();
if let Some(session) = sessions.get(token).cloned() {
expired_session = Some(session.clone());
let mut s = session.lock().unwrap();
if !s.expired() {
if s.is_ready() {
for (p, _) in self.handlers.read().unwrap().iter() {
if s.have_capability(p) {
self.num_sessions.fetch_sub(1, AtomicOrdering::SeqCst);
to_disconnect.push(p);
}
if let FIRST_SESSION ... LAST_SESSION = token {
let sessions = self.sessions.write().unwrap();
if let Some(session) = sessions.get(token).cloned() {
expired_session = Some(session.clone());
let mut s = session.lock().unwrap();
if !s.expired() {
if s.is_ready() {
for (p, _) in self.handlers.read().unwrap().iter() {
if s.have_capability(p) {
self.num_sessions.fetch_sub(1, AtomicOrdering::SeqCst);
to_disconnect.push(p);
}
}
s.set_expired();
failure_id = s.id().cloned();
}
deregister = remote || s.done();
s.set_expired();
failure_id = s.id().cloned();
}
},
_ => {},
deregister = remote || s.done();
}
}
if let Some(id) = failure_id {
if remote {