Located more profile calls using grep and converted them over to use the new macros...

git-svn-id: http://svn.osgeo.org/postgis/trunk@3309 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/lwgeom/lwgeom_functions_basic.c b/lwgeom/lwgeom_functions_basic.c
index 9e99b4f5f498375389ce7ab5f392ff77e86b0c0d..7d2359f3b626daf3727c5c1085a6718ea25c6aae 100644 (file)
--- a/lwgeom/lwgeom_functions_basic.c
+++ b/lwgeom/lwgeom_functions_basic.c
@@ -1562,10 +1562,8 @@ Datum LWGEOM_mindistance2d(PG_FUNCTION_ARGS)
        mindist = lwgeom_mindistance2d_recursive(SERIALIZED_FORM(geom1),
                        SERIALIZED_FORM(geom2));
 
-#ifdef PROFILE
-       profstop(PROF_QRUN);
-       profreport("dist",geom1, geom2, NULL);
-#endif
+       PROFSTOP(PROF_QRUN);
+       PROFREPORT("dist",geom1, geom2, NULL);
 
        PG_FREE_IF_COPY(geom1, 0);
        PG_FREE_IF_COPY(geom2, 1);
@@ -1605,10 +1603,8 @@ Datum LWGEOM_dwithin(PG_FUNCTION_ARGS)
                          tolerance
                  );
 
-#ifdef PROFILE
-       profstop(PROF_QRUN);
-       profreport("dist",geom1, geom2, NULL);
-#endif
+       PROFSTOP(PROF_QRUN);
+       PROFREPORT("dist",geom1, geom2, NULL);
 
        PG_FREE_IF_COPY(geom1, 0);
        PG_FREE_IF_COPY(geom2, 1);

diff --git a/lwgeom/lwgeom_geos.h b/lwgeom/lwgeom_geos.h
index 93b980d8c17131b563fc3d5776e8fc5c567be700..3e41f1d0821cdece3c015085767c52d7b623a7be 100644 (file)
--- a/lwgeom/lwgeom_geos.h
+++ b/lwgeom/lwgeom_geos.h
@@ -34,8 +34,8 @@
 #include "liblwgeom.h"
 #include "profile.h"
 
-#ifdef PROFILE
-#warning PROFILE enabled!
+#if POSTGIS_PROFILE > 0
+#warning POSTGIS_PROFILE enabled!
 #endif
 
 /*

diff --git a/lwgeom/lwgeom_inout.c b/lwgeom/lwgeom_inout.c
index 57ff22ad9e0d3b549aec8bb0a236feb43f6b47c5..0f488548be5a922f000060bd8e7ad43bba69b1c1 100644 (file)
--- a/lwgeom/lwgeom_inout.c
+++ b/lwgeom/lwgeom_inout.c
@@ -316,8 +316,8 @@ Datum WKBFromLWGEOM(PG_FUNCTION_ARGS)
 
 #endif
 
-#ifdef PROFILE
-       profstop(PROF_QRUN);
+#if POSTGIS_PROFILE > 0
+       PROFSTOP(PROF_QRUN);
        lwnotice("serialized_lwgeom_to_ewkb: prof: %lu", proftime[PROF_QRUN]);
 #endif