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

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.268 by root, Thu Jul 30 16:39:19 2009 UTC vs.
Revision 1.276 by root, Sun Aug 9 10:53:33 2009 UTC

 =item $cb = $cv->cb ($cb->($cv))
 This is a mutator function that returns the callback set and optionally
 replaces it before doing so.
-The callback will be called when the condition becomes "true", i.e. when
+The callback will be called when the condition becomes (or already was)
-C<send> or C<croak> are called, with the only argument being the condition
+"true", i.e. when C<send> or C<croak> are called (or were called), with
-variable itself. Calling C<recv> inside the callback or at any later time
+the only argument being the condition variable itself. Calling C<recv>
-is guaranteed not to block.
+inside the callback or at any later time is guaranteed not to block.
 =back
 =head1 SUPPORTED EVENT LOOPS/BACKENDS
 =over 4
 =item Backends that are autoprobed when no other event loop can be found.
 EV is the preferred backend when no other event loop seems to be in
-use. If EV is not installed, then AnyEvent will try Event, and, failing
+use. If EV is not installed, then AnyEvent will fall back to its own
-that, will fall back to its own pure-perl implementation, which is
+pure-perl implementation, which is available everywhere as it comes with
-available everywhere as it comes with AnyEvent itself.
+AnyEvent itself.
    AnyEvent::Impl::EV        based on EV (interface to libev, best choice).
-   AnyEvent::Impl::Event     based on Event, very stable, few glitches.
    AnyEvent::Impl::Perl      pure-perl implementation, fast and portable.
 =item Backends that are transparently being picked up when they are used.
 These will be used when they are currently loaded when the first watcher
 is created, in which case it is assumed that the application is using
 them. This means that AnyEvent will automatically pick the right backend
 when the main program loads an event module before anything starts to
 create watchers. Nothing special needs to be done by the main program.
+   AnyEvent::Impl::Event     based on Event, very stable, few glitches.
    AnyEvent::Impl::Glib      based on Glib, slow but very stable.
    AnyEvent::Impl::Tk        based on Tk, very broken.
    AnyEvent::Impl::EventLib  based on Event::Lib, leaks memory and worse.
    AnyEvent::Impl::POE       based on POE, very slow, some limitations.
    AnyEvent::Impl::Irssi     used when running within irssi.
 BEGIN { AnyEvent::common_sense }
 use Carp ();
-our $VERSION = 4.9;
+our $VERSION = 4.92;
 our $MODEL;
 our $AUTOLOAD;
 our @ISA;
              $ENV{PERL_ANYEVENT_PROTOCOLS} || "ipv4,ipv6";
 }
 my @models = (
    [EV::                   => AnyEvent::Impl::EV::   , 1],
-   [Event::                => AnyEvent::Impl::Event::, 1],
    [AnyEvent::Impl::Perl:: => AnyEvent::Impl::Perl:: , 1],
    # everything below here will not (normally) be autoprobed
    # as the pureperl backend should work everywhere
    # and is usually faster
+   [Event::                => AnyEvent::Impl::Event::, 1],
    [Glib::                 => AnyEvent::Impl::Glib:: , 1], # becomes extremely slow with many watchers
    [Event::Lib::           => AnyEvent::Impl::EventLib::], # too buggy
    [Irssi::                => AnyEvent::Impl::Irssi::],    # Irssi has a bogus "Event" package
    [Tk::                   => AnyEvent::Impl::Tk::],       # crashes with many handles
    [Qt::                   => AnyEvent::Impl::Qt::],       # requires special main program
    # we assume CLOEXEC is already set by perl in all important cases
    ($fh2, $rw)
 }
+#############################################################################
+# "new" API, currently only emulation of it
+#############################################################################
+package AE;
+our $VERSION = $AnyEvent::VERSION;
+sub io($$$) {
+   AnyEvent->io (fh => $_[0], poll => $_[1] ? "w" : "r", cb => $_[2])
+}
+sub timer($$$) {
+   AnyEvent->timer (after => $_[0], interval => $_[1], cb => $_[2]);
+}
+sub signal($$) {
+   AnyEvent->signal (signal => $_[0], cb => $_[1]);
+}
+sub child($$) {
+   AnyEvent->child (pid => $_[0], cb => $_[1]);
+}
+sub idle($) {
+   AnyEvent->idle (cb => $_[0]);
+}
+sub cv(;&) {
+   AnyEvent->condvar (@_ ? (cb => $_[0]) : ())
+}
+sub now() {
+   AnyEvent->now
+}
+sub now_update() {
+   AnyEvent->now_update
+}
+sub time() {
+   AnyEvent->time
+}
 package AnyEvent::Base;
 # default implementations for many methods
 sub _time {
 # install a dummy wakeup watcher to reduce signal catching latency
 sub _sig_add() {
    unless ($SIG_COUNT++) {
       # try to align timer on a full-second boundary, if possible
-      my $NOW = AnyEvent->now;
+      my $NOW = AE::now;
-      $SIG_TW = AnyEvent->timer (
+      $SIG_TW = AE::timer
-         after    => $MAX_SIGNAL_LATENCY - ($NOW - int $NOW),
+         $MAX_SIGNAL_LATENCY - ($NOW - int $NOW),
-         interval => $MAX_SIGNAL_LATENCY,
+         $MAX_SIGNAL_LATENCY,
-         cb       => sub { }, # just for the PERL_ASYNC_CHECK
+         sub { } # just for the PERL_ASYNC_CHECK
-      );
+      ;
    }
 }
 sub _sig_del {
    undef $SIG_TW
       # probe for availability of Async::Interrupt
       if (_have_async_interrupt) {
          warn "AnyEvent: using Async::Interrupt for race-free signal handling.\n" if $VERBOSE >= 8;
          $SIGPIPE_R = new Async::Interrupt::EventPipe;
-         $SIG_IO = AnyEvent->io (fh => $SIGPIPE_R->fileno, poll => "r", cb => \&_signal_exec);
+         $SIG_IO = AE::io $SIGPIPE_R->fileno, 0, \&_signal_exec;
       } else {
          warn "AnyEvent: using emulated perl signal handling with latency timer.\n" if $VERBOSE >= 8;
          require Fcntl;
          }
          $SIGPIPE_R
             or Carp::croak "AnyEvent: unable to create a signal reporting pipe: $!\n";
-         $SIG_IO = AnyEvent->io (fh => $SIGPIPE_R, poll => "r", cb => \&_signal_exec);
+         $SIG_IO = AE::io $SIGPIPE_R, 0, \&_signal_exec;
       }
       *signal = sub {
          my (undef, %arg) = @_;
    $WNOHANG ||= $^O =~ /^(?:openbsd|netbsd|linux|freebsd|cygwin|MSWin32)$/
                 ? 1
                 : eval { local $SIG{__DIE__}; require POSIX; &POSIX::WNOHANG } || 1;
    unless ($CHLD_W) {
-      $CHLD_W = AnyEvent->signal (signal => 'CHLD', cb => \&_sigchld);
+      $CHLD_W = AE::signal CHLD => \&_sigchld;
       # child could be a zombie already, so make at least one round
       &_sigchld;
    }
    bless [$pid, $arg{cb}], "AnyEvent::Base::child"
          # never use more then 50% of the time for the idle watcher,
          # within some limits
          $w = 0.0001 if $w < 0.0001;
          $w = 5      if $w > 5;
-         $w = AnyEvent->timer (after => $w, cb => $rcb);
+         $w = AE::timer $w, 0, $rcb;
       } else {
          # clean up...
          undef $w;
          undef $rcb;
       }
    };
-   $w = AnyEvent->timer (after => 0.05, cb => $rcb);
+   $w = AE::timer 0.05, 0, $rcb;
    bless \\$cb, "AnyEvent::Base::idle"
 }
 sub AnyEvent::Base::idle::DESTROY {
    Carp::croak $_[0]{_ae_croak} if $_[0]{_ae_croak};
    wantarray ? @{ $_[0]{_ae_sent} } : $_[0]{_ae_sent}[0]
 }
 sub cb {
-   $_[0]{_ae_cb} = $_[1] if @_ > 1;
+   my $cv = shift;
+   @_
+      and $cv->{_ae_cb} = shift
+      and $cv->{_ae_sent}
+      and (delete $cv->{_ae_cb})->($cv);
-   $_[0]{_ae_cb}
+   $cv->{_ae_cb}
 }
 sub begin {
    ++$_[0]{_ae_counter};
    $_[0]{_ae_end_cb} = $_[1] if @_ > 1;
 }
 # undocumented/compatibility with pre-3.4
 *broadcast = \&send;
 *wait      = \&_wait;
-#############################################################################
-# "new" API, currently only emulation of it
-#############################################################################
-package AE;
-sub io($$$) {
-   AnyEvent->io (fh => $_[0], poll => $_[1] ? "w" : "r", cb => $_[2])
-}
-sub timer($$$) {
-   AnyEvent->timer (after => $_[0], interval => $_[1], cb => $_[2]);
-}
-sub signal($$) {
-   AnyEvent->signal (signal => $_[0], cb => $_[1]);
-}
-sub child($$) {
-   AnyEvent->child (pid => $_[0], cb => $_[1]);
-}
-sub idle($) {
-   AnyEvent->idle (cb => $_[0]);
-}
-sub cv() {
-   AnyEvent->condvar
-}
-sub now() {
-   AnyEvent->now
-}
-sub now_update() {
-   AnyEvent->now_update
-}
-sub time() {
-   AnyEvent->time
-}
 =head1 ERROR AND EXCEPTION HANDLING
 In general, AnyEvent does not do any error handling - it relies on the
 caller to do that if required. The L<AnyEvent::Strict> module (see also

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent.pm (file contents): Revision 1.268 by root, Thu Jul 30 16:39:19 2009 UTC vs. Revision 1.276 by root, Sun Aug 9 10:53:33 2009 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.268 by root, Thu Jul 30 16:39:19 2009 UTC vs.
Revision 1.276 by root, Sun Aug 9 10:53:33 2009 UTC