--- AnyEvent/lib/AnyEvent.pm	2008/05/10 20:30:35	1.113
+++ AnyEvent/lib/AnyEvent.pm	2008/05/30 21:38:46	1.146
@@ -1,4 +1,4 @@
-=head1 NAME
+=head1 => NAME
 
 AnyEvent - provide framework for multiple event loops
 
@@ -17,8 +17,8 @@
    });
 
    my $w = AnyEvent->condvar; # stores whether a condition was flagged
-   $w->wait; # enters "main loop" till $condvar gets ->send
-   $w->send; # wake up current and all future wait's
+   $w->send; # wake up current and all future recv's
+   $w->recv; # enters "main loop" till $condvar gets ->send
 
 =head1 WHY YOU SHOULD USE THIS MODULE (OR NOT)
 
@@ -50,7 +50,7 @@
 
 AnyEvent is different: AnyEvent + POE works fine. AnyEvent + Glib works
 fine. AnyEvent + Tk works fine etc. etc. but none of these work together
-with the rest: POE + IO::Async? no go. Tk + Event? no go. Again: if
+with the rest: POE + IO::Async? No go. Tk + Event? No go. Again: if
 your module uses one of those, every user of your module has to use it,
 too. But if your module uses AnyEvent, it works transparently with all
 event models it supports (including stuff like POE and IO::Async, as long
@@ -59,12 +59,18 @@
 
 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
+Of course, AnyEvent comes with a big (and fully optional!) toolbox
+of useful functionality, such as an asynchronous DNS resolver, 100%
+non-blocking connects (even with TLS/SSL, IPv6 and on broken platforms
+such as Windows) and lots of real-world knowledge and workarounds for
+platform bugs and differences.
+
+Now, if you I<do want> lots of policy (this can arguably be somewhat
 useful) and you want to force your users to use the one and only event
 model, you should I<not> use this module.
 
@@ -104,13 +110,13 @@
 
 The pure-perl implementation of AnyEvent is called
 C<AnyEvent::Impl::Perl>. Like other event modules you can load it
-explicitly.
+explicitly and enjoy the high availability of that event loop :)
 
 =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
@@ -229,6 +235,69 @@
 AnyEvent always prefers relative timers, if available, matching the
 AnyEvent API.
 
+AnyEvent has two additional methods that return the "current time":
+
+=over 4
+
+=item AnyEvent->time
+
+This returns the "current wallclock time" as a fractional number of
+seconds since the Epoch (the same thing as C<time> or C<Time::HiRes::time>
+return, and the result is guaranteed to be compatible with those).
+
+It progresses independently of any event loop processing, i.e. each call
+will check the system clock, which usually gets updated frequently.
+
+=item AnyEvent->now
+
+This also returns the "current wallclock time", but unlike C<time>, above,
+this value might change only once per event loop iteration, depending on
+the event loop (most return the same time as C<time>, above). This is the
+time that AnyEvent's timers get scheduled against.
+
+I<In almost all cases (in all cases if you don't care), this is the
+function to call when you want to know the current time.>
+
+This function is also often faster then C<< AnyEvent->time >>, and
+thus the preferred method if you want some timestamp (for example,
+L<AnyEvent::Handle> uses this to update it's activity timeouts).
+
+The rest of this section is only of relevance if you try to be very exact
+with your timing, you can skip it without bad conscience.
+
+For a practical example of when these times differ, consider L<Event::Lib>
+and L<EV> and the following set-up:
+
+The event loop is running and has just invoked one of your callback at
+time=500 (assume no other callbacks delay processing). In your callback,
+you wait a second by executing C<sleep 1> (blocking the process for a
+second) and then (at time=501) you create a relative timer that fires
+after three seconds.
+
+With L<Event::Lib>, C<< AnyEvent->time >> and C<< AnyEvent->now >> will
+both return C<501>, because that is the current time, and the timer will
+be scheduled to fire at time=504 (C<501> + C<3>).
+
+With L<EV>, C<< AnyEvent->time >> returns C<501> (as that is the current
+time), but C<< AnyEvent->now >> returns C<500>, as that is the time the
+last event processing phase started. With L<EV>, your timer gets scheduled
+to run at time=503 (C<500> + C<3>).
+
+In one sense, L<Event::Lib> is more exact, as it uses the current time
+regardless of any delays introduced by event processing. However, most
+callbacks do not expect large delays in processing, so this causes a
+higher drift (and a lot more system calls to get the current time).
+
+In another sense, L<EV> is more exact, as your timer will be scheduled at
+the same time, regardless of how long event processing actually took.
+
+In either case, if you care (and in most cases, you don't), then you
+can get whatever behaviour you want with any event loop, by taking the
+difference between C<< AnyEvent->time >> and C<< AnyEvent->now >> into
+account.
+
+=back
+
 =head2 SIGNAL WATCHERS
 
 You can watch for signals using a signal watcher, C<signal> is the signal
@@ -239,10 +308,10 @@
 presence is undefined and you cannot rely on them. Portable AnyEvent
 callbacks cannot use arguments passed to signal watcher callbacks.
 
-Multiple signal occurances can be clumped together into one callback
-invocation, and callback invocation will be synchronous. synchronous means
+Multiple signal occurrences can be clumped together into one callback
+invocation, and callback invocation will be synchronous. Synchronous means
 that it might take a while until the signal gets handled by the process,
-but it is guarenteed not to interrupt any other callbacks.
+but it is guaranteed not to interrupt any other callbacks.
 
 The main advantage of using these watchers is that you can share a signal
 between multiple watchers.
@@ -281,8 +350,6 @@
 
   my $done = AnyEvent->condvar;
 
-  AnyEvent::detect; # force event module to be initialised
-
   my $pid = fork or exit 5;
 
   my $w = AnyEvent->child (
@@ -295,7 +362,7 @@
   );
 
   # do something else, then wait for process exit
-  $done->wait;
+  $done->recv;
 
 =head2 CONDITION VARIABLES
 
@@ -314,13 +381,15 @@
 C<cb>, which specifies a callback to be called when the condition variable
 becomes true.
 
-After creation, the conditon variable is "false" until it becomes "true"
-by calling the C<send> method.
+After creation, the condition variable is "false" until it becomes "true"
+by calling the C<send> method (or calling the condition variable as if it
+were a callback, read about the caveats in the description for the C<<
+->send >> method).
 
 Condition variables are similar to callbacks, except that you can
 optionally wait for them. They can also be called merge points - points
-in time where multiple outstandign events have been processed. And yet
-another way to call them is transations - each condition variable can be
+in time where multiple outstanding events have been processed. And yet
+another way to call them is transactions - each condition variable can be
 used to represent a transaction, which finishes at some point and delivers
 a result.
 
@@ -328,15 +397,15 @@
 for example, if you write a module that does asynchronous http requests,
 then a condition variable would be the ideal candidate to signal the
 availability of results. The user can either act when the callback is
-called or can synchronously C<< ->wait >> for the results.
+called or can synchronously C<< ->recv >> for the results.
 
 You can also use them to simulate traditional event loops - for example,
 you can block your main program until an event occurs - for example, you
-could C<< ->wait >> in your main program until the user clicks the Quit
+could C<< ->recv >> in your main program until the user clicks the Quit
 button of your app, which would C<< ->send >> the "quit" event.
 
 Note that condition variables recurse into the event loop - if you have
-two pieces of code that call C<< ->wait >> in a round-robbin fashion, you
+two pieces of code that call C<< ->recv >> in a round-robin fashion, you
 lose. Therefore, condition variables are good to export to your caller, but
 you should avoid making a blocking wait yourself, at least in callbacks,
 as this asks for trouble.
@@ -351,7 +420,7 @@
 eventually calls C<< -> send >>, and the "consumer side", which waits
 for the send to occur.
 
-Example:
+Example: wait for a timer.
 
    # wait till the result is ready
    my $result_ready = AnyEvent->condvar;
@@ -367,7 +436,14 @@
 
    # this "blocks" (while handling events) till the callback
    # calls send
-   $result_ready->wait;
+   $result_ready->recv;
+
+Example: wait for a timer, but take advantage of the fact that
+condition variables are also code references.
+
+   my $done = AnyEvent->condvar;
+   my $delay = AnyEvent->timer (after => 5, cb => $done);
+   $done->recv;
 
 =head3 METHODS FOR PRODUCERS
 
@@ -380,19 +456,28 @@
 
 =item $cv->send (...)
 
-Flag the condition as ready - a running C<< ->wait >> and all further
-calls to C<wait> will (eventually) return after this method has been
+Flag the condition as ready - a running C<< ->recv >> and all further
+calls to C<recv> will (eventually) return after this method has been
 called. If nobody is waiting the send will be remembered.
 
 If a callback has been set on the condition variable, it is called
 immediately from within send.
 
 Any arguments passed to the C<send> call will be returned by all
-future C<< ->wait >> calls.
+future C<< ->recv >> calls.
+
+Condition variables are overloaded so one can call them directly
+(as a code reference). Calling them directly is the same as calling
+C<send>. Note, however, that many C-based event loops do not handle
+overloading, so as tempting as it may be, passing a condition variable
+instead of a callback does not work. Both the pure perl and EV loops
+support overloading, however, as well as all functions that use perl to
+invoke a callback (as in L<AnyEvent::Socket> and L<AnyEvent::DNS> for
+example).
 
 =item $cv->croak ($error)
 
-Similar to send, but causes all call's wait C<< ->wait >> to invoke
+Similar to send, but causes all call's to C<< ->recv >> to invoke
 C<Carp::croak> with the given error message/object/scalar.
 
 This can be used to signal any errors to the condition variable
@@ -402,6 +487,8 @@
 
 =item $cv->end
 
+These two methods are EXPERIMENTAL and MIGHT CHANGE.
+
 These two methods can be used to combine many transactions/events into
 one. For example, a function that pings many hosts in parallel might want
 to use a condition variable for the whole process.
@@ -445,7 +532,7 @@
 This is the general pattern when you "fan out" into multiple subrequests:
 use an outer C<begin>/C<end> pair to set the callback and ensure C<end>
 is called at least once, and then, for each subrequest you start, call
-C<begin> and for eahc subrequest you finish, call C<end>.
+C<begin> and for each subrequest you finish, call C<end>.
 
 =back
 
@@ -456,7 +543,7 @@
 
 =over 4
 
-=item $cv->wait
+=item $cv->recv
 
 Wait (blocking if necessary) until the C<< ->send >> or C<< ->croak
 >> methods have been called on c<$cv>, while servicing other watchers
@@ -477,21 +564,21 @@
 caller decide whether the call will block or not (for example, by coupling
 condition variables with some kind of request results and supporting
 callbacks so the caller knows that getting the result will not block,
-while still suppporting blocking waits if the caller so desires).
+while still supporting blocking waits if the caller so desires).
 
-Another reason I<never> to C<< ->wait >> in a module is that you cannot
-sensibly have two C<< ->wait >>'s in parallel, as that would require
+Another reason I<never> to C<< ->recv >> in a module is that you cannot
+sensibly have two C<< ->recv >>'s in parallel, as that would require
 multiple interpreters or coroutines/threads, none of which C<AnyEvent>
 can supply.
 
 The L<Coro> module, however, I<can> and I<does> supply coroutines and, in
 fact, L<Coro::AnyEvent> replaces AnyEvent's condvars by coroutine-safe
 versions and also integrates coroutines into AnyEvent, making blocking
-C<< ->wait >> calls perfectly safe as long as they are done from another
+C<< ->recv >> calls perfectly safe as long as they are done from another
 coroutine (one that doesn't run the event loop).
 
-You can ensure that C<< -wait >> never blocks by setting a callback and
-only calling C<< ->wait >> from within that callback (or at a later
+You can ensure that C<< -recv >> never blocks by setting a callback and
+only calling C<< ->recv >> from within that callback (or at a later
 time). This will work even when the event loop does not support blocking
 waits otherwise.
 
@@ -506,7 +593,7 @@
 replaces it before doing so.
 
 The callback will be called when the condition becomes "true", i.e. when
-C<send> or C<croak> are called. Calling C<wait> inside the callback
+C<send> or C<croak> are called. Calling C<recv> inside the callback
 or at any later time is guaranteed not to block.
 
 =back
@@ -584,14 +671,14 @@
 by calling AnyEvent in your module body you force the user of your module
 to load the event module first.
 
-Never call C<< ->wait >> on a condition variable unless you I<know> that
+Never call C<< ->recv >> on a condition variable unless you I<know> that
 the C<< ->send >> method has been called on it already. This is
 because it will stall the whole program, and the whole point of using
 events is to stay interactive.
 
-It is fine, however, to call C<< ->wait >> when the user of your module
+It is fine, however, to call C<< ->recv >> when the user of your module
 requests it (i.e. if you create a http request object ad have a method
-called C<results> that returns the results, it should call C<< ->wait >>
+called C<results> that returns the results, it should call C<< ->recv >>
 freely, as the user of your module knows what she is doing. always).
 
 =head1 WHAT TO DO IN THE MAIN PROGRAM
@@ -603,17 +690,34 @@
 do anything special (it does not need to be event-based) and let AnyEvent
 decide which implementation to chose if some module relies on it.
 
-If the main program relies on a specific event model. For example, in
-Gtk2 programs you have to rely on the Glib module. You should load the
+If the main program relies on a specific event model - for example, in
+Gtk2 programs you have to rely on the Glib module - you should load the
 event module before loading AnyEvent or any module that uses it: generally
 speaking, you should load it as early as possible. The reason is that
 modules might create watchers when they are loaded, and AnyEvent will
 decide on the event model to use as soon as it creates watchers, and it
 might chose the wrong one unless you load the correct one yourself.
 
-You can chose to use a rather inefficient pure-perl implementation by
-loading the C<AnyEvent::Impl::Perl> module, which gives you similar
-behaviour everywhere, but letting AnyEvent chose is generally better.
+You can chose to use a pure-perl implementation by loading the
+C<AnyEvent::Impl::Perl> module, which gives you similar behaviour
+everywhere, but letting AnyEvent chose the model is generally better.
+
+=head2 MAINLOOP EMULATION
+
+Sometimes (often for short test scripts, or even standalone programs who
+only want to use AnyEvent), you do not want to run a specific event loop.
+
+In that case, you can use a condition variable like this:
+
+   AnyEvent->condvar->recv;
+
+This has the effect of entering the event loop and looping forever.
+
+Note that usually your program has some exit condition, in which case
+it is better to use the "traditional" approach of storing a condition
+variable somewhere, waiting for it, and sending it when the program should
+exit cleanly.
+
 
 =head1 OTHER MODULES
 
@@ -633,14 +737,19 @@
 
 Provide read and write buffers and manages watchers for reads and writes.
 
-=item L<AnyEvent::HTTPD>
+=item L<AnyEvent::Socket>
 
-Provides a simple web application server framework.
+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::DNS>
 
-Provides asynchronous DNS resolver capabilities, beyond what
-L<AnyEvent::Util> offers.
+Provides rich asynchronous DNS resolver capabilities.
+
+=item L<AnyEvent::HTTPD>
+
+Provides a simple web application server framework.
 
 =item L<AnyEvent::FastPing>
 
@@ -693,31 +802,49 @@
 
 use Carp;
 
-our $VERSION = '3.4';
+our $VERSION = 4.1;
 our $MODEL;
 
 our $AUTOLOAD;
 our @ISA;
 
+our @REGISTRY;
+
+our $WIN32;
+
+BEGIN {
+   my $win32 = ! ! ($^O =~ /mswin32/i);
+   eval "sub WIN32(){ $win32 }";
+}
+
 our $verbose = $ENV{PERL_ANYEVENT_VERBOSE}*1;
 
-our @REGISTRY;
+our %PROTOCOL; # (ipv4|ipv6) => (1|2), higher numbers are preferred
+
+{
+   my $idx;
+   $PROTOCOL{$_} = ++$idx
+      for reverse split /\s*,\s*/,
+             $ENV{PERL_ANYEVENT_PROTOCOLS} || "ipv4,ipv6";
+}
 
 my @models = (
    [EV::                   => AnyEvent::Impl::EV::],
    [Event::                => AnyEvent::Impl::Event::],
-   [Tk::                   => AnyEvent::Impl::Tk::],
-   [Wx::                   => AnyEvent::Impl::POE::],
-   [Prima::                => AnyEvent::Impl::POE::],
    [AnyEvent::Impl::Perl:: => AnyEvent::Impl::Perl::],
-   # everything below here will not be autoprobed as the pureperl backend should work everywhere
-   [Glib::                 => AnyEvent::Impl::Glib::],
+   # everything below here will not be autoprobed
+   # as the pureperl backend should work everywhere
+   # and is usually faster
+   [Tk::                   => AnyEvent::Impl::Tk::],       # crashes with many handles
+   [Glib::                 => AnyEvent::Impl::Glib::],     # becomes extremely slow with many watchers
    [Event::Lib::           => AnyEvent::Impl::EventLib::], # too buggy
    [Qt::                   => AnyEvent::Impl::Qt::],       # requires special main program
    [POE::Kernel::          => AnyEvent::Impl::POE::],      # lasciate ogni speranza
+   [Wx::                   => AnyEvent::Impl::POE::],
+   [Prima::                => AnyEvent::Impl::POE::],
 );
 
-our %method = map +($_ => 1), qw(io timer signal child condvar one_event DESTROY);
+our %method = map +($_ => 1), qw(io timer time now signal child condvar one_event DESTROY);
 
 our @post_detect;
 
@@ -732,18 +859,19 @@
       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) {
       no strict 'refs';
+      local $SIG{__DIE__};
 
       if ($ENV{PERL_ANYEVENT_MODEL} =~ /^([a-zA-Z]+)$/) {
          my $model = "AnyEvent::Impl::$1";
@@ -810,18 +938,17 @@
 
 package AnyEvent::Base;
 
-# default implementation for ->condvar, ->wait, ->broadcast
+# default implementation for now and time
 
-sub condvar {
-   bless \my $flag, "AnyEvent::Base::CondVar"
-}
+use Time::HiRes ();
 
-sub AnyEvent::Base::CondVar::broadcast {
-   ${$_[0]}++;
-}
+sub time { Time::HiRes::time }
+sub now  { Time::HiRes::time }
+
+# default implementation for ->condvar
 
-sub AnyEvent::Base::CondVar::wait {
-   AnyEvent->one_event while !${$_[0]};
+sub condvar {
+   bless { @_ == 3 ? (_ae_cb => $_[2]) : () }, AnyEvent::CondVar::
 }
 
 # default implementation for ->signal
@@ -884,7 +1011,7 @@
    $PID_CB{$pid}{$arg{cb}} = $arg{cb};
 
    unless ($WNOHANG) {
-      $WNOHANG = eval { require POSIX; &POSIX::WNOHANG } || 1;
+      $WNOHANG = eval { local $SIG{__DIE__}; require POSIX; &POSIX::WNOHANG } || 1;
    }
 
    unless ($CHLD_W) {
@@ -905,6 +1032,66 @@
    undef $CHLD_W unless keys %PID_CB;
 }
 
+package AnyEvent::CondVar;
+
+our @ISA = AnyEvent::CondVar::Base::;
+
+package AnyEvent::CondVar::Base;
+
+use overload
+   '&{}'    => sub { my $self = shift; sub { $self->send (@_) } },
+   fallback => 1;
+
+sub _send {
+   # nop
+}
+
+sub send {
+   my $cv = shift;
+   $cv->{_ae_sent} = [@_];
+   (delete $cv->{_ae_cb})->($cv) if $cv->{_ae_cb};
+   $cv->_send;
+}
+
+sub croak {
+   $_[0]{_ae_croak} = $_[1];
+   $_[0]->send;
+}
+
+sub ready {
+   $_[0]{_ae_sent}
+}
+
+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]
+}
+
+sub cb {
+   $_[0]{_ae_cb} = $_[1] if @_ > 1;
+   $_[0]{_ae_cb}
+}
+
+sub begin {
+   ++$_[0]{_ae_counter};
+   $_[0]{_ae_end_cb} = $_[1] if @_ > 1;
+}
+
+sub end {
+   return if --$_[0]{_ae_counter};
+   &{ $_[0]{_ae_end_cb} || sub { $_[0]->send } };
+}
+
+# undocumented/compatibility with pre-3.4
+*broadcast = \&send;
+*wait      = \&_wait;
+
 =head1 SUPPLYING YOUR OWN EVENT MODEL INTERFACE
 
 This is an advanced topic that you do not normally need to use AnyEvent in
@@ -970,11 +1157,11 @@
 =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.
 
@@ -983,6 +1170,42 @@
 
   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.
+
+=item C<PERL_ANYEVENT_MAX_FORKS>
+
+The maximum number of child processes that C<AnyEvent::Util::fork_call>
+will create in parallel.
+
 =back
 
 =head1 EXAMPLE PROGRAM
@@ -1002,7 +1225,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
       },
    );
 
@@ -1017,7 +1240,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
 
@@ -1077,13 +1300,13 @@
    $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
    }
 
@@ -1091,11 +1314,11 @@
 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
@@ -1136,10 +1359,10 @@
 
    $fcp->txn_client_get ($url)->cb (sub {
       ...
-      $quit->broadcast;
+      $quit->send;
    });
 
-   $quit->wait;
+   $quit->recv;
 
 
 =head1 BENCHMARKS
@@ -1151,7 +1374,7 @@
 =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.
 
@@ -1178,7 +1401,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
@@ -1284,19 +1507,19 @@
 
 =head2 BENCHMARKING THE LARGE SERVER CASE
 
-This benchmark atcually benchmarks the event loop itself. It works by
-creating a number of "servers": each server consists of a socketpair, a
+This benchmark actually benchmarks the event loop itself. It works by
+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.
 
@@ -1308,7 +1531,7 @@
 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
@@ -1391,7 +1614,7 @@
 
 EV is again fastest.
 
-Perl again comes second. It is noticably faster than the C-based event
+Perl again comes second. It is noticeably faster than the C-based event
 loops Event and Glib, although the difference is too small to really
 matter.
 
@@ -1441,6 +1664,8 @@
 
 =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>.
 
@@ -1449,9 +1674,14 @@
 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