This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Factor out a PERL_SET_PHASE macro
authorShawn M Moore <sartak@bestpractical.com>
Thu, 7 Jul 2011 02:34:49 +0000 (22:34 -0400)
committerFather Chrysostomos <sprout@cpan.org>
Tue, 12 Jul 2011 03:29:55 +0000 (20:29 -0700)
This is the first step in adding a dtrace probe for global phase change

perl.c
perl.h

diff --git a/perl.c b/perl.c
index e345ae1..914fbcd 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -562,7 +562,7 @@ perl_destruct(pTHXx)
         JMPENV_PUSH(x);
        PERL_UNUSED_VAR(x);
         if (PL_endav && !PL_minus_c) {
         JMPENV_PUSH(x);
        PERL_UNUSED_VAR(x);
         if (PL_endav && !PL_minus_c) {
-           PL_phase = PERL_PHASE_END;
+           PERL_SET_PHASE(PERL_PHASE_END);
             call_list(PL_scopestack_ix, PL_endav);
        }
         JMPENV_POP;
             call_list(PL_scopestack_ix, PL_endav);
        }
         JMPENV_POP;
@@ -757,7 +757,7 @@ perl_destruct(pTHXx)
      * destruct_level > 0 */
     SvREFCNT_dec(PL_main_cv);
     PL_main_cv = NULL;
      * destruct_level > 0 */
     SvREFCNT_dec(PL_main_cv);
     PL_main_cv = NULL;
-    PL_phase = PERL_PHASE_DESTRUCT;
+    PERL_SET_PHASE(PERL_PHASE_DESTRUCT);
 
     /* Tell PerlIO we are about to tear things apart in case
        we have layers which are using resources that should
 
     /* Tell PerlIO we are about to tear things apart in case
        we have layers which are using resources that should
@@ -1607,7 +1607,7 @@ perl_parse(pTHXx_ XSINIT_t xsinit, int argc, char **argv, char **env)
            call_list(oldscope, PL_unitcheckav);
        }
        if (PL_checkav) {
            call_list(oldscope, PL_unitcheckav);
        }
        if (PL_checkav) {
-           PL_phase = PERL_PHASE_CHECK;
+           PERL_SET_PHASE(PERL_PHASE_CHECK);
            call_list(oldscope, PL_checkav);
        }
        ret = 0;
            call_list(oldscope, PL_checkav);
        }
        ret = 0;
@@ -1625,7 +1625,7 @@ perl_parse(pTHXx_ XSINIT_t xsinit, int argc, char **argv, char **env)
            call_list(oldscope, PL_unitcheckav);
        }
        if (PL_checkav) {
            call_list(oldscope, PL_unitcheckav);
        }
        if (PL_checkav) {
-           PL_phase = PERL_PHASE_CHECK;
+           PERL_SET_PHASE(PERL_PHASE_CHECK);
            call_list(oldscope, PL_checkav);
        }
        ret = STATUS_EXIT;
            call_list(oldscope, PL_checkav);
        }
        ret = STATUS_EXIT;
@@ -1774,7 +1774,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
     SV *linestr_sv = newSV_type(SVt_PVIV);
     bool add_read_e_script = FALSE;
 
     SV *linestr_sv = newSV_type(SVt_PVIV);
     bool add_read_e_script = FALSE;
 
-    PL_phase = PERL_PHASE_START;
+    PERL_SET_PHASE(PERL_PHASE_START);
 
     SvGROW(linestr_sv, 80);
     sv_setpvs(linestr_sv,"");
 
     SvGROW(linestr_sv, 80);
     sv_setpvs(linestr_sv,"");
@@ -2278,7 +2278,7 @@ perl_run(pTHXx)
        PL_curstash = PL_defstash;
        if (!(PL_exit_flags & PERL_EXIT_DESTRUCT_END) &&
            PL_endav && !PL_minus_c) {
        PL_curstash = PL_defstash;
        if (!(PL_exit_flags & PERL_EXIT_DESTRUCT_END) &&
            PL_endav && !PL_minus_c) {
-           PL_phase = PERL_PHASE_END;
+           PERL_SET_PHASE(PERL_PHASE_END);
            call_list(oldscope, PL_endav);
        }
 #ifdef MYMALLOC
            call_list(oldscope, PL_endav);
        }
 #ifdef MYMALLOC
@@ -2330,7 +2330,7 @@ S_run_body(pTHX_ I32 oldscope)
        if (PERLDB_SINGLE && PL_DBsingle)
            sv_setiv(PL_DBsingle, 1);
        if (PL_initav) {
        if (PERLDB_SINGLE && PL_DBsingle)
            sv_setiv(PL_DBsingle, 1);
        if (PL_initav) {
-           PL_phase = PERL_PHASE_INIT;
+           PERL_SET_PHASE(PERL_PHASE_INIT);
            call_list(oldscope, PL_initav);
        }
 #ifdef PERL_DEBUG_READONLY_OPS
            call_list(oldscope, PL_initav);
        }
 #ifdef PERL_DEBUG_READONLY_OPS
@@ -2340,7 +2340,7 @@ S_run_body(pTHX_ I32 oldscope)
 
     /* do it */
 
 
     /* do it */
 
-    PL_phase = PERL_PHASE_RUN;
+    PERL_SET_PHASE(PERL_PHASE_RUN);
 
     if (PL_restartop) {
        PL_restartjmpenv = NULL;
 
     if (PL_restartop) {
        PL_restartjmpenv = NULL;
diff --git a/perl.h b/perl.h
index 6e1038b..423d264 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -4718,6 +4718,11 @@ EXTCONST char PL_bincompat_options[] =
 EXTCONST char PL_bincompat_options[];
 #endif
 
 EXTCONST char PL_bincompat_options[];
 #endif
 
+#ifndef PERL_SET_PHASE
+#  define PERL_SET_PHASE(new_phase) \
+    PL_phase = new_phase;
+#endif
+
 /* The interpreter phases. If these ever change, PL_phase_names right below will
  * need to be updated accordingly. */
 enum perl_phase {
 /* The interpreter phases. If these ever change, PL_phase_names right below will
  * need to be updated accordingly. */
 enum perl_phase {