diff options
author | Constantin <jucovschi@gmail.com> | 2010-04-28 10:30:32 +0200 |
---|---|---|
committer | Constantin <jucovschi@gmail.com> | 2010-04-28 10:57:31 +0200 |
commit | 7cd411b422750abf4eed04be43c43f310f55074f (patch) | |
tree | ce475c4ea092bbe68c1bce7020101adba632d384 /servercomm | |
parent | ae19f9b07d8d24b865bd0f1d886fc920cc9f37b1 (diff) | |
download | rasdaman-upstream-7cd411b422750abf4eed04be43c43f310f55074f.tar.gz rasdaman-upstream-7cd411b422750abf4eed04be43c43f310f55074f.tar.xz rasdaman-upstream-7cd411b422750abf4eed04be43c43f310f55074f.zip |
added --enable-benchmark option to configure adapted code so that it compiles
Diffstat (limited to 'servercomm')
-rw-r--r-- | servercomm/httpserver.cc | 5 | ||||
-rw-r--r-- | servercomm/servercomm2.cc | 17 |
2 files changed, 1 insertions, 21 deletions
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; |