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

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.359 by root, Sat Aug 13 16:11:33 2011 UTC vs.
Revision 1.365 by root, Tue Aug 16 14:47:26 2011 UTC

 It should use C<postpone>:
    AnyEvent::postpone { $cb->(undef) }, return # signal error to callback, later
       if $some_error_condition;
+=item AnyEvent::log $level, $msg[, @args]
+Log the given C<$msg> at the given C<$level>.
+Loads AnyEvent::Log on first use and calls C<AnyEvent::Log::log> -
+consequently, look at the L<AnyEvent::Log> documentation for details.
 =back
 =head1 WHAT TO DO IN A MODULE
 As a module author, you should C<use AnyEvent> and call AnyEvent methods
 BEGIN { AnyEvent::common_sense }
 use Carp ();
-our $VERSION = '5.34';
+our $VERSION = '6.01';
 our $MODEL;
 our @ISA;
 our @REGISTRY;
    delete @ENV{grep /^PERL_ANYEVENT_/, keys %ENV}
       if ${^TAINT};
    $VERBOSE = $ENV{PERL_ANYEVENT_VERBOSE}*1;
 }
 our $MAX_SIGNAL_LATENCY = 10;
 our %PROTOCOL; # (ipv4|ipv6) => (1|2), higher numbers are preferred
    push @POSTPONE, shift;
    $POSTPONE_W ||= AE::timer (0, 0, \&_postpone_exec);
    ()
+}
+sub log($$;@) {
+   require AnyEvent::Log;
+   # AnyEvent::Log overwrites this function
+   goto &log;
 }
 our @models = (
    [EV::                   => AnyEvent::Impl::EV::   , 1],
    [AnyEvent::Loop::       => AnyEvent::Impl::Perl:: , 1],
    [IO::Async::Loop::      => AnyEvent::Impl::IOAsync::],  # a bitch to autodetect
    [Cocoa::EventLoop::     => AnyEvent::Impl::Cocoa::],
    [FLTK::                 => AnyEvent::Impl::FLTK2::],
 );
+our @isa_hook;
+sub _isa_set {
+   my @pkg = ("AnyEvent", (map $_->[0], grep defined, @isa_hook), $MODEL);
+   @{"$pkg[$_-1]::ISA"} = $pkg[$_]
+      for 1 .. $#pkg;
+   grep $_ && $_->[1], @isa_hook
+      and AE::_reset ();
+}
+# used for hooking AnyEvent::Strict and AnyEvent::Debug::Wrap into the class hierarchy
+sub _isa_hook($$;$) {
+   my ($i, $pkg, $reset_ae) = @_;
+   $isa_hook[$i] = $pkg ? [$pkg, $reset_ae] : undef;
+   _isa_set;
+}
 # all autoloaded methods reserve the complete glob, not just the method slot.
 # due to bugs in perls method cache implementation.
 our @methods = qw(io timer time now now_update signal child idle condvar);
 sub detect() {
+   return $MODEL if $MODEL; # some programs keep references to detect
    local $!; # for good measure
    local $SIG{__DIE__}; # we use eval
    # free some memory
    *detect = sub () { $MODEL };
    if ($ENV{PERL_ANYEVENT_MODEL} =~ /^([a-zA-Z0-9:]+)$/) {
       my $model = $1;
       $model = "AnyEvent::Impl::$model" unless $model =~ s/::$//;
       if (eval "require $model") {
          $MODEL = $model;
-         warn "AnyEvent: loaded model '$model' (forced by \$ENV{PERL_ANYEVENT_MODEL}), using it.\n" if $VERBOSE >= 2;
+         AnyEvent::log 7 => "loaded model '$model' (forced by \$ENV{PERL_ANYEVENT_MODEL}), using it."
+            if $VERBOSE >= 7;
       } else {
-         warn "AnyEvent: unable to load model '$model' (from \$ENV{PERL_ANYEVENT_MODEL}):\n$@" if $VERBOSE;
+         AnyEvent::log warn => "unable to load model '$model' (from \$ENV{PERL_ANYEVENT_MODEL}):\n$@";
       }
    }
    # check for already loaded models
    unless ($MODEL) {
       for (@REGISTRY, @models) {
          my ($package, $model) = @$_;
          if (${"$package\::VERSION"} > 0) {
             if (eval "require $model") {
                $MODEL = $model;
-               warn "AnyEvent: autodetected model '$model', using it.\n" if $VERBOSE >= 2;
+               AnyEvent::log 7 => "autodetected model '$model', using it."
+                  if $VERBOSE >= 7;
                last;
             }
          }
       }
                and eval "require $package"
                and ${"$package\::VERSION"} > 0
                and eval "require $model"
             ) {
                $MODEL = $model;
-               warn "AnyEvent: autoloaded model '$model', using it.\n" if $VERBOSE >= 2;
+               AnyEvent::log 7 => "autoloaded model '$model', using it."
+                  if $VERBOSE >= 7;
                last;
             }
          }
          $MODEL
-           or die "AnyEvent: backend autodetection failed - did you properly install AnyEvent?\n";
+           or die "AnyEvent: backend autodetection failed - did you properly install AnyEvent?";
       }
    }
    # free memory only needed for probing
    undef @models;
    undef @REGISTRY;
    push @{"$MODEL\::ISA"}, "AnyEvent::Base";
-   unshift @ISA, $MODEL;
    # now nuke some methods that are overridden by the backend.
    # SUPER usage is not allowed in these.
    for (qw(time signal child idle)) {
       undef &{"AnyEvent::Base::$_"}
          if defined &{"$MODEL\::$_"};
    }
+   _isa_set;
    if ($ENV{PERL_ANYEVENT_STRICT}) {
       require AnyEvent::Strict;
    }
       sub time() {
          AnyEvent->time
       }
       *postpone = \&AnyEvent::postpone;
+      *log      = \&AnyEvent::log;
    };
    die if $@;
 }
 BEGIN { _reset }
 sub time {
    eval q{ # poor man's autoloading {}
       # probe for availability of Time::HiRes
       if (eval "use Time::HiRes (); Time::HiRes::time (); 1") {
-         warn "AnyEvent: using Time::HiRes for sub-second timing accuracy.\n" if $VERBOSE >= 8;
+         AnyEvent::log 8 => "AnyEvent: using Time::HiRes for sub-second timing accuracy."
+            if $AnyEvent::VERBOSE >= 8;
+         *time     = sub { Time::HiRes::time () };
-         *AE::time = \&Time::HiRes::time;
+         *AE::time = \&    Time::HiRes::time     ;
          # if (eval "use POSIX (); (POSIX::times())...
       } else {
-         warn "AnyEvent: using built-in time(), WARNING, no sub-second resolution!\n" if $VERBOSE;
+         AnyEvent::log critical => "using built-in time(), WARNING, no sub-second resolution!";
+         *time     = sub   { CORE::time };
-         *AE::time = sub (){ time }; # epic fail
+         *AE::time = sub (){ CORE::time };
       }
-      *time = sub { AE::time }; # different prototypes
+      *now = \&time;
    };
    die if $@;
    &time
 }
 *now = \&time;
 sub now_update { }
 sub _poll {
    Carp::croak "$AnyEvent::MODEL does not support blocking waits. Caught";
 }
 sub signal {
    eval q{ # poor man's autoloading {}
       # probe for availability of Async::Interrupt
       if (_have_async_interrupt) {
-         warn "AnyEvent: using Async::Interrupt for race-free signal handling.\n" if $VERBOSE >= 8;
+         AnyEvent::log 8 => "using Async::Interrupt for race-free signal handling."
+            if $AnyEvent::VERBOSE >= 8;
          $SIGPIPE_R = new Async::Interrupt::EventPipe;
          $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;
+         AnyEvent::log 8 => "using emulated perl signal handling with latency timer."
+            if $AnyEvent::VERBOSE >= 8;
          if (AnyEvent::WIN32) {
             require AnyEvent::Util;
             ($SIGPIPE_R, $SIGPIPE_W) = AnyEvent::Util::portable_pipe ();
 By default, AnyEvent will be completely silent except in fatal
 conditions. You can set this environment variable to make AnyEvent more
 talkative.
-When set to C<1> or higher, causes AnyEvent to warn about unexpected
+When set to C<5> or higher, causes AnyEvent to warn about unexpected
 conditions, such as not being able to load the event model specified by
 C<PERL_ANYEVENT_MODEL>.
-When set to C<2> or higher, cause AnyEvent to report to STDERR which event
+When set to C<7> or higher, cause AnyEvent to report to STDERR which event
 model it chooses.
 When set to C<8> or higher, then AnyEvent will report extra information on
 which optional modules it loads and how it implements certain features.
 This takes place when the first watcher is created.
 For example, to bind a debug shell on a unix domain socket in
 F<< /tmp/debug<pid>.sock >>, you could use this:
-   PERL_ANYEVENT_DEBUG_SHELL=unix/:/tmp/debug\$\$.sock perlprog
+   PERL_ANYEVENT_DEBUG_SHELL=/tmp/debug\$\$.sock perlprog
 Note that creating sockets in F</tmp> is very unsafe on multiuser
 systems.
 =item C<PERL_ANYEVENT_DEBUG_WRAP>
 (even when used without AnyEvent), but most event loops have acceptable
 performance with or without AnyEvent.
 =item * The overhead AnyEvent adds is usually much smaller than the overhead of
 the actual event loop, only with extremely fast event loops such as EV
-adds AnyEvent significant overhead.
+does AnyEvent add significant overhead.
 =item * You should avoid POE like the plague if you want performance or
 reasonable memory usage.
 =back
 Tutorial/Introduction: L<AnyEvent::Intro>.
 FAQ: L<AnyEvent::FAQ>.
-Utility functions: L<AnyEvent::Util>.
+Utility functions: L<AnyEvent::Util> (misc. grab-bag), L<AnyEvent::Log>
+(simply logging).
+Development/Debugging: L<AnyEvent::Strict> (stricter checking),
+L<AnyEvent::Debug> (interactive shell, watcher tracing).
-Event modules: L<AnyEvent::Loop>, L<EV>, L<EV::Glib>, L<Glib::EV>,
+Supported event modules: L<AnyEvent::Loop>, L<EV>, L<EV::Glib>,
-L<Event>, L<Glib::Event>, L<Glib>, L<Tk>, L<Event::Lib>, L<Qt>, L<POE>.
+L<Glib::EV>, L<Event>, L<Glib::Event>, L<Glib>, L<Tk>, L<Event::Lib>,
+L<Qt>, L<POE>, L<FLTK>.
 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>, L<AnyEvent::Impl::IOAsync>, L<Anyevent::Impl::Irssi>.
+L<AnyEvent::Impl::POE>, L<AnyEvent::Impl::IOAsync>, L<Anyevent::Impl::Irssi>,
+L<AnyEvent::Impl::FLTK>.
-Non-blocking file handles, sockets, TCP clients and
+Non-blocking handles, pipes, stream sockets, TCP clients and
 servers: L<AnyEvent::Handle>, L<AnyEvent::Socket>, L<AnyEvent::TLS>.
 Asynchronous DNS: L<AnyEvent::DNS>.
 Thread support: L<Coro>, L<Coro::AnyEvent>, L<Coro::EV>, L<Coro::Event>.

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent.pm (file contents): Revision 1.359 by root, Sat Aug 13 16:11:33 2011 UTC vs. Revision 1.365 by root, Tue Aug 16 14:47:26 2011 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.359 by root, Sat Aug 13 16:11:33 2011 UTC vs.
Revision 1.365 by root, Tue Aug 16 14:47:26 2011 UTC