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

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.379 by root, Fri Aug 26 18:09:04 2011 UTC vs.
Revision 1.384 by root, Mon Sep 5 07:21:54 2011 UTC

 If L<AnyEvent::Log> is not loaded then this function makes a simple test
 to see whether the message will be logged. If the test succeeds it will
 load AnyEvent::Log and call C<AnyEvent::Log::log> - consequently, look at
 the L<AnyEvent::Log> documentation for details.
-If the test fails it will simply return.
+If the test fails it will simply return. Right now this happens when a
+numerical loglevel is used and it is larger than the level specified via
+C<$ENV{PERL_ANYEVENT_VERBOSE}>.
 If you want to sprinkle loads of logging calls around your code, consider
 creating a logger callback with the C<AnyEvent::Log::logger> function,
 which can reduce typing, codesize and can reduce the logging overhead
 enourmously.
 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) . "}";
       for grep s/^AE_// && !exists $ENV{"PERL_ANYEVENT_$_"}, keys %ENV;
    @ENV{grep /^PERL_ANYEVENT_/, keys %ENV} = ()
       if ${^TAINT};
-   $VERBOSE = $ENV{PERL_ANYEVENT_VERBOSE}*1;
+   # $ENV{PERL_ANYEVENT_xxx} now valid
-}
-our $MAX_SIGNAL_LATENCY = 10;
+   $VERBOSE = length $ENV{PERL_ANYEVENT_VERBOSE} ? $ENV{PERL_ANYEVENT_VERBOSE}*1 : 4;
-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
 }
       $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) {
                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;
 =over 4
 =item C<PERL_ANYEVENT_VERBOSE>
-By default, AnyEvent will be completely silent except in fatal
+By default, AnyEvent will only log messages with loglevel C<3>
-conditions. You can set this environment variable to make AnyEvent more
+(C<critical>) or higher (see L<AnyEvent::Log>). You can set this
+environment variable to a numerical loglevel to make AnyEvent more (or
+less) talkative.
-talkative. If you want to do more than just set the global logging level
+If you want to do more than just set the global logging level
 you should have a look at C<PERL_ANYEVENT_LOG>, which allows much more
 complex specifications.
+When set to C<0> (C<off>), then no messages whatsoever will be logged with
+the default logging settings.
-When set to C<5> or higher (warn), causes AnyEvent to warn about unexpected
+When set to C<5> or higher (C<warn>), causes AnyEvent to warn about
-conditions, such as not being able to load the event model specified by
+unexpected conditions, such as not being able to load the event model
-C<PERL_ANYEVENT_MODEL>, or a guard callback throwing an exception - this
+specified by C<PERL_ANYEVENT_MODEL>, or a guard callback throwing an
-is the minimum recommended level.
+exception - this is the minimum recommended level.
 When set to C<7> or higher (info), cause AnyEvent to report which event model it
 chooses.
 When set to C<8> or higher (debug), then AnyEvent will report extra information on
 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.379 by root, Fri Aug 26 18:09:04 2011 UTC vs. Revision 1.384 by root, Mon Sep 5 07:21:54 2011 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.379 by root, Fri Aug 26 18:09:04 2011 UTC vs.
Revision 1.384 by root, Mon Sep 5 07:21:54 2011 UTC