You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by go...@apache.org on 2003/05/20 08:53:47 UTC
cvs commit: modperl-2.0/src/modules/perl mod_perl.c modperl_gtop.c modperl_gtop.h modperl_interp.c
gozer 2003/05/19 23:53:47
Modified: . Changes
src/modules/perl mod_perl.c modperl_gtop.c modperl_gtop.h
modperl_interp.c
Log:
Fix gtop support that was broken with modern gcc. __func__ can't be used
in string concatenation anymore (deprecated).
Changed the modperl_gtop_* apis to take an extra optionnal argument.
Reviewed by: stas
Revision Changes Path
1.189 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- Changes 20 May 2003 01:21:02 -0000 1.188
+++ Changes 20 May 2003 06:53:47 -0000 1.189
@@ -12,6 +12,9 @@
=item 1.99_10-dev
+MP_GTOP now works with modern GCC
+[Philippe M. Chiasson <gozer@cpan.org]
+
add missing dependencies to Apache::PerlSections
[Geoffrey Young]
1.172 +2 -2 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- mod_perl.c 20 May 2003 06:02:47 -0000 1.171
+++ mod_perl.c 20 May 2003 06:53:47 -0000 1.172
@@ -147,7 +147,7 @@
#ifdef MP_USE_GTOP
MP_TRACE_m_do(
- modperl_gtop_do_proc_mem_before(MP_FUNC ": perl_parse");
+ modperl_gtop_do_proc_mem_before(MP_FUNC, "perl_parse");
);
#endif
@@ -202,7 +202,7 @@
#ifdef MP_USE_GTOP
MP_TRACE_m_do(
- modperl_gtop_do_proc_mem_after(MP_FUNC ": perl_parse");
+ modperl_gtop_do_proc_mem_after(MP_FUNC, "perl_parse");
);
#endif
1.8 +9 -9 modperl-2.0/src/modules/perl/modperl_gtop.c
Index: modperl_gtop.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_gtop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- modperl_gtop.c 15 Mar 2001 01:55:44 -0000 1.7
+++ modperl_gtop.c 20 May 2003 06:53:47 -0000 1.8
@@ -95,12 +95,12 @@
}
void modperl_gtop_report_proc_mem(modperl_gtop_t *gtop,
- char *when, char *msg)
+ char *when, const char *func, char *msg)
{
#define ss_item(item) gtop->proc_mem_ss.item
- fprintf(stderr, "%s %s: " ss_fmt "\n",
- msg, when,
+ fprintf(stderr, "%s : %s %s: " ss_fmt "\n",
+ func, (msg ? msg : ""), when,
ss_item(size),
ss_item(vsize),
ss_item(resident),
@@ -110,22 +110,22 @@
#undef ss_item
}
-void modperl_gtop_report_proc_mem_diff(modperl_gtop_t *gtop, char *msg)
+void modperl_gtop_report_proc_mem_diff(modperl_gtop_t *gtop, const char *func, char *msg)
{
modperl_gtop_proc_mem_size_string(gtop, SS_TYPE_DIFF);
- modperl_gtop_report_proc_mem(gtop, "diff", msg);
+ modperl_gtop_report_proc_mem(gtop, "diff", func, msg);
}
-void modperl_gtop_report_proc_mem_before(modperl_gtop_t *gtop, char *msg)
+void modperl_gtop_report_proc_mem_before(modperl_gtop_t *gtop, const char *func, char *msg)
{
modperl_gtop_proc_mem_size_string(gtop, SS_TYPE_BEFORE);
- modperl_gtop_report_proc_mem(gtop, "before", msg);
+ modperl_gtop_report_proc_mem(gtop, "before", func, msg);
}
-void modperl_gtop_report_proc_mem_after(modperl_gtop_t *gtop, char *msg)
+void modperl_gtop_report_proc_mem_after(modperl_gtop_t *gtop, const char *func, char *msg)
{
modperl_gtop_proc_mem_size_string(gtop, SS_TYPE_AFTER);
- modperl_gtop_report_proc_mem(gtop, "after", msg);
+ modperl_gtop_report_proc_mem(gtop, "after", func, msg);
}
#endif /* MP_USE_GTOP */
1.4 +9 -9 modperl-2.0/src/modules/perl/modperl_gtop.h
Index: modperl_gtop.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_gtop.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modperl_gtop.h 15 Mar 2001 01:55:44 -0000 1.3
+++ modperl_gtop.h 20 May 2003 06:53:47 -0000 1.4
@@ -36,19 +36,19 @@
void modperl_gtop_get_proc_mem_before(modperl_gtop_t *gtop);
void modperl_gtop_get_proc_mem_after(modperl_gtop_t *gtop);
void modperl_gtop_report_proc_mem(modperl_gtop_t *gtop,
- char *when, char *msg);
-void modperl_gtop_report_proc_mem_diff(modperl_gtop_t *gtop, char *msg);
-void modperl_gtop_report_proc_mem_before(modperl_gtop_t *gtop, char *msg);
-void modperl_gtop_report_proc_mem_after(modperl_gtop_t *gtop, char *msg);
+ char *when, const char *func, char *msg);
+void modperl_gtop_report_proc_mem_diff(modperl_gtop_t *gtop, const char* func, char *msg);
+void modperl_gtop_report_proc_mem_before(modperl_gtop_t *gtop, const char* func, char *msg);
+void modperl_gtop_report_proc_mem_after(modperl_gtop_t *gtop, const char* func, char *msg);
-#define modperl_gtop_do_proc_mem_before(msg) \
+#define modperl_gtop_do_proc_mem_before(func, msg) \
modperl_gtop_get_proc_mem_before(scfg->gtop); \
- modperl_gtop_report_proc_mem_before(scfg->gtop, msg)
+ modperl_gtop_report_proc_mem_before(scfg->gtop, func, msg)
-#define modperl_gtop_do_proc_mem_after(msg) \
+#define modperl_gtop_do_proc_mem_after(func, msg) \
modperl_gtop_get_proc_mem_after(scfg->gtop); \
- modperl_gtop_report_proc_mem_after(scfg->gtop, msg); \
- modperl_gtop_report_proc_mem_diff(scfg->gtop, msg)
+ modperl_gtop_report_proc_mem_after(scfg->gtop, func, msg); \
+ modperl_gtop_report_proc_mem_diff(scfg->gtop, func, msg)
#endif /* MP_USE_GTOP */
1.59 +2 -2 modperl-2.0/src/modules/perl/modperl_interp.c
Index: modperl_interp.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- modperl_interp.c 6 Apr 2003 23:49:46 -0000 1.58
+++ modperl_interp.c 20 May 2003 06:53:47 -0000 1.59
@@ -51,7 +51,7 @@
#ifdef MP_USE_GTOP
MP_dSCFG(mip->server);
MP_TRACE_m_do(
- modperl_gtop_do_proc_mem_before(MP_FUNC ": perl_clone");
+ modperl_gtop_do_proc_mem_before(MP_FUNC, "perl_clone");
);
#endif
@@ -99,7 +99,7 @@
#ifdef MP_USE_GTOP
MP_TRACE_m_do(
- modperl_gtop_do_proc_mem_after(MP_FUNC ": perl_clone");
+ modperl_gtop_do_proc_mem_after(MP_FUNC, "perl_clone");
);
#endif
}