--- AnyEvent/lib/AnyEvent.pm	2008/05/10 21:12:49	1.114
+++ AnyEvent/lib/AnyEvent.pm	2008/05/11 18:08:36	1.118
@@ -693,7 +693,7 @@
 
 use Carp;
 
-our $VERSION = '3.4';
+our $VERSION = '3.41';
 our $MODEL;
 
 our $AUTOLOAD;
@@ -813,7 +813,7 @@
 # default implementation for ->condvar
 
 sub condvar {
-   bless {}, "AnyEvent::Base::CondVar"
+   bless {}, AnyEvent::CondVar::
 }
 
 # default implementation for ->signal
@@ -897,20 +897,25 @@
    undef $CHLD_W unless keys %PID_CB;
 }
 
-package AnyEvent::Base::CondVar;
+package AnyEvent::CondVar;
+
+our @ISA = AnyEvent::CondVar::Base::;
+
+package AnyEvent::CondVar::Base;
 
-# wake up the waiter
 sub _send {
-   &{ $_[0]{_ae_cb} } if $_[0]{_ae_cb};
+   # nop
 }
 
 sub send {
-   $_[0]{_ae_sent} = [@_];
-   $_[0]->_send;
+   my $cv = shift;
+   $cv->{_ae_sent} = [@_];
+   (delete $cv->{_ae_cb})->($cv) if $cv->{_ae_cb};
+   $cv->_send;
 }
 
 sub croak {
-   $_[0]{_ae_croak} = $_[0];
+   $_[0]{_ae_croak} = $_[1];
    $_[0]->send;
 }
 
@@ -918,8 +923,12 @@
    $_[0]{_ae_sent}
 }
 
-sub recv {
+sub _wait {
    AnyEvent->one_event while !$_[0]{_ae_sent};
+}
+
+sub recv {
+   $_[0]->_wait;
 
    Carp::croak $_[0]{_ae_croak} if $_[0]{_ae_croak};
    wantarray ? @{ $_[0]{_ae_sent} } : $_[0]{_ae_sent}[0]
@@ -942,7 +951,7 @@
 
 # undocumented/compatibility with pre-3.4
 *broadcast = \&send;
-*wait      = \&recv;
+*wait      = \&_wait;
 
 =head1 SUPPLYING YOUR OWN EVENT MODEL INTERFACE
 
@@ -1041,7 +1050,7 @@
          warn "io event <$_[0]>\n";   # will always output <r>
          chomp (my $input = <STDIN>); # read a line
          warn "read: $input\n";       # output what has been read
-         $cv->broadcast if $input =~ /^q/i; # quit program if /^q/i
+         $cv->send if $input =~ /^q/i; # quit program if /^q/i
       },
    );
 
@@ -1056,7 +1065,7 @@
 
    new_timer; # create first timer
 
-   $cv->wait; # wait until user enters /^q/i
+   $cv->recv; # wait until user enters /^q/i
 
 =head1 REAL-WORLD EXAMPLE
 
@@ -1122,7 +1131,7 @@
 
    if (end-of-file or data complete) {
      $txn->{result} = $txn->{buf};
-     $txn->{finished}->broadcast;
+     $txn->{finished}->send;
      $txb->{cb}->($txn) of $txn->{cb}; # also call callback
    }
 
@@ -1130,7 +1139,7 @@
 request was already finished, it doesn't wait, of course, and returns the
 data:
 
-   $txn->{finished}->wait;
+   $txn->{finished}->recv;
    return $txn->{result};
 
 The actual code goes further and collects all errors (C<die>s, exceptions)
@@ -1175,10 +1184,10 @@
 
    $fcp->txn_client_get ($url)->cb (sub {
       ...
-      $quit->broadcast;
+      $quit->send;
    });
 
-   $quit->wait;
+   $quit->recv;
 
 
 =head1 BENCHMARKS
@@ -1217,7 +1226,7 @@
 
 I<invoke> is the time, in microseconds, used to invoke a simple
 callback. The callback simply counts down a Perl variable and after it was
-invoked "watcher" times, it would C<< ->broadcast >> a condvar once to
+invoked "watcher" times, it would C<< ->send >> a condvar once to
 signal the end of this phase.
 
 I<destroy> is the time, in microseconds, that it takes to destroy a single