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

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.261 by root, Tue Jul 28 12:56:17 2009 UTC vs.
Revision 1.264 by root, Wed Jul 29 12:42:09 2009 UTC

 }
 # default implementation for ->signal
 our $HAVE_ASYNC_INTERRUPT;
+sub _have_async_interrupt() {
+   $HAVE_ASYNC_INTERRUPT = 1*(!$ENV{PERL_ANYEVENT_AVOID_ASYNC_INTERRUPT}
+                              && eval "use Async::Interrupt 1.0 (); 1")
+      unless defined $HAVE_ASYNC_INTERRUPT;
+   $HAVE_ASYNC_INTERRUPT
+}
 our ($SIGPIPE_R, $SIGPIPE_W, %SIG_CB, %SIG_EV, $SIG_IO);
 our (%SIG_ASY, %SIG_ASY_W);
 our ($SIG_COUNT, $SIG_TW);
 sub _signal_exec {
 sub _sig_del {
    undef $SIG_TW
       unless --$SIG_COUNT;
 }
+our $_sig_name_init; $_sig_name_init = sub {
+   undef $_sig_name_init;
+   if (_have_async_interrupt) {
+      *sig2num  = \&Async::Interrupt::sig2num;
+      *sig2name = \&Async::Interrupt::sig2name;
+   } else {
+      require Config;
+      my %signame2num;
+      @signame2num{ split ' ', $Config::Config{sig_name} }
+                     = split ' ', $Config::Config{sig_num};
+      my @signum2name;
+      @signum2name[values %signame2num] = keys %signame2num;
+      *sig2num = sub($) {
+         $_[0] > 0 ? shift : $signame2num{+shift}
+      };
+      *sig2name = sub ($) {
+         $_[0] > 0 ? $signum2name[+shift] : shift
+      };
+   }
+};
+sub sig2num ($) { &$_sig_name_init; &sig2num  }
+sub sig2name($) { &$_sig_name_init; &sig2name }
 sub _signal {
    my (undef, %arg) = @_;
    my $signal = uc $arg{signal}
       or Carp::croak "required option 'signal' is missing";
    if ($HAVE_ASYNC_INTERRUPT) {
       # async::interrupt
-      $signal = Async::Interrupt::sig2num ($signal);
+      $signal = sig2num $signal;
       $SIG_CB{$signal}{$arg{cb}} = $arg{cb};
-      $SIG_ASY{$signal} ||= do {
+      $SIG_ASY{$signal} ||= new Async::Interrupt
-         my $asy = new Async::Interrupt
-            cb     => sub { undef $SIG_EV{$signal} },
+         cb             => sub { undef $SIG_EV{$signal} },
-            signal => $signal,
+         signal         => $signal,
-            pipe   => [$SIGPIPE_R->filenos],
+         pipe           => [$SIGPIPE_R->filenos],
-         ;
-         $asy->pipe_autodrain (0);
+         pipe_autodrain => 0,
-         $asy
-      };
+      ;
    } else {
       # pure perl
       # AE::Util has been loaded in signal
-      $signal = AnyEvent::Util::sig2name ($signal);
+      $signal = sig2name $signal;
       $SIG_CB{$signal}{$arg{cb}} = $arg{cb};
       $SIG{$signal} ||= sub {
          local $!;
          syswrite $SIGPIPE_W, "\x00", 1 unless %SIG_EV;
    bless [$signal, $arg{cb}], "AnyEvent::Base::signal"
 }
 sub signal {
    # probe for availability of Async::Interrupt
-   if (!$ENV{PERL_ANYEVENT_AVOID_ASYNC_INTERRUPT} && eval "use Async::Interrupt 1.0 (); 1") {
+   if (_have_async_interrupt) {
       warn "AnyEvent: using Async::Interrupt for race-free signal handling.\n" if $VERBOSE >= 8;
-      $HAVE_ASYNC_INTERRUPT = 1;
       $SIGPIPE_R = new Async::Interrupt::EventPipe;
       $SIG_IO = AnyEvent->io (fh => $SIGPIPE_R->fileno, poll => "r", cb => \&_signal_exec);
    } else {
       warn "AnyEvent: using emulated perl signal handling with latency timer.\n" if $VERBOSE >= 8;

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent.pm (file contents): Revision 1.261 by root, Tue Jul 28 12:56:17 2009 UTC vs. Revision 1.264 by root, Wed Jul 29 12:42:09 2009 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.261 by root, Tue Jul 28 12:56:17 2009 UTC vs.
Revision 1.264 by root, Wed Jul 29 12:42:09 2009 UTC