added --enable-benchmark option to configure adapted code so that it compiles

9 files changed, 24 insertions, 23 deletions

diff --git a/configure.ac b/configure.ac
index 54878ac..8d2c38d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,12 @@ AC_ARG_ENABLE([debug],
               [RMANDEBUG=on],
               [RMANDEBUG=])
 
+AC_ARG_ENABLE([benchmark],
+              [AS_HELP_STRING([--enable-benchmark],
+                              [this feature enables generation of binaries that contain extra code for benchmark output.])],
+              [CXXFLAGS+=-DRMANBENCHMARK ],
+              [])
+
 AC_ARG_WITH([test-server],
             [AS_HELP_STRING([--with-test-server=ADDRESS],
                             [server used for testing])],
diff --git a/reladminif/adminifcommon.cc b/reladminif/adminifcommon.cc
index f4409e3..29af5d8 100644
--- a/reladminif/adminifcommon.cc
+++ b/reladminif/adminifcommon.cc
@@ -41,6 +41,7 @@ rasdaman GmbH.
 
 #include "raslib/error.hh"
 #include "adminif.hh"
+#include "dbobject.hh"
 
 #include "raslib/rmdebug.hh"
 #include "sqlerror.hh"
diff --git a/reladminif/databaseif.pgc b/reladminif/databaseif.pgc
index cec18c5..ddd3937 100644
--- a/reladminif/databaseif.pgc
+++ b/reladminif/databaseif.pgc
@@ -97,6 +97,7 @@ struct connection
 #include "sqlerror.hh"
 #include "oidif.hh"
 #include "adminif.hh"
+#include "dbobject.hh"
 
 extern char globalConnectId[256];
 // size of ARCHITECTURE attribute in RAS_ADMIN:
diff --git a/reladminif/oidif.hh b/reladminif/oidif.hh
index 33ce760..7444ec9 100644
--- a/reladminif/oidif.hh
+++ b/reladminif/oidif.hh
@@ -184,6 +184,10 @@ class OId
 
 		bool operator>= (const OId& old) const;
 
+             #ifdef RMANBENCHMARK
+	        static RMTimer oidAlloc;
+	        static RMTimer oidResolve;
+	     #endif
 	protected:
 		// protection agains writing back unloaded counters => inconsistent DB!!
 		static bool loadedOk;
@@ -293,7 +297,6 @@ class OId
 		/*@Doc: 
 		holds all OIdCounters of next* sort, to go with the counterNames.
 		*/
-
 	};
 
 extern std::ostream& operator<<(std::ostream& in, const OId& d);
diff --git a/reladminif/transactionif.pgc b/reladminif/transactionif.pgc
index 6bd16f7..4dbbc8a 100644
--- a/reladminif/transactionif.pgc
+++ b/reladminif/transactionif.pgc
@@ -47,6 +47,7 @@ EXEC SQL include sqlglobals.h;
 #include "sqlerror.hh"
 #include "objectbroker.hh"
 #include "databaseif.hh"
+#include "dbobject.hh"
 
 // PG stuff for libpg connection maintenance
 #include "libpq-fe.h"
diff --git a/servercomm/httpserver.cc b/servercomm/httpserver.cc
index 514f6b8..f75b9b0 100644
--- a/servercomm/httpserver.cc
+++ b/servercomm/httpserver.cc
@@ -66,11 +66,6 @@ static const char rcsid[] = "@(#)servercomm, HttpServer: $Id: httpserver.cc,v 1.
 #include <purify.h>
 #endif
 
-#ifdef RMANBENCHMARK
-  // to control ZLibCompression::decompTimer and ZLibCompression::compTimer
-  #include "zlibcompression.hh"
-#endif
-
 #include "httpserver/httpserver.h"
 
 #include "qlparser/qtmdd.hh"
diff --git a/servercomm/servercomm2.cc b/servercomm/servercomm2.cc
index 7fcbef2..7c81f1c 100644
--- a/servercomm/servercomm2.cc
+++ b/servercomm/servercomm2.cc
@@ -55,8 +55,7 @@ static const char rcsid[] = "@(#)servercomm2, ServerComm: $Id: servercomm2.cc,v
 
 #ifdef RMANBENCHMARK
 	// to control GenericCompression::decompTimer and GenericCompression::compTimer
-	#include "gencompression.hh"
-	#include "zlibcompression.hh"
+	#include "tilemgr/gencompression.hh"
 #endif
 
 #ifdef SOLARIS
@@ -1527,10 +1526,6 @@ ServerComm::executeQuery( unsigned long callingClientId,
 		Tile::relTimer.pause();
 		Tile::opTimer.start();
 		Tile::opTimer.pause();
-		ZLibCompression::decompTimer.start();
-		ZLibCompression::decompTimer.pause();
-		ZLibCompression::compTimer.start();
-		ZLibCompression::compTimer.pause();
 
 		if( RManBenchmark > 0 )
 			RMInit::bmOut << "Query: " << query << std::endl;
@@ -1839,8 +1834,6 @@ ServerComm::executeQuery( unsigned long callingClientId,
 			Tile::opTimer.stop();
 			Tile::relTimer.stop();
 			Tile::opTimer.stop();
-			ZLibCompression::decompTimer.stop();
-			ZLibCompression::compTimer.stop();
 			if( context->evaluationTimer )
 				delete context->evaluationTimer;
 			context->evaluationTimer = 0;
@@ -2056,10 +2049,6 @@ ServerComm::executeUpdate( unsigned long callingClientId,
 	Tile::relTimer.pause();
 	Tile::opTimer.start();
 	Tile::opTimer.pause();
-	ZLibCompression::decompTimer.start();
-	ZLibCompression::decompTimer.pause();
-	ZLibCompression::compTimer.start();
-	ZLibCompression::compTimer.pause();
 
 	if( RManBenchmark > 0 )
 		RMInit::bmOut << "Query (update): " << query << std::endl;
@@ -2256,8 +2245,6 @@ ServerComm::executeUpdate( unsigned long callingClientId,
 
 	Tile::opTimer.stop();
 	Tile::relTimer.stop();
-	ZLibCompression::decompTimer.stop();
-	ZLibCompression::compTimer.stop();
 #endif
 
 	RMDBGEXIT( 4, RMDebug::module_servercomm, "ServerComm",  "executeUpdate" )
@@ -3624,8 +3611,6 @@ ServerComm::endTransfer( unsigned long client )
 #ifdef RMANBENCHMARK
 		Tile::relTimer.stop();
 		Tile::opTimer.stop();
-		ZLibCompression::decompTimer.stop();
-		ZLibCompression::compTimer.stop();
 		if( context->evaluationTimer ) delete context->evaluationTimer;
 		context->evaluationTimer = 0;
 		if( context->transferTimer ) delete context->transferTimer;
diff --git a/tilemgr/tile.cc b/tilemgr/tile.cc
index 7ea8693..fadf2ca 100644
--- a/tilemgr/tile.cc
+++ b/tilemgr/tile.cc
@@ -53,6 +53,13 @@ static const char rcsid[] = "@(#)cachetamgr,Tile: $Id: tile.cc,v 1.79 2005/09/03
 
 #include <cstring>
 
+#ifdef RMANBENCHMARK
+RMTimer Tile::opTimer("Tile","opTimer");
+RMTimer Tile::relTimer("Tile","relTimer");
+RMTimer Tile::o2Timer("Tile","o2Timer");
+#endif
+
+
 const Tile&
 Tile::operator=(const Tile& tile)
 	{
@@ -825,7 +832,7 @@ Tile::copyTile(const r_Minterval &areaRes, const Tile *opTile, const r_Minterval
 	r_MiterDirect opTileIter((void*)cellOp, opTile->getDomain(), areaOp, tsize);
 
 #ifdef RMANBENCHMARK
-	opTiler.resume();
+	opTimer.resume();
 #endif
 
 	while (!resTileIter.isDone())
diff --git a/tilemgr/tile.hh b/tilemgr/tile.hh
index 6a11005..79fd94a 100644
--- a/tilemgr/tile.hh
+++ b/tilemgr/tile.hh
@@ -371,6 +371,8 @@ class Tile
 		// RMTimer for taking O2 times. Could be protected. Is controlled
 		// in servercomm/servercomm2.cc.
 		static RMTimer opTimer;
+		static RMTimer relTimer;
+		static RMTimer o2Timer;
 #endif
 
 	protected: