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

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.381 by root, Thu Sep 1 22:09:25 2011 UTC vs.
Revision 1.386 by root, Mon Sep 26 11:32:19 2011 UTC

 use Carp ();
 our $VERSION = '6.02';
 our $MODEL;
 our @ISA;
 our @REGISTRY;
 our $VERBOSE;
+our $MAX_SIGNAL_LATENCY = 10;
+our %PROTOCOL; # (ipv4|ipv6) => (1|2), higher numbers are preferred
 BEGIN {
    require "AnyEvent/constants.pl";
    eval "sub TAINT (){" . (${^TAINT}*1) . "}";
    @ENV{grep /^PERL_ANYEVENT_/, keys %ENV} = ()
       if ${^TAINT};
    # $ENV{PERL_ANYEVENT_xxx} now valid
-   $VERBOSE = length $ENV{PERL_ANYEVENT_VERBOSE} ? $ENV{PERL_ANYEVENT_VERBOSE}*1 : 3;
+   $VERBOSE = length $ENV{PERL_ANYEVENT_VERBOSE} ? $ENV{PERL_ANYEVENT_VERBOSE}*1 : 4;
-}
-our $MAX_SIGNAL_LATENCY = 10;
-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";
 }
    ()
 }
 sub log($$;@) {
    # only load the big bloated module when we actually are about to log something
-   if ($_[0] <= $VERBOSE) { # also catches non-numeric levels(!)
+   if ($_[0] <= ($VERBOSE || 1)) { # also catches non-numeric levels(!) and fatal
-      require AnyEvent::Log;
+      require AnyEvent::Log; # among other things, sets $VERBOSE to 9
       # AnyEvent::Log overwrites this function
       goto &log;
    }
    0 # not logged
 }
+sub logger($;$) {
+   package AnyEvent::Log;
+   my ($level, $renabled) = @_;
+   $$renabled = $level <= $VERBOSE;
+   my $pkg = (caller)[0];
+   my $logger = [$pkg, $level, $renabled];
+   our %LOGGER;
+   $LOGGER{$logger+0} = $logger;
+   require AnyEvent::Util;
+   my $guard = AnyEvent::Util::guard (sub {
+      # "clean up"
+      delete $LOGGER{$logger+0};
+   });
+   sub {
+      return 0 unless $$renabled;
+      $guard if 0; # keep guard alive, but don't cause runtime overhead
+      require AnyEvent::Log unless $AnyEvent::Log::VERSION;
+      package AnyEvent::Log;
+      _log ($logger->[0], $level, @_) # logger->[0] has been converted at load time
+   }
+}
 if (length $ENV{PERL_ANYEVENT_LOG}) {
    require AnyEvent::Log; # AnyEvent::Log does the thing for us
 }
 our @models = (
-   [EV::                   => AnyEvent::Impl::EV::   , 1],
+   [EV::                   => AnyEvent::Impl::EV::],
-   [AnyEvent::Loop::       => AnyEvent::Impl::Perl:: , 1],
+   [AnyEvent::Loop::       => AnyEvent::Impl::Perl::],
    # everything below here will not (normally) be autoprobed
    # as the pure perl backend should work everywhere
    # and is usually faster
+   [Irssi::                => AnyEvent::Impl::Irssi::],    # Irssi has a bogus "Event" package, so msut be near the top
-   [Event::                => AnyEvent::Impl::Event::, 1],
+   [Event::                => AnyEvent::Impl::Event::],    # slow, stable
-   [Glib::                 => AnyEvent::Impl::Glib:: , 1], # becomes extremely slow with many watchers
+   [Glib::                 => AnyEvent::Impl::Glib::],     # becomes extremely slow with many watchers
+   # everything below here should not be autoloaded
    [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
    [POE::Kernel::          => AnyEvent::Impl::POE::],      # lasciate ogni speranza
    [Wx::                   => AnyEvent::Impl::POE::],
    [Prima::                => AnyEvent::Impl::POE::],
 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
+   # IO::Async::Loop::AnyEvent is extremely evil, refuse to work with it
+   # the author knows about the problems and what it does to AnyEvent as a whole
+   # (and the ability of others to use AnyEvent), but simply wants to abuse AnyEvent
+   # anyway.
+   AnyEvent::log fatal => "AnyEvent: IO::Async::Loop::AnyEvent detected - this module is broken by design,\n"
+                          . "abuses internals and breaks AnyEvent, will not continue."
+      if exists $INC{"IO/Async/Loop/AnyEvent.pm"};
    local $!; # for good measure
    local $SIG{__DIE__}; # we use eval
    # free some memory
    *detect = sub () { $MODEL };
       $model = "AnyEvent::Impl::$model" unless $model =~ s/::$//;
       if (eval "require $model") {
          AnyEvent::log 7 => "loaded model '$model' (forced by \$ENV{PERL_ANYEVENT_MODEL}), using it.";
          $MODEL = $model;
       } else {
-         AnyEvent::log 5 => "unable to load model '$model' (from \$ENV{PERL_ANYEVENT_MODEL}):\n$@";
+         AnyEvent::log 4 => "unable to load model '$model' (from \$ENV{PERL_ANYEVENT_MODEL}):\n$@";
       }
    }
    # check for already loaded models
    unless ($MODEL) {
       }
       unless ($MODEL) {
          # try to autoload a model
          for (@REGISTRY, @models) {
-            my ($package, $model, $autoload) = @$_;
+            my ($package, $model) = @$_;
             if (
-               $autoload
-               and eval "require $package"
+               eval "require $package"
                and ${"$package\::VERSION"} > 0
                and eval "require $model"
             ) {
                AnyEvent::log 7 => "autoloaded model '$model', using it.";
                $MODEL = $model;
                last;
             }
          }
          $MODEL
-           or die "AnyEvent: backend autodetection failed - did you properly install AnyEvent?";
+           or AnyEvent::log fatal => "AnyEvent: backend autodetection failed - did you properly install AnyEvent?";
       }
    }
    # free memory only needed for probing
    undef @models;
 C<PERL_ANYEVENT_STRICT=1> in your environment while developing programs
 can be very useful, however.
 =item C<PERL_ANYEVENT_DEBUG_SHELL>
-If this env variable is set, then its contents will be interpreted by
+If this env variable is nonempty, then its contents will be interpreted by
-C<AnyEvent::Socket::parse_hostport> (after replacing every occurance of
+C<AnyEvent::Socket::parse_hostport> and C<AnyEvent::Debug::shell> (after
-C<$$> by the process pid) and an C<AnyEvent::Debug::shell> is bound on
+replacing every occurance of C<$$> by the process pid). The shell object
-that port. The shell object is saved in C<$AnyEvent::Debug::SHELL>.
+is saved in C<$AnyEvent::Debug::SHELL>.
 This happens 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=/tmp/debug\$\$.sock perlprog
+   # connect with e.g.: socat readline /tmp/debug123.sock
+Or to bind to tcp port 4545 on localhost:
+   PERL_ANYEVENT_DEBUG_SHELL=127.0.0.1:4545 perlprog
+   # connect with e.g.: telnet localhost 4545
-Note that creating sockets in F</tmp> is very unsafe on multiuser
+Note that creating sockets in F</tmp> or on localhost is very unsafe on
-systems.
+multiuser systems.
 =item C<PERL_ANYEVENT_DEBUG_WRAP>
 Can be set to C<0>, C<1> or C<2> and enables wrapping of all watchers for
 debugging purposes. See C<AnyEvent::Debug::wrap> for details.

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent.pm (file contents): Revision 1.381 by root, Thu Sep 1 22:09:25 2011 UTC vs. Revision 1.386 by root, Mon Sep 26 11:32:19 2011 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.381 by root, Thu Sep 1 22:09:25 2011 UTC vs.
Revision 1.386 by root, Mon Sep 26 11:32:19 2011 UTC