[Catalyst-commits] r7070 - in Catalyst-Runtime/5.80/trunk: . lib
lib/Catalyst lib/Catalyst/Engine t
andyg at dev.catalyst.perl.org
andyg at dev.catalyst.perl.org
Fri Oct 26 05:46:54 GMT 2007
Author: andyg
Date: 2007-10-26 05:46:54 +0100 (Fri, 26 Oct 2007)
New Revision: 7070
Modified:
Catalyst-Runtime/5.80/trunk/
Catalyst-Runtime/5.80/trunk/Changes
Catalyst-Runtime/5.80/trunk/Makefile.PL
Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Runtime.pm
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Stats.pm
Catalyst-Runtime/5.80/trunk/t/02pod.t
Catalyst-Runtime/5.80/trunk/t/03podcoverage.t
Log:
r23137 at macbookpro (orig r7039): jrockway | 2007-10-22 00:53:07 -0400
fix from Jon Schutz
r23146 at macbookpro (orig r7048): matthewt | 2007-10-23 18:09:58 -0400
force pod coverage testing for authors
r23212 at macbookpro (orig r7067): andyg | 2007-10-26 00:33:37 -0400
Clean up some ugly code with hard tabs
r23213 at macbookpro (orig r7068): andyg | 2007-10-26 00:35:27 -0400
Bump version to 5.7012
r23214 at macbookpro (orig r7069): andyg | 2007-10-26 00:44:42 -0400
Patch from Jon Schutz to add a proper SIGCHLD repear to Engine::HTTP to fix issue with system() returning -1 instead of the correct value
Property changes on: Catalyst-Runtime/5.80/trunk
___________________________________________________________________
Name: svk:merge
- 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:7030
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
+ 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:7069
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/Changes 2007-10-26 04:46:54 UTC (rev 7070)
@@ -1,6 +1,10 @@
# This file documents the revision history for Perl extension Catalyst.
-5.7011
+5.7012
+ - Fixed Engine::HTTP to use a proper SIGCHLD repear. Should fix issues with
+ system() calls returning -1 instead of the correct value. (Jon Schutz)
+
+5.7011 2007-10-18 20:40:00
- Allow multiple restart directories and added option to follow
symlinks in the HTTP::Restarter engine (Sebastian Willert)
- Fixed t/optional_http-server-restart.t so it actually tests
Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL 2007-10-26 04:46:54 UTC (rev 7070)
@@ -35,6 +35,8 @@
if (-e 'inc/.author') {
build_requires 'Test::Perl::Critic';
+ build_requires 'Test::Pod' => 1.14;
+ build_requires 'Test::Pod::Coverage' => 1.04;
if ($^O eq 'darwin') {
makemaker_args(dist => { PREOP => 'if [ "$$COPY_EXTENDED_ATTRIBUTES_DISABLE" != "true" ]; then'.
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm 2007-10-26 04:46:54 UTC (rev 7070)
@@ -11,6 +11,7 @@
use Socket;
use IO::Socket::INET ();
use IO::Select ();
+use POSIX ":sys_wait_h";
# For PAR
require Catalyst::Engine::HTTP::Restarter;
@@ -189,7 +190,7 @@
}
my $restart = 0;
- local $SIG{CHLD} = 'IGNORE';
+ local $SIG{CHLD} = \&_REAPER;
my $allowed = $options->{allowed} || { '127.0.0.1' => '255.255.255.255' };
my $addr = $host ? inet_aton($host) : INADDR_ANY;
@@ -525,6 +526,12 @@
sub _inet_addr { unpack "N*", inet_aton( $_[0] ) }
+sub _REAPER {
+ my $child;
+ while ( ( $child = waitpid( -1,WNOHANG ) ) > 0 ) { }
+ $SIG{CHLD} = \&_REAPER;
+}
+
=head1 SEE ALSO
L<Catalyst>, L<Catalyst::Engine>.
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Runtime.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Runtime.pm 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Runtime.pm 2007-10-26 04:46:54 UTC (rev 7070)
@@ -7,7 +7,7 @@
# Remember to update this in Catalyst as well!
-our $VERSION='5.7011';
+our $VERSION='5.7012';
=head1 NAME
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Stats.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Stats.pm 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Stats.pm 2007-10-26 04:46:54 UTC (rev 7070)
@@ -62,7 +62,7 @@
}
if ($params{parent}) {
# parent is explicitly defined
- $prev = $parent = $self->_get_uid($params{parent}) or return undef;
+ $prev = $parent = $self->_get_uid($params{parent});
}
if (!$parent) {
# Find previous node, which is either previous sibling or parent, for ref time.
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm 2007-10-26 04:46:54 UTC (rev 7070)
@@ -65,7 +65,7 @@
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.7011';
+our $VERSION = '5.7012';
sub import {
my ( $class, @arguments ) = @_;
@@ -1266,24 +1266,35 @@
}
}
+ my $uid = "$code" . $c->counter->{"$code"};
+
# is this a root-level call or a forwarded call?
if ( $callsub =~ /forward$/ ) {
# forward, locate the caller
if ( my $parent = $c->stack->[-1] ) {
- $c->stats->profile(begin => $action,
- parent => "$parent" . $c->counter->{"$parent"});
+ $c->stats->profile(
+ begin => $action,
+ parent => "$parent" . $c->counter->{"$parent"},
+ uid => $uid,
+ );
}
else {
# forward with no caller may come from a plugin
- $c->stats->profile(begin => $action);
+ $c->stats->profile(
+ begin => $action,
+ uid => $uid,
+ );
}
}
else {
# root-level call
- $c->stats->profile(begin => $action);
+ $c->stats->profile(
+ begin => $action,
+ uid => $uid,
+ );
}
return $action;
@@ -1291,7 +1302,7 @@
sub _stats_finish_execute {
my ( $c, $info ) = @_;
- $c->stats->profile(end => $info);
+ $c->stats->profile( end => $info );
}
=head2 $c->_localize_fields( sub { }, \%keys );
Modified: Catalyst-Runtime/5.80/trunk/t/02pod.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/02pod.t 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/t/02pod.t 2007-10-26 04:46:54 UTC (rev 7070)
@@ -2,6 +2,6 @@
eval "use Test::Pod 1.14";
plan skip_all => 'Test::Pod 1.14 required' if $@;
-plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD} || -f 'MANIFEST.SKIP';
+plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD} || -e 'inc/.author';
all_pod_files_ok();
Modified: Catalyst-Runtime/5.80/trunk/t/03podcoverage.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/03podcoverage.t 2007-10-26 04:44:42 UTC (rev 7069)
+++ Catalyst-Runtime/5.80/trunk/t/03podcoverage.t 2007-10-26 04:46:54 UTC (rev 7070)
@@ -2,6 +2,6 @@
eval "use Test::Pod::Coverage 1.04";
plan skip_all => 'Test::Pod::Coverage 1.04 required' if $@;
-plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD} || -f 'MANIFEST.SKIP';
+plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD} || -e 'inc/.author';
all_pod_coverage_ok();
More information about the Catalyst-commits
mailing list