ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/AnyEvent/lib/AnyEvent.pm
(Generate patch)

Comparing AnyEvent/lib/AnyEvent.pm (file contents):
Revision 1.262 by root, Tue Jul 28 13:08:17 2009 UTC vs.
Revision 1.265 by root, Wed Jul 29 13:10:58 2009 UTC

… …
1289} 1289}
1290 1290
1291# default implementation for ->signal 1291# default implementation for ->signal
1292 1292
1293our $HAVE_ASYNC_INTERRUPT; 1293our $HAVE_ASYNC_INTERRUPT;
1294
1295sub _have_async_interrupt() {
1296 $HAVE_ASYNC_INTERRUPT = 1*(!$ENV{PERL_ANYEVENT_AVOID_ASYNC_INTERRUPT}
1297 && eval "use Async::Interrupt 1.0 (); 1")
1298 unless defined $HAVE_ASYNC_INTERRUPT;
1299
1300 $HAVE_ASYNC_INTERRUPT
1301}
1302
1294our ($SIGPIPE_R, $SIGPIPE_W, %SIG_CB, %SIG_EV, $SIG_IO); 1303our ($SIGPIPE_R, $SIGPIPE_W, %SIG_CB, %SIG_EV, $SIG_IO);
1295our (%SIG_ASY, %SIG_ASY_W); 1304our (%SIG_ASY, %SIG_ASY_W);
1296our ($SIG_COUNT, $SIG_TW); 1305our ($SIG_COUNT, $SIG_TW);
1297 1306
1298sub _signal_exec { 1307sub _signal_exec {
… …
1325sub _sig_del { 1334sub _sig_del {
1326 undef $SIG_TW 1335 undef $SIG_TW
1327 unless --$SIG_COUNT; 1336 unless --$SIG_COUNT;
1328} 1337}
1329 1338
1339our $_sig_name_init; $_sig_name_init = sub {
1340 eval q{ # poor man's autoloading
1341 undef $_sig_name_init;
1342
1343 if (_have_async_interrupt) {
1344 *sig2num = \&Async::Interrupt::sig2num;
1345 *sig2name = \&Async::Interrupt::sig2name;
1346 } else {
1347 require Config;
1348
1349 my %signame2num;
1350 @signame2num{ split ' ', $Config::Config{sig_name} }
1351 = split ' ', $Config::Config{sig_num};
1352
1353 my @signum2name;
1354 @signum2name[values %signame2num] = keys %signame2num;
1355
1356 *sig2num = sub($) {
1357 $_[0] > 0 ? shift : $signame2num{+shift}
1358 };
1359 *sig2name = sub ($) {
1360 $_[0] > 0 ? $signum2name[+shift] : shift
1361 };
1362 }
1363 };
1364 die if $@;
1365};
1366
1367sub sig2num ($) { &$_sig_name_init; &sig2num }
1368sub sig2name($) { &$_sig_name_init; &sig2name }
1369
1330sub _signal { 1370sub signal {
1371 eval q{ # poor man's autoloading {}
1372 # probe for availability of Async::Interrupt
1373 if (_have_async_interrupt) {
1374 warn "AnyEvent: using Async::Interrupt for race-free signal handling.\n" if $VERBOSE >= 8;
1375
1376 $SIGPIPE_R = new Async::Interrupt::EventPipe;
1377 $SIG_IO = AnyEvent->io (fh => $SIGPIPE_R->fileno, poll => "r", cb => \&_signal_exec);
1378
1379 } else {
1380 warn "AnyEvent: using emulated perl signal handling with latency timer.\n" if $VERBOSE >= 8;
1381
1382 require Fcntl;
1383
1384 if (AnyEvent::WIN32) {
1385 require AnyEvent::Util;
1386
1387 ($SIGPIPE_R, $SIGPIPE_W) = AnyEvent::Util::portable_pipe ();
1388 AnyEvent::Util::fh_nonblocking ($SIGPIPE_R, 1) if $SIGPIPE_R;
1389 AnyEvent::Util::fh_nonblocking ($SIGPIPE_W, 1) if $SIGPIPE_W; # just in case
1390 } else {
1391 pipe $SIGPIPE_R, $SIGPIPE_W;
1392 fcntl $SIGPIPE_R, &Fcntl::F_SETFL, &Fcntl::O_NONBLOCK if $SIGPIPE_R;
1393 fcntl $SIGPIPE_W, &Fcntl::F_SETFL, &Fcntl::O_NONBLOCK if $SIGPIPE_W; # just in case
1394
1395 # not strictly required, as $^F is normally 2, but let's make sure...
1396 fcntl $SIGPIPE_R, &Fcntl::F_SETFD, &Fcntl::FD_CLOEXEC;
1397 fcntl $SIGPIPE_W, &Fcntl::F_SETFD, &Fcntl::FD_CLOEXEC;
1398 }
1399
1400 $SIGPIPE_R
1401 or Carp::croak "AnyEvent: unable to create a signal reporting pipe: $!\n";
1402
1403 $SIG_IO = AnyEvent->io (fh => $SIGPIPE_R, poll => "r", cb => \&_signal_exec);
1404 }
1405
1406 *signal = sub {
1331 my (undef, %arg) = @_; 1407 my (undef, %arg) = @_;
1332 1408
1333 my $signal = uc $arg{signal} 1409 my $signal = uc $arg{signal}
1334 or Carp::croak "required option 'signal' is missing"; 1410 or Carp::croak "required option 'signal' is missing";
1335 1411
1336 if ($HAVE_ASYNC_INTERRUPT) { 1412 if ($HAVE_ASYNC_INTERRUPT) {
1337 # async::interrupt 1413 # async::interrupt
1338 1414
1339 $signal = Async::Interrupt::sig2num ($signal); 1415 $signal = sig2num $signal;
1340 $SIG_CB{$signal}{$arg{cb}} = $arg{cb}; 1416 $SIG_CB{$signal}{$arg{cb}} = $arg{cb};
1341 1417
1342 $SIG_ASY{$signal} ||= new Async::Interrupt 1418 $SIG_ASY{$signal} ||= new Async::Interrupt
1343 cb => sub { undef $SIG_EV{$signal} }, 1419 cb => sub { undef $SIG_EV{$signal} },
1344 signal => $signal, 1420 signal => $signal,
1345 pipe => [$SIGPIPE_R->filenos], 1421 pipe => [$SIGPIPE_R->filenos],
1346 pipe_autodrain => 0, 1422 pipe_autodrain => 0,
1347 ; 1423 ;
1348 1424
1349 } else { 1425 } else {
1350 # pure perl 1426 # pure perl
1351 1427
1352 # AE::Util has been loaded in signal 1428 # AE::Util has been loaded in signal
1353 $signal = AnyEvent::Util::sig2name ($signal); 1429 $signal = sig2name $signal;
1354 $SIG_CB{$signal}{$arg{cb}} = $arg{cb}; 1430 $SIG_CB{$signal}{$arg{cb}} = $arg{cb};
1355 1431
1356 $SIG{$signal} ||= sub { 1432 $SIG{$signal} ||= sub {
1357 local $!; 1433 local $!;
1358 syswrite $SIGPIPE_W, "\x00", 1 unless %SIG_EV; 1434 syswrite $SIGPIPE_W, "\x00", 1 unless %SIG_EV;
1359 undef $SIG_EV{$signal}; 1435 undef $SIG_EV{$signal};
1436 };
1437
1438 # can't do signal processing without introducing races in pure perl,
1439 # so limit the signal latency.
1440 _sig_add;
1441 }
1442
1443 bless [$signal, $arg{cb}], "AnyEvent::Base::signal"
1360 }; 1444 };
1361 1445
1362 # can't do signal processing without introducing races in pure perl, 1446 *AnyEvent::Base::signal::DESTROY = sub {
1363 # so limit the signal latency. 1447 my ($signal, $cb) = @{$_[0]};
1448
1364 _sig_add; 1449 _sig_del;
1365 }
1366 1450
1367 bless [$signal, $arg{cb}], "AnyEvent::Base::signal" 1451 delete $SIG_CB{$signal}{$cb};
1368}
1369 1452
1370sub signal {
1371 # probe for availability of Async::Interrupt
1372 if (!$ENV{PERL_ANYEVENT_AVOID_ASYNC_INTERRUPT} && eval "use Async::Interrupt 1.0 (); 1") {
1373 warn "AnyEvent: using Async::Interrupt for race-free signal handling.\n" if $VERBOSE >= 8;
1374
1375 $HAVE_ASYNC_INTERRUPT = 1; 1453 $HAVE_ASYNC_INTERRUPT
1376 $SIGPIPE_R = new Async::Interrupt::EventPipe; 1454 ? delete $SIG_ASY{$signal}
1377 $SIG_IO = AnyEvent->io (fh => $SIGPIPE_R->fileno, poll => "r", cb => \&_signal_exec); 1455 : # delete doesn't work with older perls - they then
1378 1456 # print weird messages, or just unconditionally exit
1379 } else { 1457 # instead of getting the default action.
1380 warn "AnyEvent: using emulated perl signal handling with latency timer.\n" if $VERBOSE >= 8; 1458 undef $SIG{$signal}
1381 1459 unless keys %{ $SIG_CB{$signal} };
1382 require Fcntl;
1383
1384 if (AnyEvent::WIN32) {
1385 require AnyEvent::Util;
1386
1387 ($SIGPIPE_R, $SIGPIPE_W) = AnyEvent::Util::portable_pipe ();
1388 AnyEvent::Util::fh_nonblocking ($SIGPIPE_R) if $SIGPIPE_R;
1389 AnyEvent::Util::fh_nonblocking ($SIGPIPE_W) if $SIGPIPE_W; # just in case
1390 } else {
1391 pipe $SIGPIPE_R, $SIGPIPE_W;
1392 fcntl $SIGPIPE_R, &Fcntl::F_SETFL, &Fcntl::O_NONBLOCK if $SIGPIPE_R;
1393 fcntl $SIGPIPE_W, &Fcntl::F_SETFL, &Fcntl::O_NONBLOCK if $SIGPIPE_W; # just in case
1394
1395 # not strictly required, as $^F is normally 2, but let's make sure...
1396 fcntl $SIGPIPE_R, &Fcntl::F_SETFD, &Fcntl::FD_CLOEXEC;
1397 fcntl $SIGPIPE_W, &Fcntl::F_SETFD, &Fcntl::FD_CLOEXEC;
1398 } 1460 };
1399
1400 $SIGPIPE_R
1401 or Carp::croak "AnyEvent: unable to create a signal reporting pipe: $!\n";
1402
1403 $SIG_IO = AnyEvent->io (fh => $SIGPIPE_R, poll => "r", cb => \&_signal_exec);
1404 } 1461 };
1405 1462 die if $@;
1406 *signal = \&_signal;
1407 &signal 1463 &signal
1408}
1409
1410sub AnyEvent::Base::signal::DESTROY {
1411 my ($signal, $cb) = @{$_[0]};
1412
1413 _sig_del;
1414
1415 delete $SIG_CB{$signal}{$cb};
1416
1417 $HAVE_ASYNC_INTERRUPT
1418 ? delete $SIG_ASY{$signal}
1419 : # delete doesn't work with older perls - they then
1420 # print weird messages, or just unconditionally exit
1421 # instead of getting the default action.
1422 undef $SIG{$signal}
1423 unless keys %{ $SIG_CB{$signal} };
1424} 1464}
1425 1465
1426# default implementation for ->child 1466# default implementation for ->child
1427 1467
1428our %PID_CB; 1468our %PID_CB;

Diff Legend

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