fixed recursion bug in Mojo::Reactor::EV where timers could run more …

…than once
mojolicious · Nov 16, 2013 · 532ed95 · 532ed95
1 parent 983db7f
commit 532ed95
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 
-4.58  2013-11-14
+4.58  2013-11-16
   - Improved IIS and WebSphere compatibility of Mojo::Message::Request.
+  - Fixed recursion bug in Mojo::Reactor::EV where timers could run more than
+    once.
 
 4.57  2013-11-11
   - Improved compatibility with IO::Socket::SSL 1.957.

diff --git a/lib/Mojo/Reactor/EV.pm b/lib/Mojo/Reactor/EV.pm
@@ -62,8 +62,9 @@ sub _timer {
   weaken $self;
   $self->{timers}{$id}{watcher} = EV::timer(
     $after => $after => sub {
-      $self->_sandbox("Timer $id", $self->{timers}{$id}{cb});
-      delete $self->{timers}{$id} unless $recurring;
+      my $timer = $self->{timers}{$id};
+      delete delete($self->{timers}{$id})->{watcher} unless $recurring;
+      $self->_sandbox("Timer $id", $timer->{cb});
     }
   );
 

diff --git a/t/mojo/reactor_ev.t b/t/mojo/reactor_ev.t
@@ -212,6 +212,13 @@ $reactor->timer(0 => sub { die "works!\n" });
 $reactor->start;
 like $err, qr/works!/, 'right error';
 
+# Recursion
+$timer   = undef;
+$reactor = $reactor->new;
+$reactor->timer(0 => sub { ++$timer and shift->one_tick });
+$reactor->one_tick;
+is $timer, 1, 'timer was triggered once';
+
 # Detection
 is(Mojo::Reactor->detect, 'Mojo::Reactor::EV', 'right class');
 

diff --git a/t/mojo/reactor_poll.t b/t/mojo/reactor_poll.t
@@ -210,6 +210,13 @@ $reactor->timer(0 => sub { die "works!\n" });
 $reactor->start;
 like $err, qr/works!/, 'right error';
 
+# Recursion
+$timer   = undef;
+$reactor = $reactor->new;
+$reactor->timer(0 => sub { ++$timer and shift->one_tick });
+$reactor->one_tick;
+is $timer, 1, 'timer was triggered once';
+
 # Detection
 is(Mojo::Reactor::Poll->detect, 'Mojo::Reactor::Poll', 'right class');