Change 33376 by [EMAIL PROTECTED] on 2008/02/26 13:13:18
Chainsaw DEBUG_S out, as suggested by Vincent Pit.
Affected files ...
... //depot/perl/perl.c#862 edit
... //depot/perl/perl.h#830 edit
... //depot/perl/pod/perlrun.pod#166 edit
... //depot/perl/pp_hot.c#572 edit
... //depot/perl/scope.c#225 edit
... //depot/perl/util.c#650 edit
Differences ...
==== //depot/perl/perl.c#862 (text) ====
Index: perl/perl.c
--- perl/perl.c#861~33291~ 2008-02-12 05:15:20.000000000 -0800
+++ perl/perl.c 2008-02-26 05:13:18.000000000 -0800
@@ -2360,8 +2360,6 @@
if (!DEBUG_q_TEST)
PERL_DEBUG(PerlIO_printf(Perl_debug_log, "\nEXECUTING...\n\n"));
#endif
- DEBUG_S(PerlIO_printf(Perl_debug_log, "main thread is 0x%"UVxf"\n",
- PTR2UV(thr)));
if (PL_minus_c) {
#ifdef MACOS_TRADITIONAL
@@ -2970,7 +2968,6 @@
" H Hash dump -- usurps values()",
" X Scratchpad allocation",
" D Cleaning up",
- " S Thread synchronization",
" T Tokenising",
" R Include reference counts of dumped variables (eg when using -Ds)",
" J Do not s,t,P-debug (Jump over) opcodes within package DB",
@@ -5185,8 +5182,6 @@
Perl_my_exit(pTHX_ U32 status)
{
dVAR;
- DEBUG_S(PerlIO_printf(Perl_debug_log, "my_exit: thread %p, status %lu\n",
- (void*)thr, (unsigned long) status));
switch (status) {
case 0:
STATUS_ALL_SUCCESS;
==== //depot/perl/perl.h#830 (text) ====
Index: perl/perl.h
--- perl/perl.h#829~33370~ 2008-02-25 09:42:38.000000000 -0800
+++ perl/perl.h 2008-02-26 05:13:18.000000000 -0800
@@ -3561,7 +3561,7 @@
#define DEBUG_H_FLAG 0x00002000 /* 8192 */
#define DEBUG_X_FLAG 0x00004000 /* 16384 */
#define DEBUG_D_FLAG 0x00008000 /* 32768 */
-#define DEBUG_S_FLAG 0x00010000 /* 65536 */
+/* 0x00010000 is unused, used to be S */
#define DEBUG_T_FLAG 0x00020000 /* 131072 */
#define DEBUG_R_FLAG 0x00040000 /* 262144 */
#define DEBUG_J_FLAG 0x00080000 /* 524288 */
@@ -3569,7 +3569,7 @@
#define DEBUG_C_FLAG 0x00200000 /*2097152 */
#define DEBUG_A_FLAG 0x00400000 /*4194304 */
#define DEBUG_q_FLAG 0x00800000 /*8388608 */
-#define DEBUG_MASK 0x00FFEFFF /* mask of all the standard flags */
+#define DEBUG_MASK 0x00FEEFFF /* mask of all the standard flags */
#define DEBUG_DB_RECURSE_FLAG 0x40000000
#define DEBUG_TOP_FLAG 0x80000000 /* XXX what's this for ??? Signal
@@ -3591,7 +3591,6 @@
# define DEBUG_H_TEST_ (PL_debug & DEBUG_H_FLAG)
# define DEBUG_X_TEST_ (PL_debug & DEBUG_X_FLAG)
# define DEBUG_D_TEST_ (PL_debug & DEBUG_D_FLAG)
-# define DEBUG_S_TEST_ (PL_debug & DEBUG_S_FLAG)
# define DEBUG_T_TEST_ (PL_debug & DEBUG_T_FLAG)
# define DEBUG_R_TEST_ (PL_debug & DEBUG_R_FLAG)
# define DEBUG_J_TEST_ (PL_debug & DEBUG_J_FLAG)
@@ -3620,7 +3619,6 @@
# define DEBUG_H_TEST DEBUG_H_TEST_
# define DEBUG_X_TEST DEBUG_X_TEST_
# define DEBUG_D_TEST DEBUG_D_TEST_
-# define DEBUG_S_TEST DEBUG_S_TEST_
# define DEBUG_T_TEST DEBUG_T_TEST_
# define DEBUG_R_TEST DEBUG_R_TEST_
# define DEBUG_J_TEST DEBUG_J_TEST_
@@ -3668,8 +3666,6 @@
# define DEBUG_Xv(a) DEBUG__(DEBUG_Xv_TEST, a)
# define DEBUG_Uv(a) DEBUG__(DEBUG_Uv_TEST, a)
-# define DEBUG_S(a)
-
# define DEBUG_T(a) DEBUG__(DEBUG_T_TEST, a)
# define DEBUG_R(a) DEBUG__(DEBUG_R_TEST, a)
# define DEBUG_v(a) DEBUG__(DEBUG_v_TEST, a)
@@ -3695,7 +3691,6 @@
# define DEBUG_H_TEST (0)
# define DEBUG_X_TEST (0)
# define DEBUG_D_TEST (0)
-# define DEBUG_S_TEST (0)
# define DEBUG_T_TEST (0)
# define DEBUG_R_TEST (0)
# define DEBUG_J_TEST (0)
@@ -3724,7 +3719,6 @@
# define DEBUG_H(a)
# define DEBUG_X(a)
# define DEBUG_D(a)
-# define DEBUG_S(a)
# define DEBUG_T(a)
# define DEBUG_R(a)
# define DEBUG_v(a)
==== //depot/perl/pod/perlrun.pod#166 (text) ====
Index: perl/pod/perlrun.pod
--- perl/pod/perlrun.pod#165~32954~ 2008-01-11 05:55:07.000000000 -0800
+++ perl/pod/perlrun.pod 2008-02-26 05:13:18.000000000 -0800
@@ -404,7 +404,6 @@
8192 H Hash dump -- usurps values()
16384 X Scratchpad allocation
32768 D Cleaning up
- 65536 S Thread synchronization
131072 T Tokenising
262144 R Include reference counts of dumped variables (eg when using -Ds)
524288 J Do not s,t,P-debug (Jump over) opcodes within package DB
==== //depot/perl/pp_hot.c#572 (text) ====
Index: perl/pp_hot.c
--- perl/pp_hot.c#571~33356~ 2008-02-23 00:19:00.000000000 -0800
+++ perl/pp_hot.c 2008-02-26 05:13:18.000000000 -0800
@@ -2821,10 +2821,6 @@
if (CvDEPTH(cv) == PERL_SUB_DEPTH_WARN && ckWARN(WARN_RECURSION)
&& !(PERLDB_SUB && cv == GvCV(PL_DBsub)))
sub_crush_depth(cv);
-#if 0
- DEBUG_S(PerlIO_printf(Perl_debug_log,
- "%p entersub returning %p\n", (void*)thr,
(void*)CvSTART(cv)));
-#endif
RETURNOP(CvSTART(cv));
}
else {
==== //depot/perl/scope.c#225 (text) ====
Index: perl/scope.c
--- perl/scope.c#224~33291~ 2008-02-12 05:15:20.000000000 -0800
+++ perl/scope.c 2008-02-26 05:13:18.000000000 -0800
@@ -715,10 +715,6 @@
av = (AV*)gv; /* what to refcnt_dec */
restore_sv:
sv = *(SV**)ptr;
- DEBUG_S(PerlIO_printf(Perl_debug_log,
- "restore svref: %p %p:%s -> %p:%s\n",
- (void*)ptr, (void*)sv, SvPEEK(sv),
- (void*)value, SvPEEK(value)));
*(SV**)ptr = value;
SvREFCNT_dec(sv);
PL_localizing = 2;
==== //depot/perl/util.c#650 (text) ====
Index: perl/util.c
--- perl/util.c#649~33291~ 2008-02-12 05:15:20.000000000 -0800
+++ perl/util.c 2008-02-26 05:13:18.000000000 -0800
@@ -1344,9 +1344,6 @@
message = NULL;
}
- DEBUG_S(PerlIO_printf(Perl_debug_log,
- "%p: die/croak: message = %s\ndiehook = %p\n",
- (void*)thr, message, (void*)PL_diehook));
if (PL_diehook) {
S_vdie_common(aTHX_ message, *msglen, *utf8, FALSE);
}
@@ -1362,17 +1359,10 @@
STRLEN msglen;
I32 utf8 = 0;
- DEBUG_S(PerlIO_printf(Perl_debug_log,
- "%p: die: curstack = %p, mainstack = %p\n",
- (void*)thr, (void*)PL_curstack, (void*)PL_mainstack));
-
message = vdie_croak_common(pat, args, &msglen, &utf8);
PL_restartop = die_where(message, msglen);
SvFLAGS(ERRSV) |= utf8;
- DEBUG_S(PerlIO_printf(Perl_debug_log,
- "%p: die: restartop = %p, was_in_eval = %d, top_env = %p\n",
- (void*)thr, (void*)PL_restartop, was_in_eval, (void*)PL_top_env));
if ((!PL_restartop && was_in_eval) || PL_top_env->je_prev)
JMPENV_JUMP(3);
return PL_restartop;
End of Patch.
