Author: stas Date: Wed Dec 8 17:40:01 2004 New Revision: 111336 URL: http://svn.apache.org/viewcvs?view=rev&rev=111336 Log: s/server_shutdown_register_cleanup/server_shutdown_cleanup_register/
Modified: perl/modperl/trunk/Changes perl/modperl/trunk/t/conf/modperl_extra.pl perl/modperl/trunk/t/response/TestAPI/server_util.pm perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h perl/modperl/trunk/xs/maps/modperl_functions.map perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Modified: perl/modperl/trunk/Changes Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=111336&p1=perl/modperl/trunk/Changes&r1=111335&p2=perl/modperl/trunk/Changes&r2=111336 ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Wed Dec 8 17:40:01 2004 @@ -12,7 +12,7 @@ =item 1.99_18-dev -a new function Apache::ServerUtil::server_shutdown_register_cleanup to +a new function Apache::ServerUtil::server_shutdown_cleanup_register to register cleanups to be run at server shutdown. [Stas] $bb->cleanup is no more segfaulting (was segfaulting due to a broken Modified: perl/modperl/trunk/t/conf/modperl_extra.pl Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/conf/modperl_extra.pl?view=diff&rev=111336&p1=perl/modperl/trunk/t/conf/modperl_extra.pl&r1=111335&p2=perl/modperl/trunk/t/conf/modperl_extra.pl&r2=111336 ============================================================================== --- perl/modperl/trunk/t/conf/modperl_extra.pl (original) +++ perl/modperl/trunk/t/conf/modperl_extra.pl Wed Dec 8 17:40:01 2004 @@ -52,7 +52,7 @@ test_perl_ithreads(); -test_server_shutdown_register_cleanup(); +test_server_shutdown_cleanup_register(); @@ -200,16 +200,16 @@ } } -sub test_server_shutdown_register_cleanup { +sub test_server_shutdown_cleanup_register { # we can't really test the functionality since it happens at # server shutdown, when the test suite has finished its run # so just check that we can register the cleanup and that it # doesn't segfault - Apache::ServerUtil::server_shutdown_register_cleanup(sub { Apache::OK }); + Apache::ServerUtil::server_shutdown_cleanup_register(sub { Apache::OK }); # replace the sub with the following to get some visual debug # should log cnt:1 on -start, oncand cnt: 2 -stop followed by cnt: 1) - #Apache::ServerUtil::server_shutdown_register_cleanup( sub { + #Apache::ServerUtil::server_shutdown_cleanup_register( sub { # my $cnt = Apache::ServerUtil::restart_count(); # open my $fh, ">>/tmp/out" or die "$!"; # print $fh "cnt: $cnt\n"; Modified: perl/modperl/trunk/t/response/TestAPI/server_util.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/server_util.pm?view=diff&rev=111336&p1=perl/modperl/trunk/t/response/TestAPI/server_util.pm&r1=111335&p2=perl/modperl/trunk/t/response/TestAPI/server_util.pm&r2=111336 ============================================================================== --- perl/modperl/trunk/t/response/TestAPI/server_util.pm (original) +++ perl/modperl/trunk/t/response/TestAPI/server_util.pm Wed Dec 8 17:40:01 2004 @@ -48,10 +48,10 @@ server_root_relative_tests($r); - eval { Apache::ServerUtil::server_shutdown_register_cleanup( + eval { Apache::ServerUtil::server_shutdown_cleanup_register( sub { Apache::OK }); }; - my $sub = "server_shutdown_register_cleanup"; + my $sub = "server_shutdown_cleanup_register"; ok t_cmp $@, qr/Can't run '$sub' after server startup/, "can't register server_shutdown cleanup after server startup"; Modified: perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h?view=diff&rev=111336&p1=perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h&r1=111335&p2=perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h&r2=111336 ============================================================================== --- perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h (original) +++ perl/modperl/trunk/xs/Apache/ServerUtil/Apache__ServerUtil.h Wed Dec 8 17:40:01 2004 @@ -81,13 +81,13 @@ /* this cleanups registered by this function are run only by the * parent interpreter */ static MP_INLINE -void mpxs_Apache__ServerUtil_server_shutdown_register_cleanup(pTHX_ SV *cv, +void mpxs_Apache__ServerUtil_server_shutdown_cleanup_register(pTHX_ SV *cv, SV *arg) { mpxs_cleanup2_t *data; apr_pool_t *p; - MP_CROAK_IF_POST_POST_CONFIG_PHASE("server_shutdown_register_cleanup"); + MP_CROAK_IF_POST_POST_CONFIG_PHASE("server_shutdown_cleanup_register"); p = modperl_server_user_pool(); /* must use modperl_server_user_pool here to make sure that it's run Modified: perl/modperl/trunk/xs/maps/modperl_functions.map Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/maps/modperl_functions.map?view=diff&rev=111336&p1=perl/modperl/trunk/xs/maps/modperl_functions.map&r1=111335&p2=perl/modperl/trunk/xs/maps/modperl_functions.map&r2=111336 ============================================================================== --- perl/modperl/trunk/xs/maps/modperl_functions.map (original) +++ perl/modperl/trunk/xs/maps/modperl_functions.map Wed Dec 8 17:40:01 2004 @@ -82,7 +82,7 @@ MODULE=Apache::ServerUtil PACKAGE=Apache::ServerUtil mpxs_Apache__ServerUtil_server_root_relative | | p, fname="" - mpxs_Apache__ServerUtil_server_shutdown_register_cleanup | | cv, arg=Nullsv + mpxs_Apache__ServerUtil_server_shutdown_cleanup_register | | cv, arg=Nullsv int:DEFINE_restart_count PACKAGE=Apache Modified: perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm?view=diff&rev=111336&p1=perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm&r1=111335&p2=perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm&r2=111336 ============================================================================== --- perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm (original) +++ perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Wed Dec 8 17:40:01 2004 @@ -2,7 +2,7 @@ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # ! WARNING: generated by ModPerl::ParseSource/0.01 -# ! Wed Dec 8 19:43:35 2004 +# ! Wed Dec 8 20:21:58 2004 # ! do NOT edit, any changes will be lost ! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -7132,7 +7132,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__ServerUtil_server_shutdown_register_cleanup', + 'name' => 'mpxs_Apache__ServerUtil_server_shutdown_cleanup_register', 'args' => [ { 'type' => 'PerlInterpreter *',
