a little more consistency

mojolicious · Jan 9, 2015 · 7d5f180 · 7d5f180
1 parent 67b2377
commit 7d5f180
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-5.72  2015-01-09
+5.72  2015-01-10
   - Improved Mojo::Reactor::EV to update the current time before starting a
     timer.
 

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -173,9 +173,10 @@ sub _accepting {
 }
 
 sub _id {
+  my $self = shift;
   my $id;
   do { $id = md5_sum 'c' . steady_time . rand 999 }
-    while $_[0]->{connections}{$id} || $_[0]->{acceptors}{$id};
+    while $self->{connections}{$id} || $self->{acceptors}{$id};
   return $id;
 }
 

diff --git a/lib/Mojo/Reactor/Poll.pm b/lib/Mojo/Reactor/Poll.pm
@@ -111,8 +111,9 @@ sub watch {
 }
 
 sub _id {
+  my $self = shift;
   my $id;
-  do { $id = md5_sum 't' . steady_time . rand 999 } while $_[0]->{timers}{$id};
+  do { $id = md5_sum 't' . steady_time . rand 999 } while $self->{timers}{$id};
   return $id;
 }
 
@@ -125,9 +126,12 @@ sub _sandbox {
 
 sub _timer {
   my ($self, $recurring, $after, $cb) = @_;
-  my $timer = $self->{timers}{my $id = $self->_id}
+
+  my $id    = $self->_id;
+  my $timer = $self->{timers}{$id}
     = {cb => $cb, after => $after, time => steady_time + $after};
   $timer->{recurring} = $after if $recurring;
+
   return $id;
 }