improved Mojo::IOWatcher backend detection slightly

mojolicious · Oct 6, 2011 · 4c7a242 · 4c7a242
1 parent 100ab31
commit 4c7a242
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 27 deletions.
diff --git a/Changes b/Changes
@@ -6,6 +6,7 @@ This file documents the revision history for Perl extension Mojolicious.
         - Improved message parser performance slightly.
         - Improved Mojo::IOLoop to die if started twice.
         - Improved setuidgid in Mojo::Server::Daemon.
+        - Improved Mojo::IOWatcher backend detection slightly.
         - Improved documentation.
         - Improved tests.
         - Fixed many portability issues.

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -36,17 +36,6 @@ has timeout      => '0.025';
 # Ignore PIPE signal
 $SIG{PIPE} = 'IGNORE';
 
-sub new {
-  my $class = shift;
-
-  # Build new loop from singleton and inherit watcher
-  my $loop = $class->singleton;
-  my $self = $loop->SUPER::new(@_);
-  $self->iowatcher($loop->iowatcher->new);
-
-  return $self;
-}
-
 sub connect {
   my $self = shift;
   $self = $self->singleton unless ref $self;
@@ -513,12 +502,8 @@ dropped, defaults to C<3>.
 
 Low level event watcher, usually a L<Mojo::IOWatcher> or
 L<Mojo::IOWatcher::EV> object.
-Replacing the event watcher of the singleton loop makes all new loops use the
-same type of event watcher.
 Note that this attribute is EXPERIMENTAL and might change without warning!
 
-  Mojo::IOLoop->singleton->iowatcher(MyWatcher->new);
-
 =head2 C<max_accepts>
 
   my $max = $loop->max_accepts;
@@ -606,14 +591,6 @@ Note that a value of C<0> would make the loop non-blocking.
 L<Mojo::IOLoop> inherits all methods from L<Mojo::Base> and implements the
 following new ones.
 
-=head2 C<new>
-
-  my $loop = Mojo::IOLoop->new;
-
-Construct a new L<Mojo::IOLoop> object.
-Multiple of these will block each other, so use C<singleton> instead if
-possible.
-
 =head2 C<connect>
 
   my $id = Mojo::IOLoop->connect(

diff --git a/lib/Mojo/IOWatcher.pm b/lib/Mojo/IOWatcher.pm
@@ -33,7 +33,7 @@ sub cancel {
 
 sub detect {
   my $try = $ENV{MOJO_IOWATCHER} || 'Mojo::IOWatcher::EV';
-  return $try if eval "use $try; 1";
+  return $try if $try->can('new') || eval "use $try; 1";
   return 'Mojo::IOWatcher';
 }
 

diff --git a/t/mojo/ioloop.t b/t/mojo/ioloop.t
@@ -20,11 +20,10 @@ package MyWatcher;
 use Mojo::Base 'Mojo::IOWatcher';
 
 package main;
-Mojo::IOLoop->singleton->iowatcher(MyWatcher->new);
 
-# Watcher inheritance
+# Watcher detection
+$ENV{MOJO_IOWATCHER} = 'MyWatcher';
 my $loop = Mojo::IOLoop->new;
-Mojo::IOLoop->iowatcher(MyWatcher->new);
 is ref $loop->iowatcher, 'MyWatcher', 'right class';
 
 # Double start