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 /reladminif | |
| 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 'reladminif')
| -rw-r--r-- | reladminif/adminifcommon.cc | 1 | ||||
| -rw-r--r-- | reladminif/databaseif.pgc | 1 | ||||
| -rw-r--r-- | reladminif/oidif.hh | 5 | ||||
| -rw-r--r-- | reladminif/transactionif.pgc | 1 |
4 files changed, 7 insertions, 1 deletions
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" |