In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/8f3964af7ae5331db258ef371ed6879d127851aa?hp=47550813adf9ff4023595a3d439a9080e8fa9040>
- Log ----------------------------------------------------------------- commit 8f3964af7ae5331db258ef371ed6879d127851aa Author: Nicholas Clark <[email protected]> Date: Sat Apr 17 21:24:21 2010 +0100 Dispatch signals in infinite loops such as 1 while 1; With the move of PERL_ASYNC_CHECK() out from the runloop to control ops, infinite loops became truely infinite, as their optree has no control ops. Hence add a PERL_ASYNC_CHECK() to pp_unstack to ensure signals will be dispatched. Bug noticed by Jerry Hedden. ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 + pp_hot.c | 1 + t/op/sigdispatch.t | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) create mode 100755 t/op/sigdispatch.t diff --git a/MANIFEST b/MANIFEST index eae0fff..5ca4f13 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4471,6 +4471,7 @@ t/op/reset.t See if reset operator works t/op/reverse.t See if reverse operator works t/op/runlevel.t See if die() works from perl_call_*() t/op/setpgrpstack.t See if setpgrp works +t/op/sigdispatch.t See if signals are always dispatched t/op/sleep.t See if sleep works t/op/smartmatch.t See if the ~~ operator works t/op/sort.t See if sort works diff --git a/pp_hot.c b/pp_hot.c index 6224f3d..e1b1e8c 100644 --- a/pp_hot.c +++ b/pp_hot.c @@ -216,6 +216,7 @@ PP(pp_unstack) { dVAR; I32 oldsave; + PERL_ASYNC_CHECK(); TAINT_NOT; /* Each statement is presumed innocent */ PL_stack_sp = PL_stack_base + cxstack[cxstack_ix].blk_oldsp; FREETMPS; diff --git a/t/op/sigdispatch.t b/t/op/sigdispatch.t new file mode 100755 index 0000000..5d9908e --- /dev/null +++ b/t/op/sigdispatch.t @@ -0,0 +1,38 @@ +#!perl -w + +# We assume that TestInit has been used. + +BEGIN { + require './test.pl'; +} + +use strict; + +plan tests => 4; + +watchdog(10); + +$SIG{ALRM} = sub { + die "Alarm!\n"; +}; + +pass('before the first loop'); + +alarm 2; + +eval { + 1 while 1; +}; + +is($@, "Alarm!\n", 'after the first loop'); + +pass('before the second loop'); + +alarm 2; + +eval { + while (1) { + } +}; + +is($@, "Alarm!\n", 'after the second loop'); -- Perl5 Master Repository
