[postgis-commits] svn - r3309 - trunk/lwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-11-20 14:03:22 -0800 (Thu, 20 Nov 2008)
New Revision: 3309

Modified:
   trunk/lwgeom/lwgeom_functions_basic.c
   trunk/lwgeom/lwgeom_geos.h
   trunk/lwgeom/lwgeom_inout.c
Log:
Located more profile calls using grep and converted them over to use the new macros. Hopefully I've caught all of them now...


Modified: trunk/lwgeom/lwgeom_functions_basic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_basic.c	2008-11-20 18:45:09 UTC (rev 3308)
+++ trunk/lwgeom/lwgeom_functions_basic.c	2008-11-20 22:03:22 UTC (rev 3309)
@@ -1562,10 +1562,8 @@
 	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 @@
 	                  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);

Modified: trunk/lwgeom/lwgeom_geos.h
===================================================================
--- trunk/lwgeom/lwgeom_geos.h	2008-11-20 18:45:09 UTC (rev 3308)
+++ trunk/lwgeom/lwgeom_geos.h	2008-11-20 22:03:22 UTC (rev 3309)
@@ -34,8 +34,8 @@
 #include "liblwgeom.h"
 #include "profile.h"
 
-#ifdef PROFILE
-#warning PROFILE enabled!
+#if POSTGIS_PROFILE > 0
+#warning POSTGIS_PROFILE enabled!
 #endif
 
 /*

Modified: trunk/lwgeom/lwgeom_inout.c
===================================================================
--- trunk/lwgeom/lwgeom_inout.c	2008-11-20 18:45:09 UTC (rev 3308)
+++ trunk/lwgeom/lwgeom_inout.c	2008-11-20 22:03:22 UTC (rev 3309)
@@ -316,8 +316,8 @@
 
 #endif
 
-#ifdef PROFILE
-	profstop(PROF_QRUN);
+#if POSTGIS_PROFILE > 0
+	PROFSTOP(PROF_QRUN);
 	lwnotice("serialized_lwgeom_to_ewkb: prof: %lu", proftime[PROF_QRUN]);
 #endif