In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2f445b24d1fcccfa186e5ac8cd8f82a820c4369d?hp=93a641ae382638ffd1980378be4810244d04f4b0>
- Log ----------------------------------------------------------------- commit 2f445b24d1fcccfa186e5ac8cd8f82a820c4369d Author: Tony Cook <[email protected]> Date: Sat Dec 8 10:40:26 2012 +1100 fix dtrace (as emulated with systemtap) builds on linux the stap branch of the #if was passing four arguments to OP_ENTRY_PROBE, much hilarity ensued. Since literal strings are never passed as the name parameter we can move OP_ENTRY_PROBE out of the conditional and avoid duplication. ----------------------------------------------------------------------- Summary of changes: mydtrace.h | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/mydtrace.h b/mydtrace.h index 951d177..5093f46 100644 --- a/mydtrace.h +++ b/mydtrace.h @@ -32,12 +32,6 @@ PERL_SUB_RETURN(tmp_func, file, line, stash); \ } -# define OP_ENTRY_PROBE(name) \ - if (PERL_OP_ENTRY_ENABLED()) { \ - const char *tmp_name = name; \ - PERL_OP_ENTRY(tmp_name, file, line, stash); \ - } - # define LOADING_FILE_PROBE(name) \ if (PERL_LOADING_FILE_ENABLED()) { \ const char *tmp_name = name; \ @@ -62,11 +56,6 @@ PERL_SUB_RETURN(func, file, line, stash); \ } -# define OP_ENTRY_PROBE(name) \ - if (PERL_OP_ENTRY_ENABLED()) { \ - PERL_OP_ENTRY(name); \ - } - # define LOADING_FILE_PROBE(name) \ if (PERL_LOADING_FILE_ENABLED()) { \ PERL_LOADING_FILE(name); \ @@ -79,6 +68,11 @@ # endif +# define OP_ENTRY_PROBE(name) \ + if (PERL_OP_ENTRY_ENABLED()) { \ + PERL_OP_ENTRY(name); \ + } + # define PHASE_CHANGE_PROBE(new_phase, old_phase) \ if (PERL_PHASE_CHANGE_ENABLED()) { \ PERL_PHASE_CHANGE(new_phase, old_phase); \ -- Perl5 Master Repository
