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.264 by root, Wed Jul 29 12:42:09 2009 UTC vs.
Revision 1.265 by root, Wed Jul 29 13:10:58 2009 UTC

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

Diff Legend

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