improved performance and memory usage of Mojo::EventEmitter

mojolicious · Jan 9, 2013 · dbf5f1d · dbf5f1d
1 parent 7d5b29c
commit dbf5f1d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@
 3.76  2013-01-09
   - Added support for multiple uploads sharing the same name to
     Mojo::UserAgent::Transactor.
+  - Improved performance and memory usage of Mojo::EventEmitter.
   - Fixed support for multiple uploads in Mojolicious::Controller.
 
 3.75  2013-01-08

diff --git a/lib/Mojo/EventEmitter.pm b/lib/Mojo/EventEmitter.pm
@@ -5,19 +5,14 @@ use Scalar::Util qw(blessed weaken);
 
 use constant DEBUG => $ENV{MOJO_EVENTEMITTER_DEBUG} || 0;
 
-sub new {
-  my $self = shift->SUPER::new(@_);
-  $self->on(error => sub { warn $_[1] if @{$_[0]->subscribers('error')} < 2 });
-  return $self;
-}
-
 sub emit {
   my ($self, $name) = (shift, shift);
 
   if (my $s = $self->{events}{$name}) {
     warn "-- Emit $name in @{[blessed($self)]} (@{[scalar(@$s)]})\n" if DEBUG;
     $self->$_(@_) for @$s;
   }
+  elsif ($name eq 'error') { warn $_[0] }
   elsif (DEBUG) { warn "-- Emit $name in @{[blessed($self)]} (0)\n" }
 
   return $self;
@@ -40,6 +35,7 @@ sub emit_safe {
       }
     }
   }
+  elsif ($name eq 'error') { warn $_[0] }
   elsif (DEBUG) { warn "-- Emit $name in @{[blessed($self)]} safely (0)\n" }
 
   return $self;
@@ -138,13 +134,6 @@ Emitted safely for event errors.
 L<Mojo::EventEmitter> inherits all methods from L<Mojo::Base> and
 implements the following new ones.
 
-=head2 new
-
-  my $e = Mojo::EventEmitter->new;
-
-Construct a new L<Mojo::EventEmitter> object and subscribe to C<error> event
-with default error handling.
-
 =head2 emit
 
   $e = $e->emit('foo');

diff --git a/t/mojo/eventemitter.t b/t/mojo/eventemitter.t
@@ -20,9 +20,10 @@ my $error;
 {
   local *STDERR;
   open STDERR, '>', \$error;
-  $e->emit(error => "just works!\n");
+  $e->emit(error => "just\n");
+  $e->emit_safe(error => "works\n");
 }
-is $error, "just works!\n", 'right error';
+is $error, "just\nworks\n", 'right error';
 
 # Error fallback
 my ($echo, $err);