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

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.358 by root, Sat Aug 13 02:35:32 2011 UTC vs.
Revision 1.364 by root, Mon Aug 15 12:56:53 2011 UTC

 Returns C<$AnyEvent::MODEL>, forcing autodetection of the event model
 if necessary. You should only call this function right before you would
 have created an AnyEvent watcher anyway, that is, as late as possible at
 runtime, and not e.g. during initialisation of your module.
+The effect of calling this function is as if a watcher had been created
+(specifically, actions that happen "when the first watcher is created"
+happen when calling detetc as well).
 If you need to do some initialisation before AnyEvent watchers are
 created, use C<post_detect>.
 =item $guard = AnyEvent::post_detect { BLOCK }
 BEGIN { AnyEvent::common_sense }
 use Carp ();
-our $VERSION = '5.34';
+our $VERSION = '6.01';
 our $MODEL;
 our @ISA;
 our @REGISTRY;
    [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 };
    # 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;
    }
    if ($ENV{PERL_ANYEVENT_DEBUG_WRAP}) {
    if (exists $ENV{PERL_ANYEVENT_DEBUG_SHELL}) {
       require AnyEvent::Socket;
       require AnyEvent::Debug;
+      my $shell = $ENV{PERL_ANYEVENT_DEBUG_SHELL};
+      $shell =~ s/\$\$/$$/g;
-      my ($host, $service) = AnyEvent::Socket::parse_hostport ($ENV{PERL_ANYEVENT_DEBUG_SHELL});
+      my ($host, $service) = AnyEvent::Socket::parse_hostport ($shell);
       $AnyEvent::Debug::SHELL = AnyEvent::Debug::shell ($host, $service);
    }
    (shift @post_detect)->() while @post_detect;
    undef @post_detect;
 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;
+         *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;
+         *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";
 }
 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
+If this env variable is set, then its contents will be interpreted by
-interpreted by C<AnyEvent::Socket::parse_hostport> and an
+C<AnyEvent::Socket::parse_hostport> (after replacing every occurance of
-C<AnyEvent::Debug::shell> is bound on that port. The shell object is saved
+C<$$> by the process pid) and an C<AnyEvent::Debug::shell> is bound on
-in C<$AnyEvent::Debug::SHELL>.
+that port. The shell object is saved in C<$AnyEvent::Debug::SHELL>.
+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.sock>, you could use this:
+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>
 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.
 (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

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent.pm (file contents): Revision 1.358 by root, Sat Aug 13 02:35:32 2011 UTC vs. Revision 1.364 by root, Mon Aug 15 12:56:53 2011 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.358 by root, Sat Aug 13 02:35:32 2011 UTC vs.
Revision 1.364 by root, Mon Aug 15 12:56:53 2011 UTC