X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=miniperlmain.c;h=f92ea3ee238501dec1e07ba48e01f416cdda966e;hb=0de7d1a6dbad298170dc03586eac337ac8b2bc61;hp=620fed78b2b5bde822dbf4a7e9b0e428d2a36b86;hpb=98e467d963acee4d1a7866eb7e9dd6c64605b460;p=p5sagit%2Fp5-mst-13.2.git diff --git a/miniperlmain.c b/miniperlmain.c index 620fed7..f92ea3e 100644 --- a/miniperlmain.c +++ b/miniperlmain.c @@ -48,7 +48,16 @@ main(int argc, char **argv, char **env) PERL_SYS_INIT3(&argc,&argv,&env); -#ifdef USE_ITHREADS +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) + /* XXX Ideally, this should really be happening in perl_alloc() or + * perl_construct() to keep libperl.a transparently fork()-safe. + * It is currently done here only because Apache/mod_perl have + * problems due to lack of a call to cancel pthread_atfork() + * handlers when shared objects that contain the handlers may + * be dlclose()d. This forces applications that embed perl to + * call PTHREAD_ATFORK() explicitly, but if and only if it hasn't + * been called at least once before in the current process. + * --GSAR 2001-07-20 */ PTHREAD_ATFORK(Perl_atfork_lock, Perl_atfork_unlock, Perl_atfork_unlock); @@ -61,13 +70,13 @@ main(int argc, char **argv, char **env) perl_construct(my_perl); PL_perl_destruct_level = 0; } - + PL_exit_flags |= PERL_EXIT_DESTRUCT_END; exitstatus = perl_parse(my_perl, xs_init, argc, argv, (char **)NULL); - if (!exitstatus) { - exitstatus = perl_run(my_perl); - } + if (!exitstatus) + perl_run(my_perl); + + exitstatus = perl_destruct(my_perl); - perl_destruct(my_perl); perl_free(my_perl); PERL_SYS_TERM();