In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/ad9e76a8629ed1ac483f0a7ed0e4da40ac5a1a00?hp=0f93bb20132f1d122993dac5d6e249240a28646e>
- Log ----------------------------------------------------------------- commit ad9e76a8629ed1ac483f0a7ed0e4da40ac5a1a00 Author: Nicholas Clark <[email protected]> Date: Mon Nov 29 15:17:54 2010 +0000 Add a verbose option to -DP, and replace C<#if 0> blocks in sv_gets() with it. ----------------------------------------------------------------------- Summary of changes: perl.h | 5 +++++ sv.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/perl.h b/perl.h index 901e33e..151e7bd 100644 --- a/perl.h +++ b/perl.h @@ -3699,6 +3699,7 @@ Gid_t getegid (void); # define DEBUG_B_TEST_ (PL_debug & DEBUG_B_FLAG) # define DEBUG_Xv_TEST_ (DEBUG_X_TEST_ && DEBUG_v_TEST_) # define DEBUG_Uv_TEST_ (DEBUG_U_TEST_ && DEBUG_v_TEST_) +# define DEBUG_Pv_TEST_ (DEBUG_P_TEST_ && DEBUG_v_TEST_) #ifdef DEBUGGING @@ -3729,6 +3730,7 @@ Gid_t getegid (void); # define DEBUG_B_TEST DEBUG_B_TEST_ # define DEBUG_Xv_TEST DEBUG_Xv_TEST_ # define DEBUG_Uv_TEST DEBUG_Uv_TEST_ +# define DEBUG_Pv_TEST DEBUG_Pv_TEST_ # define PERL_DEB(a) a # define PERL_DEBUG(a) if (PL_debug) a @@ -3766,6 +3768,7 @@ Gid_t getegid (void); # define DEBUG_D(a) DEBUG__(DEBUG_D_TEST, a) # define DEBUG_Xv(a) DEBUG__(DEBUG_Xv_TEST, a) # define DEBUG_Uv(a) DEBUG__(DEBUG_Uv_TEST, a) +# define DEBUG_Pv(a) DEBUG__(DEBUG_Pv_TEST, a) # define DEBUG_T(a) DEBUG__(DEBUG_T_TEST, a) # define DEBUG_R(a) DEBUG__(DEBUG_R_TEST, a) @@ -3805,6 +3808,7 @@ Gid_t getegid (void); # define DEBUG_B_TEST (0) # define DEBUG_Xv_TEST (0) # define DEBUG_Uv_TEST (0) +# define DEBUG_Pv_TEST (0) # define PERL_DEB(a) # define PERL_DEBUG(a) @@ -3834,6 +3838,7 @@ Gid_t getegid (void); # define DEBUG_B(a) # define DEBUG_Xv(a) # define DEBUG_Uv(a) +# define DEBUG_Pv(a) #endif /* DEBUGGING */ diff --git a/sv.c b/sv.c index 3c97b80..aa6b790 100644 --- a/sv.c +++ b/sv.c @@ -7620,22 +7620,22 @@ Perl_sv_gets(pTHX_ register SV *const sv, register PerlIO *const fp, I32 append) "Screamer: going to getc, ptr=%"UVuf", cnt=%ld\n", PTR2UV(ptr),(long)cnt)); PerlIO_set_ptrcnt(fp, (STDCHAR*)ptr, cnt); /* deregisterize cnt and ptr */ -#if 0 - DEBUG_P(PerlIO_printf(Perl_debug_log, + + DEBUG_Pv(PerlIO_printf(Perl_debug_log, "Screamer: pre: FILE * thinks ptr=%"UVuf", cnt=%ld, base=%"UVuf"\n", PTR2UV(PerlIO_get_ptr(fp)), (long)PerlIO_get_cnt(fp), PTR2UV(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); -#endif + /* This used to call 'filbuf' in stdio form, but as that behaves like getc when cnt <= 0 we use PerlIO_getc here to avoid introducing another abstraction. */ i = PerlIO_getc(fp); /* get more characters */ -#if 0 - DEBUG_P(PerlIO_printf(Perl_debug_log, + + DEBUG_Pv(PerlIO_printf(Perl_debug_log, "Screamer: post: FILE * thinks ptr=%"UVuf", cnt=%ld, base=%"UVuf"\n", PTR2UV(PerlIO_get_ptr(fp)), (long)PerlIO_get_cnt(fp), PTR2UV(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); -#endif + cnt = PerlIO_get_cnt(fp); ptr = (STDCHAR*)PerlIO_get_ptr(fp); /* reregisterize cnt and ptr */ DEBUG_P(PerlIO_printf(Perl_debug_log, -- Perl5 Master Repository
