[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.128 by root, Sat May 24 02:50:45 2008 UTC

-=head1 NAME
+=head1 => NAME
 AnyEvent - provide framework for multiple event loops
 EV, Event, Glib, Tk, Perl, Event::Lib, Qt, POE - various supported event loops
 as those use one of the supported event loops. It is trivial to add new
 event loops to AnyEvent, too, so it is future-proof).
 In addition to being free of having to use I<the one and only true event
 model>, AnyEvent also is free of bloat and policy: with POE or similar
-modules, you get an enourmous amount of code and strict rules you have to
+modules, you get an enormous amount of code and strict rules you have to
 follow. AnyEvent, on the other hand, is lean and up to the point, by only
 offering the functionality that is necessary, in as thin as a wrapper as
 technically possible.
 Of course, if you want lots of policy (this can arguably be somewhat
 =head1 WATCHERS
 AnyEvent has the central concept of a I<watcher>, which is an object that
 stores relevant data for each kind of event you are waiting for, such as
-the callback to call, the filehandle to watch, etc.
+the callback to call, the file handle to watch, etc.
 These watchers are normal Perl objects with normal Perl lifetime. After
 creating a watcher it will immediately "watch" for events and invoke the
 callback when the event occurs (of course, only when the event model
 is in control).
 =item L<AnyEvent::Handle>
 Provide read and write buffers and manages watchers for reads and writes.
+=item L<AnyEvent::Socket>
+Provides various utility functions for (internet protocol) sockets,
+addresses and name resolution. Also functions to create non-blocking tcp
+connections or tcp servers, with IPv6 and SRV record support and more.
 =item L<AnyEvent::HTTPD>
 Provides a simple web application server framework.
 =item L<AnyEvent::DNS>
-Provides asynchronous DNS resolver capabilities, beyond what
+Provides rich asynchronous DNS resolver capabilities.
-L<AnyEvent::Util> offers.
 =item L<AnyEvent::FastPing>
 The fastest ping in the west.
 no warnings;
 use strict;
 use Carp;
-our $VERSION = '3.4';
+our $VERSION = '3.6';
 our $MODEL;
 our $AUTOLOAD;
 our @ISA;
 our $verbose = $ENV{PERL_ANYEVENT_VERBOSE}*1;
 our @REGISTRY;
+our %PROTOCOL; # (ipv4|ipv6) => (1|2)
+{
+   my $idx;
+   $PROTOCOL{$_} = ++$idx
+      for split /\s*,\s*/, $ENV{PERL_ANYEVENT_PROTOCOLS} || "ipv4,ipv6";
+}
 my @models = (
    [EV::                   => AnyEvent::Impl::EV::],
    [Event::                => AnyEvent::Impl::Event::],
    [Tk::                   => AnyEvent::Impl::Tk::],
       1
    } else {
       push @post_detect, $cb;
       defined wantarray
-         ? bless \$cb, "AnyEvent::Util::Guard"
+         ? bless \$cb, "AnyEvent::Util::PostDetect"
          : ()
    }
 }
-sub AnyEvent::Util::Guard::DESTROY {
+sub AnyEvent::Util::PostDetect::DESTROY {
    @post_detect = grep $_ != ${$_[0]}, @post_detect;
 }
 sub detect() {
    unless ($MODEL) {
 package AnyEvent::Base;
 # default implementation for ->condvar
 sub condvar {
-   bless {}, "AnyEvent::Base::CondVar"
+   bless { @_ == 3 ? (_ae_cb => $_[2]) : () }, 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} = $_[1] if @_ > 1;
 }
 sub end {
    return if --$_[0]{_ae_counter};
-   &{ $_[0]{_ae_end_cb} } if $_[0]{_ae_end_cb};
+   &{ $_[0]{_ae_end_cb} || sub { $_[0]->send } };
 }
 # 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
 model it chooses.
 =item C<PERL_ANYEVENT_MODEL>
 This can be used to specify the event model to be used by AnyEvent, before
-autodetection and -probing kicks in. It must be a string consisting
+auto detection and -probing kicks in. It must be a string consisting
 entirely of ASCII letters. The string C<AnyEvent::Impl::> gets prepended
 and the resulting module name is loaded and if the load was successful,
 used as event model. If it fails to load AnyEvent will proceed with
-autodetection and -probing.
+auto detection and -probing.
 This functionality might change in future versions.
 For example, to force the pure perl model (L<AnyEvent::Impl::Perl>) you
 could start your program like this:
   PERL_ANYEVENT_MODEL=Perl perl ...
+=item C<PERL_ANYEVENT_PROTOCOLS>
+Used by both L<AnyEvent::DNS> and L<AnyEvent::Socket> to determine preferences
+for IPv4 or IPv6. The default is unspecified (and might change, or be the result
+of auto probing).
+Must be set to a comma-separated list of protocols or address families,
+current supported: C<ipv4> and C<ipv6>. Only protocols mentioned will be
+used, and preference will be given to protocols mentioned earlier in the
+list.
+This variable can effectively be used for denial-of-service attacks
+against local programs (e.g. when setuid), although the impact is likely
+small, as the program has to handle connection errors already-
+Examples: C<PERL_ANYEVENT_PROTOCOLS=ipv4,ipv6> - prefer IPv4 over IPv6,
+but support both and try to use both.  C<PERL_ANYEVENT_PROTOCOLS=ipv4>
+- only support IPv4, never try to resolve or contact IPv6
+addresses. C<PERL_ANYEVENT_PROTOCOLS=ipv6,ipv4> support either IPv4 or
+IPv6, but prefer IPv6 over IPv4.
+=item C<PERL_ANYEVENT_EDNS0>
+Used by L<AnyEvent::DNS> to decide whether to use the EDNS0 extension
+for DNS. This extension is generally useful to reduce DNS traffic, but
+some (broken) firewalls drop such DNS packets, which is why it is off by
+default.
+Setting this variable to C<1> will cause L<AnyEvent::DNS> to announce
+EDNS0 in its DNS requests.
 =back
 =head1 EXAMPLE PROGRAM
       poll => 'r',
       cb   => sub {
          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
       },
    );
    my $time_watcher; # can only be used once
       });
    }
    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
 Consider the L<Net::FCP> module. It features (among others) the following
 API calls, which are to freenet what HTTP GET requests are to http:
    syswrite $txn->{fh}, $txn->{request}
       or die "connection or write error";
    $txn->{w} = AnyEvent->io (fh => $txn->{fh}, poll => 'r', cb => sub { $txn->fh_ready_r });
 Again, C<fh_ready_r> waits till all data has arrived, and then stores the
-result and signals any possible waiters that the request ahs finished:
+result and signals any possible waiters that the request has finished:
    sysread $txn->{fh}, $txn->{buf}, length $txn->{$buf};
    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
    }
 The C<result> method, finally, just waits for the finished signal (if the
 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)
-that occured during request processing. The C<result> method detects
+that occurred during request processing. The C<result> method detects
 whether an exception as thrown (it is stored inside the $txn object)
 and just throws the exception, which means connection errors and other
 problems get reported tot he code that tries to use the result, not in a
 random callback.
    my $quit = AnyEvent->condvar;
    $fcp->txn_client_get ($url)->cb (sub {
       ...
-      $quit->broadcast;
+      $quit->send;
    });
-   $quit->wait;
+   $quit->recv;
 =head1 BENCHMARKS
 To give you an idea of the performance and overheads that AnyEvent adds
 of various event loops I prepared some benchmarks.
 =head2 BENCHMARKING ANYEVENT OVERHEAD
 Here is a benchmark of various supported event models used natively and
-through anyevent. The benchmark creates a lot of timers (with a zero
+through AnyEvent. The benchmark creates a lot of timers (with a zero
 timeout) and I/O watchers (watching STDOUT, a pty, to become writable,
 which it is), lets them fire exactly once and destroys them again.
 Source code for this benchmark is found as F<eg/bench> in the AnyEvent
 distribution.
 all watchers, to avoid adding memory overhead. That means closure creation
 and memory usage is not included in the figures.
 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
 watcher.
 =back
 =head2 BENCHMARKING THE LARGE SERVER CASE
-This benchmark atcually benchmarks the event loop itself. It works by
+This benchmark actually benchmarks the event loop itself. It works by
-creating a number of "servers": each server consists of a socketpair, a
+creating a number of "servers": each server consists of a socket pair, a
 timeout watcher that gets reset on activity (but never fires), and an I/O
 watcher waiting for input on one side of the socket. Each time the socket
 watcher reads a byte it will write that byte to a random other "server".
 The effect is that there will be a lot of I/O watchers, only part of which
 are active at any one point (so there is a constant number of active
-fds for each loop iterstaion, but which fds these are is random). The
+fds for each loop iteration, but which fds these are is random). The
 timeout is reset each time something is read because that reflects how
 most timeouts work (and puts extra pressure on the event loops).
-In this benchmark, we use 10000 socketpairs (20000 sockets), of which 100
+In this benchmark, we use 10000 socket pairs (20000 sockets), of which 100
 (1%) are active. This mirrors the activity of large servers with many
 connections, most of which are idle at any one point in time.
 Source code for this benchmark is found as F<eg/bench2> in the AnyEvent
 distribution.
 =head3 Explanation of the columns
 I<sockets> is the number of sockets, and twice the number of "servers" (as
 each server has a read and write socket end).
-I<create> is the time it takes to create a socketpair (which is
+I<create> is the time it takes to create a socket pair (which is
 nontrivial) and two watchers: an I/O watcher and a timeout watcher.
 I<request>, the most important value, is the time it takes to handle a
 single "request", that is, reading the token from the pipe and forwarding
 it to another server. This includes deleting the old timeout and creating
 probably even less useful to an attacker than PERL_ANYEVENT_MODEL).
 =head1 SEE ALSO
+Utility functions: L<AnyEvent::Util>.
 Event modules: L<EV>, L<EV::Glib>, L<Glib::EV>, L<Event>, L<Glib::Event>,
 L<Glib>, L<Tk>, L<Event::Lib>, L<Qt>, L<POE>.
 Implementations: L<AnyEvent::Impl::EV>, L<AnyEvent::Impl::Event>,
 L<AnyEvent::Impl::Glib>, L<AnyEvent::Impl::Tk>, L<AnyEvent::Impl::Perl>,
 L<AnyEvent::Impl::EventLib>, L<AnyEvent::Impl::Qt>,
 L<AnyEvent::Impl::POE>.
+Non-blocking file handles, sockets, TCP clients and
+servers: L<AnyEvent::Handle>, L<AnyEvent::Socket>.
+Asynchronous DNS: L<AnyEvent::DNS>.
 Coroutine support: L<Coro>, L<Coro::AnyEvent>, L<Coro::EV>, L<Coro::Event>,
-Nontrivial usage examples: L<Net::FCP>, L<Net::XMPP2>.
+Nontrivial usage examples: L<Net::FCP>, L<Net::XMPP2>, L<AnyEvent::DNS>.
 =head1 AUTHOR
  Marc Lehmann <schmorp@schmorp.de>

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent.pm (file contents): Revision 1.114 by root, Sat May 10 21:12:49 2008 UTC vs. Revision 1.128 by root, Sat May 24 02:50:45 2008 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.114 by root, Sat May 10 21:12:49 2008 UTC vs.
Revision 1.128 by root, Sat May 24 02:50:45 2008 UTC