WIP change mutability requirement on poll

tokio-rs · Apr 29, 2016 · 0bc141c · 0bc141c
1 parent 1a89cb8
commit 0bc141c
Show file tree

Hide file tree

Showing 17 changed files with 112 additions and 102 deletions.
diff --git a/src/event_loop.rs b/src/event_loop.rs
@@ -107,7 +107,7 @@ impl<H: Handler> EventLoop<H> {
 
  fn configured(config: Config) -> io::Result<EventLoop<H>> {
  // Create the IO poller
- let mut poll = try!(Poll::new());
+ let poll = try!(Poll::new());
 
  // Create the timer
  let mut timer = Timer::new(

diff --git a/src/io.rs b/src/io.rs
@@ -6,11 +6,11 @@ pub use std::io::{Read, Write, Result, Error, ErrorKind};
 
 /// A value that may be registered with an `EventLoop`
 pub trait Evented {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> Result<()>;
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> Result<()>;
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> Result<()>;
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> Result<()>;
 
- fn deregister(&self, poll: &mut Poll) -> Result<()>;
+ fn deregister(&self, poll: &Poll) -> Result<()>;
 }
 
 pub trait TryRead {

diff --git a/src/net/tcp.rs b/src/net/tcp.rs
@@ -126,17 +126,17 @@ impl Write for TcpStream {
 }
 
 impl Evented for TcpStream {
- fn register(&self, poll: &mut Poll, token: Token,
+ fn register(&self, poll: &Poll, token: Token,
  interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token,
+ fn reregister(&self, poll: &Poll, token: Token,
  interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.sys.deregister(poll)
  }
 }
@@ -224,17 +224,17 @@ impl TcpListener {
 }
 
 impl Evented for TcpListener {
- fn register(&self, poll: &mut Poll, token: Token,
+ fn register(&self, poll: &Poll, token: Token,
  interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token,
+ fn reregister(&self, poll: &Poll, token: Token,
  interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.sys.deregister(poll)
  }
 }

diff --git a/src/net/udp.rs b/src/net/udp.rs
@@ -77,15 +77,15 @@ impl UdpSocket {
 }
 
 impl Evented for UdpSocket {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.sys.deregister(poll)
  }
 }

diff --git a/src/net/unix.rs b/src/net/unix.rs
@@ -40,15 +40,15 @@ impl UnixSocket {
 }
 
 impl Evented for UnixSocket {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.sys.deregister(poll)
  }
 }
@@ -132,15 +132,15 @@ impl Write for UnixStream {
 }
 
 impl Evented for UnixStream {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.sys.deregister(poll)
  }
 }
@@ -182,15 +182,15 @@ impl UnixListener {
 }
 
 impl Evented for UnixListener {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.sys.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.sys.deregister(poll)
  }
 }
@@ -238,15 +238,15 @@ impl<'a> Read for &'a PipeReader {
 }
 
 impl Evented for PipeReader {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.io.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.io.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.io.deregister(poll)
  }
 }
@@ -283,15 +283,15 @@ impl<'a> Write for &'a PipeWriter {
 }
 
 impl Evented for PipeWriter {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.io.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.io.reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.io.deregister(poll)
  }
 }

diff --git a/src/notify.rs b/src/notify.rs
@@ -187,16 +187,16 @@ impl<M> NotifyInner<M> {
 }
 
 impl<M> Evented for Notify<M> {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  assert!(opts.is_edge(), "awakener can only be registered using edge-triggered events");
  self.inner.awaken.register(poll, token, interest, opts)
  }
 
- fn reregister(&self, _: &mut Poll, _: Token, _: EventSet, _: PollOpt) -> io::Result<()> {
+ fn reregister(&self, _: &Poll, _: Token, _: EventSet, _: PollOpt) -> io::Result<()> {
  panic!("awakener is never reregistered");
  }
 
- fn deregister(&self, _: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, _: &Poll) -> io::Result<()> {
  panic!("awakener is never deregistered");
  }
 }

diff --git a/src/poll.rs b/src/poll.rs
@@ -180,19 +180,19 @@ impl Poll {
  // TODO: Allow config to be passed in
  let config = Config::default();
 
- let mut poll = Poll {
+ let poll = Poll {
  selector: try!(sys::Selector::new()),
  readiness_queue: try!(ReadinessQueue::new(&config)),
  events: sys::Events::new(),
  };
 
  // Register the notification wakeup FD with the IO poller
- // try!(poll.register(&poll.readiness_queue.inner().awakener, AWAKEN, EventSet::readable() | EventSet::writable() , PollOpt::edge()));
+ try!(poll.register(&poll.readiness_queue.inner().awakener, AWAKEN, EventSet::readable(), PollOpt::edge()));
 
  Ok(poll)
  }
 
- pub fn register<E: ?Sized>(&mut self, io: &E, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()>
+ pub fn register<E: ?Sized>(&self, io: &E, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()>
  where E: Evented
  {
  /*
@@ -208,7 +208,7 @@ impl Poll {
  Ok(())
  }
 
- pub fn reregister<E: ?Sized>(&mut self, io: &E, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()>
+ pub fn reregister<E: ?Sized>(&self, io: &E, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()>
  where E: Evented
  {
  trace!("registering with poller");
@@ -219,7 +219,7 @@ impl Poll {
  Ok(())
  }
 
- pub fn deregister<E: ?Sized>(&mut self, io: &E) -> io::Result<()>
+ pub fn deregister<E: ?Sized>(&self, io: &E) -> io::Result<()>
  where E: Evented
  {
  trace!("deregistering IO with poller");
@@ -303,10 +303,6 @@ pub fn selector(poll: &Poll) -> &sys::Selector {
  &poll.selector
 }
 
-pub fn selector_mut(poll: &mut Poll) -> &mut sys::Selector {
- &mut poll.selector
-}
-
 /*
  *
  * ===== Registration =====

diff --git a/src/sys/unix/awakener.rs b/src/sys/unix/awakener.rs
@@ -48,15 +48,15 @@ mod pipe {
  }
 
  impl Evented for Awakener {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.reader().register(poll, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
  self.reader().reregister(poll, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
  self.reader().deregister(poll)
  }
  }

diff --git a/src/sys/unix/eventedfd.rs b/src/sys/unix/eventedfd.rs
@@ -12,15 +12,15 @@ use std::os::unix::io::RawFd;
 pub struct EventedFd<'a>(pub &'a RawFd);
 
 impl<'a> Evented for EventedFd<'a> {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
- poll::selector_mut(poll).register(*self.0, token, interest, opts)
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ poll::selector(poll).register(*self.0, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
- poll::selector_mut(poll).reregister(*self.0, token, interest, opts)
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ poll::selector(poll).reregister(*self.0, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
- poll::selector_mut(poll).deregister(*self.0)
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
+ poll::selector(poll).deregister(*self.0)
  }
 }
diff --git a/src/sys/unix/io.rs b/src/sys/unix/io.rs
@@ -44,16 +44,16 @@ impl AsRawFd for Io {
 }
 
 impl Evented for Io {
- fn register(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
- poll::selector_mut(poll).register(self.fd, token, interest, opts)
+ fn register(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ poll::selector(poll).register(self.fd, token, interest, opts)
  }
 
- fn reregister(&self, poll: &mut Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
- poll::selector_mut(poll).reregister(self.fd, token, interest, opts)
+ fn reregister(&self, poll: &Poll, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
+ poll::selector(poll).reregister(self.fd, token, interest, opts)
  }
 
- fn deregister(&self, poll: &mut Poll) -> io::Result<()> {
- poll::selector_mut(poll).deregister(self.fd)
+ fn deregister(&self, poll: &Poll) -> io::Result<()> {
+ poll::selector(poll).deregister(self.fd)
  }
 }