[ViewVC] Diff of: cvs/AnyEvent/lib/AnyEvent.pm

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.114 by root, Sat May 10 21:12:49 2008 UTC vs.
Revision 1.116 by root, Sat May 10 22:30:28 2008 UTC

 package AnyEvent::Base;
 # default implementation for ->condvar
 sub condvar {
-   bless {}, "AnyEvent::Base::CondVar"
+   bless {}, AnyEvent::CondVar::
 }
 # default implementation for ->signal
 our %SIG_CB;
    delete $PID_CB{$pid} unless keys %{ $PID_CB{$pid} };
    undef $CHLD_W unless keys %PID_CB;
 }
-package AnyEvent::Base::CondVar;
+package AnyEvent::CondVar;
-# wake up the waiter
+our @ISA = AnyEvent::CondVar::Base::;
+package AnyEvent::CondVar::Base;
 sub _send {
-   &{ $_[0]{_ae_cb} } if $_[0]{_ae_cb};
+   # nop
 }
 sub send {
+   my $cv = shift;
-   $_[0]{_ae_sent} = [@_];
+   $cv->{_ae_sent} = [@_];
+   (delete $cv->{_ae_cb})->($cv) if $cv->{_ae_cb};
-   $_[0]->_send;
+   $cv->_send;
 }
 sub croak {
-   $_[0]{_ae_croak} = $_[0];
+   $_[0]{_ae_croak} = $_[1];
    $_[0]->send;
 }
 sub ready {
    $_[0]{_ae_sent}
 }
+sub _wait {
+   AnyEvent->one_event while !$_[0]{_ae_sent};
+}
 sub recv {
-   AnyEvent->one_event while !$_[0]{_ae_sent};
+   $_[0]->_wait;
    Carp::croak $_[0]{_ae_croak} if $_[0]{_ae_croak};
    wantarray ? @{ $_[0]{_ae_sent} } : $_[0]{_ae_sent}[0]
 }
    &{ $_[0]{_ae_end_cb} } if $_[0]{_ae_end_cb};
 }
 # undocumented/compatibility with pre-3.4
 *broadcast = \&send;
-*wait      = \&recv;
+*wait      = \&_wait;
 =head1 SUPPLYING YOUR OWN EVENT MODEL INTERFACE
 This is an advanced topic that you do not normally need to use AnyEvent in
 a module. This section is only of use to event loop authors who want to

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines