Commit 9caf2c7d authored by Marco Clemencic's avatar Marco Clemencic Committed by Charles Leggett
Browse files

Minor code clean up

parent a5ef0a68
......@@ -2009,10 +2009,10 @@ namespace Tuples
/// the actual storage of all 'unsigned int' columns
mutable ColumnStorage<UInt> m_uints;
// =======================================================================
/// the actual storage of all 'longlong' columns
/// the actual storage of all 'long long' columns
mutable ColumnStorage<LongLong> m_longlongs;
// =======================================================================
/// the actual storage of all 'ulonglong' columns
/// the actual storage of all 'unsigned long long' columns
mutable ColumnStorage<ULongLong> m_ulonglongs;
// =======================================================================
/// the actual storage of all 'Float' columns
......
......@@ -894,10 +894,10 @@ public:
return nullptr;
}
AIDA::IHistogram1D* createHistogram1D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IHistogram1D* createHistogram1D( const std::string& name, const std::string& title, int nx, double lowx,
double upx );
AIDA::IHistogram1D* createHistogram1D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IHistogram1D* createHistogram1D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, const std::string& /*opt*/ ) override;
AIDA::IHistogram1D* createHistogram1D( const std::string& name, const std::string& title, const Edges& x,
......@@ -913,10 +913,10 @@ public:
AIDA::IHistogram1D* createCopy( DataObject* pPar, const std::string& rel, const AIDA::IHistogram1D& h );
AIDA::IHistogram2D* createHistogram2D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IHistogram2D* createHistogram2D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy );
AIDA::IHistogram2D* createHistogram2D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IHistogram2D* createHistogram2D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy,
const std::string& /*opt*/ ) override;
......@@ -934,10 +934,10 @@ public:
AIDA::IHistogram2D* createCopy( DataObject* pPar, const std::string& rel, const AIDA::IHistogram2D& h );
AIDA::IHistogram3D* createHistogram3D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IHistogram3D* createHistogram3D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy, int nz, double lowz, double upz );
AIDA::IHistogram3D* createHistogram3D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IHistogram3D* createHistogram3D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy, int nz, double lowz, double upz,
const std::string& /*opt*/ ) override;
......@@ -955,10 +955,10 @@ public:
AIDA::IHistogram3D* createCopy( DataObject* pPar, const std::string& rel, const AIDA::IHistogram3D& h );
AIDA::IProfile1D* createProfile1D( const std::string& name, const std::string& tit, int nx, double lowx, double upx,
AIDA::IProfile1D* createProfile1D( const std::string& name, const std::string& title, int nx, double lowx, double upx,
const std::string& opt ) override;
AIDA::IProfile1D* createProfile1D( const std::string& name, const std::string& tit, int nx, double lowx, double upx,
AIDA::IProfile1D* createProfile1D( const std::string& name, const std::string& title, int nx, double lowx, double upx,
double upper, double lower, const std::string& opt ) override;
AIDA::IProfile1D* createProfile1D( const std::string& name, const std::string& title, const Edges& x,
......@@ -980,10 +980,10 @@ public:
AIDA::IProfile1D* createCopy( DataObject* pPar, const std::string& rel, const AIDA::IProfile1D& h );
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx, double upx,
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& title, int nx, double lowx, double upx,
int ny, double lowy, double upy );
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx, double upx,
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& title, int nx, double lowx, double upx,
int ny, double lowy, double upy, const std::string& /*opt*/ ) override;
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& title, const Edges& x, const Edges& y,
......@@ -992,10 +992,10 @@ public:
AIDA::IProfile2D* createProfile2D( const std::string& nameAndTitle, int nx, double lowx, double upx, int ny,
double lowy, double upy ) override;
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx, double upx,
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& title, int nx, double lowx, double upx,
int ny, double lowy, double upy, double upper, double lower );
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx, double upx,
AIDA::IProfile2D* createProfile2D( const std::string& name, const std::string& title, int nx, double lowx, double upx,
int ny, double lowy, double upy, double upper, double lower,
const std::string& /*opt*/ ) override;
......
......@@ -172,9 +172,10 @@ bool Gaudi::Histogram1D::fill( double x, double weight )
void Gaudi::Histogram1D::copyFromAida( const AIDA::IHistogram1D& h )
{
// implement here the copy
std::string tit = h.title() + "Copy";
std::string title = h.title() + "Copy";
if ( h.axis().isFixedBinning() ) {
m_rep.reset( new TH1D( tit.c_str(), tit.c_str(), h.axis().bins(), h.axis().lowerEdge(), h.axis().upperEdge() ) );
m_rep.reset(
new TH1D( title.c_str(), title.c_str(), h.axis().bins(), h.axis().lowerEdge(), h.axis().upperEdge() ) );
} else {
Edges e;
for ( int i = 0; i < h.axis().bins(); ++i ) {
......@@ -182,7 +183,7 @@ void Gaudi::Histogram1D::copyFromAida( const AIDA::IHistogram1D& h )
}
// add also upperedges at the end
e.push_back( h.axis().upperEdge() );
m_rep.reset( new TH1D( tit.c_str(), tit.c_str(), e.size() - 1, &e.front() ) );
m_rep.reset( new TH1D( title.c_str(), title.c_str(), e.size() - 1, &e.front() ) );
}
m_axis.initialize( m_rep->GetXaxis(), false );
m_rep->Sumw2();
......
......@@ -208,10 +208,10 @@ bool Gaudi::Histogram2D::setRms( double rmsX, double rmsY )
void Gaudi::Histogram2D::copyFromAida( const IHistogram2D& h )
{
// implement here the copy
const char* tit = h.title().c_str();
const char* title = h.title().c_str();
if ( h.xAxis().isFixedBinning() && h.yAxis().isFixedBinning() )
m_rep.reset( new TH2D( tit, tit, h.xAxis().bins(), h.xAxis().lowerEdge(), h.xAxis().upperEdge(), h.yAxis().bins(),
h.yAxis().lowerEdge(), h.yAxis().upperEdge() ) );
m_rep.reset( new TH2D( title, title, h.xAxis().bins(), h.xAxis().lowerEdge(), h.xAxis().upperEdge(),
h.yAxis().bins(), h.yAxis().lowerEdge(), h.yAxis().upperEdge() ) );
else {
Edges eX, eY;
for ( int i = 0; i < h.xAxis().bins(); ++i ) eX.push_back( h.xAxis().binLowerEdge( i ) );
......@@ -220,7 +220,7 @@ void Gaudi::Histogram2D::copyFromAida( const IHistogram2D& h )
for ( int i = 0; i < h.yAxis().bins(); ++i ) eY.push_back( h.yAxis().binLowerEdge( i ) );
// add also upperedges at the end
eY.push_back( h.yAxis().upperEdge() );
m_rep.reset( new TH2D( tit, tit, eX.size() - 1, &eX.front(), eY.size() - 1, &eY.front() ) );
m_rep.reset( new TH2D( title, title, eX.size() - 1, &eX.front(), eY.size() - 1, &eY.front() ) );
}
m_xAxis.initialize( m_rep->GetXaxis(), true );
m_yAxis.initialize( m_rep->GetYaxis(), true );
......
......@@ -159,11 +159,11 @@ bool Gaudi::Histogram3D::setRms( double rmsX, double rmsY, double rmsZ )
void Gaudi::Histogram3D::copyFromAida( const AIDA::IHistogram3D& h )
{
// implement here the copy
const char* tit = h.title().c_str();
const char* title = h.title().c_str();
if ( h.xAxis().isFixedBinning() && h.yAxis().isFixedBinning() && h.zAxis().isFixedBinning() ) {
m_rep.reset( new TH3D( tit, tit, h.xAxis().bins(), h.xAxis().lowerEdge(), h.xAxis().upperEdge(), h.yAxis().bins(),
h.yAxis().lowerEdge(), h.yAxis().upperEdge(), h.zAxis().bins(), h.zAxis().lowerEdge(),
h.zAxis().upperEdge() ) );
m_rep.reset( new TH3D( title, title, h.xAxis().bins(), h.xAxis().lowerEdge(), h.xAxis().upperEdge(),
h.yAxis().bins(), h.yAxis().lowerEdge(), h.yAxis().upperEdge(), h.zAxis().bins(),
h.zAxis().lowerEdge(), h.zAxis().upperEdge() ) );
} else {
Edges eX, eY, eZ;
for ( int i = 0; i < h.xAxis().bins(); ++i ) eX.push_back( h.xAxis().binLowerEdge( i ) );
......@@ -176,7 +176,7 @@ void Gaudi::Histogram3D::copyFromAida( const AIDA::IHistogram3D& h )
// add also upperedges at the end
eZ.push_back( h.zAxis().upperEdge() );
m_rep.reset(
new TH3D( tit, tit, eX.size() - 1, &eX.front(), eY.size() - 1, &eY.front(), eZ.size() - 1, &eZ.front() ) );
new TH3D( title, title, eX.size() - 1, &eX.front(), eY.size() - 1, &eY.front(), eZ.size() - 1, &eZ.front() ) );
}
m_xAxis.initialize( m_rep->GetXaxis(), true );
m_yAxis.initialize( m_rep->GetYaxis(), true );
......
......@@ -1627,17 +1627,17 @@ AIDA::IHistogram2D* HistogramSvc::projectionYZ( const std::string& nameAndTitle,
}
// ============================================================================
AIDA::IHistogram1D* HistogramSvc::createHistogram1D( const std::string& name, const std::string& tit, int nx,
AIDA::IHistogram1D* HistogramSvc::createHistogram1D( const std::string& name, const std::string& title, int nx,
double lowx, double upx )
{
return book( name, tit, nx, lowx, upx );
return book( name, title, nx, lowx, upx );
}
// ============================================================================
AIDA::IHistogram1D* HistogramSvc::createHistogram1D( const std::string& name, const std::string& tit, int nx,
AIDA::IHistogram1D* HistogramSvc::createHistogram1D( const std::string& name, const std::string& title, int nx,
double lowx, double upx, const std::string& /*opt*/ )
{
return book( name, tit, nx, lowx, upx );
return book( name, title, nx, lowx, upx );
}
// ============================================================================
......@@ -1680,18 +1680,18 @@ AIDA::IHistogram1D* HistogramSvc::createCopy( DataObject* pPar, const std::strin
}
// ============================================================================
AIDA::IHistogram2D* HistogramSvc::createHistogram2D( const std::string& name, const std::string& tit, int nx,
AIDA::IHistogram2D* HistogramSvc::createHistogram2D( const std::string& name, const std::string& title, int nx,
double lowx, double upx, int ny, double lowy, double upy )
{
return book( name, tit, nx, lowx, upx, ny, lowy, upy );
return book( name, title, nx, lowx, upx, ny, lowy, upy );
}
// ============================================================================
AIDA::IHistogram2D* HistogramSvc::createHistogram2D( const std::string& name, const std::string& tit, int nx,
AIDA::IHistogram2D* HistogramSvc::createHistogram2D( const std::string& name, const std::string& title, int nx,
double lowx, double upx, int ny, double lowy, double upy,
const std::string& /*opt*/ )
{
return book( name, tit, nx, lowx, upx, ny, lowy, upy );
return book( name, title, nx, lowx, upx, ny, lowy, upy );
}
// ============================================================================
......@@ -1735,19 +1735,19 @@ AIDA::IHistogram2D* HistogramSvc::createCopy( DataObject* pPar, const std::strin
}
// ============================================================================
AIDA::IHistogram3D* HistogramSvc::createHistogram3D( const std::string& name, const std::string& tit, int nx,
AIDA::IHistogram3D* HistogramSvc::createHistogram3D( const std::string& name, const std::string& title, int nx,
double lowx, double upx, int ny, double lowy, double upy, int nz,
double lowz, double upz )
{
return book( name, tit, nx, lowx, upx, ny, lowy, upy, nz, lowz, upz );
return book( name, title, nx, lowx, upx, ny, lowy, upy, nz, lowz, upz );
}
// ============================================================================
AIDA::IHistogram3D* HistogramSvc::createHistogram3D( const std::string& name, const std::string& tit, int nx,
AIDA::IHistogram3D* HistogramSvc::createHistogram3D( const std::string& name, const std::string& title, int nx,
double lowx, double upx, int ny, double lowy, double upy, int nz,
double lowz, double upz, const std::string& /*opt*/ )
{
return book( name, tit, nx, lowx, upx, ny, lowy, upy, nz, lowz, upz );
return book( name, title, nx, lowx, upx, ny, lowy, upy, nz, lowz, upz );
}
// ============================================================================
......@@ -1791,17 +1791,17 @@ AIDA::IHistogram3D* HistogramSvc::createCopy( DataObject* pPar, const std::strin
}
// ============================================================================
AIDA::IProfile1D* HistogramSvc::createProfile1D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IProfile1D* HistogramSvc::createProfile1D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, const std::string& opt )
{
return bookProf( name, tit, nx, lowx, upx, opt );
return bookProf( name, title, nx, lowx, upx, opt );
}
// ============================================================================
AIDA::IProfile1D* HistogramSvc::createProfile1D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IProfile1D* HistogramSvc::createProfile1D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, double upper, double lower, const std::string& opt )
{
return bookProf( name, tit, nx, lowx, upx, upper, lower, opt );
return bookProf( name, title, nx, lowx, upx, upper, lower, opt );
}
// ============================================================================
......@@ -1856,18 +1856,18 @@ AIDA::IProfile1D* HistogramSvc::createCopy( DataObject* pPar, const std::string&
}
// ============================================================================
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy )
{
return bookProf( name, tit, nx, lowx, upx, ny, lowy, upy );
return bookProf( name, title, nx, lowx, upx, ny, lowy, upy );
}
// ============================================================================
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy,
const std::string& /*opt*/ )
{
return bookProf( name, tit, nx, lowx, upx, ny, lowy, upy );
return bookProf( name, title, nx, lowx, upx, ny, lowy, upy );
}
// ============================================================================
......@@ -1885,19 +1885,19 @@ AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& nameAndTitle
}
// ============================================================================
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy, double upper,
double lower )
{
return bookProf( name, tit, nx, lowx, upx, ny, lowy, upy, upper, lower );
return bookProf( name, title, nx, lowx, upx, ny, lowy, upy, upper, lower );
}
// ============================================================================
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& tit, int nx, double lowx,
AIDA::IProfile2D* HistogramSvc::createProfile2D( const std::string& name, const std::string& title, int nx, double lowx,
double upx, int ny, double lowy, double upy, double upper,
double lower, const std::string& /*opt*/ )
{
return bookProf( name, tit, nx, lowx, upx, ny, lowy, upy, upper, lower );
return bookProf( name, title, nx, lowx, upx, ny, lowy, upy, upper, lower );
}
// ============================================================================
......
......@@ -228,10 +228,10 @@ private:
bool m_updateRequired = true;
// ==========================================================================
ChronoEntity m_total;
ulonglong m_statAlg = 0;
ulonglong m_statNode = 0;
ulonglong m_stat = 0;
ChronoEntity m_total;
unsigned long long m_statAlg = 0;
unsigned long long m_statNode = 0;
unsigned long long m_stat = 0;
// ==========================================================================
ChronoEntity m_timer_nodes;
ChronoEntity m_timer_algs;
......
......@@ -11,7 +11,6 @@ https://savannah.cern.ch/task/?13911
"""
# =============================================================================
__author__ = "Vanya BELYAEV Ivan.Belyaev@itep.ru"
__version__ = "CVS tag $Name:$, version $Revision:$"
__date__ = "2010-04-24"
# =============================================================================
......@@ -82,7 +81,6 @@ if '__main__' == __name__:
print '*' * 120
print __doc__
print ' Author : %s ' % __author__
print ' Version : %s ' % __version__
print ' Date : %s ' % __date__
print '*' * 120
......
......@@ -5,7 +5,6 @@ Simple example to illustrate the problem for task #13911
https://savannah.cern.ch/task/?13911
Author : Vanya BELYAEV Ivan.Belyaev@itep.ru
Version : CVS tag $Name:$, version $Revision:$
Date : 2010-04-24
************************************************************************************************************************
ApplicationMgr SUCCESS
......
// $Id: IAlgManager.h,v 1.7 2008/06/02 14:20:38 marcocle Exp $
#ifndef GAUDIKERNEL_IALGRESOURCEPOOL_H
#define GAUDIKERNEL_IALGRESOURCEPOOL_H
......
......@@ -37,7 +37,6 @@ public:
/// the actual type of identifier for Chrono objects
typedef std::string ChronoTag;
/// Type of the delta-time
// typedef longlong ChronoTime ;
typedef double ChronoTime;
// ==========================================================================
public:
......
......@@ -18,7 +18,6 @@ namespace Athena
/** @class IClassIDSvc
* @brief interface to the CLID database
* @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration
*$Id: IClassIDSvc.h,v 1.7 2009-01-15 19:05:54 binet Exp $
*/
class IClassIDSvc : virtual public IService
......
......@@ -13,26 +13,6 @@
#endif
// Large integer definition depends of the platform
#ifdef _WIN32
#ifndef NO_LONGLONG_TYPEDEF
typedef __int64 longlong;
typedef unsigned __int64 ulonglong;
#endif
#ifndef LONGLONG_MAX
#define LONGLONG_MAX 0x7FFFFFFFFFFFFFFFLL
#endif
#ifndef LONGLONG_MIN
#define LONGLONG_MIN 0x8000000000000000LL
#endif
#ifndef ULONGLONG_MAX
#define ULONGLONG_MAX 0xFFFFFFFFFFFFFFFFLL
#endif
#ifndef ULONGLONG_MIN
#define ULONGLONG_MIN 0x0000000000000000LL
#endif
#elif defined( __linux ) || defined( __APPLE__ )
#ifndef NO_LONGLONG_TYPEDEF
typedef long long int longlong;
typedef unsigned long long int ulonglong;
......@@ -51,19 +31,6 @@ typedef unsigned long long int ulonglong;
#ifndef ULONGLONG_MIN
#define ULONGLONG_MIN 0x0000000000000000LL
#endif
#else
// This will not really work !!
struct __longlong {
public:
long __data[2];
};
typedef __longlong longlong;
typedef __longlong ulonglong;
static const __longlong LONGLONG_MAX = {0x7FFFFFFF, 0xFFFFFFFF};
static const __longlong LONGLONG_MIN = {0x80000000, 0x00000000};
static const __ulonglong ULONGLONG_MAX = {0xFFFFFFFF, 0xFFFFFFFF};
static const __ulonglong ULONGLONG_MIN = {0x00000000, 0x00000000};
#endif // linux
// ---------------------------------- Symbol visibility macros (begin)
// Enabled on in Gaudi v21 mode
......
......@@ -146,7 +146,7 @@ public:
}
/// Accept MsgStream activation using MsgStreamer operator
MsgStream& operator<<( MSG::Level level ) { return report( level ); }
MsgStream& operator<<( longlong arg )
MsgStream& operator<<( long long arg )
{
try {
// this may throw, and we cannot afford it if the stream is used in a catch block
......
......@@ -339,14 +339,14 @@ public:
#undef IMPLEMENT_STREAMER
/// Output Streamer
StreamBuffer& operator<<( longlong data )
StreamBuffer& operator<<( long long data )
{
swapToBuffer( &data, sizeof( data ) );
STREAM_ANALYSE( data, sizeof( data ) );
return *this;
}
/// Input Streamer
StreamBuffer& operator>>( longlong& data )
StreamBuffer& operator>>( long long& data )
{
swapFromBuffer( &data, sizeof( data ) );
return *this;
......
......@@ -2,7 +2,7 @@
#define GAUDIKERNEL_TIME_H 1
// Include files
// for the architecture independent int64 definition (longlong)
// for the architecture independent int64 definition (long long)
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/Kernel.h"
#include "GaudiKernel/StreamBuffer.h"
......@@ -57,7 +57,7 @@ namespace Gaudi
friend class Time;
public:
typedef longlong ValueType;
typedef long long ValueType;
/** Initialize an empty (zero) time difference. */
TimeSpan() = default;
......@@ -239,7 +239,7 @@ namespace Gaudi
friend class TimeSpan;
public:
typedef longlong ValueType;
typedef long long ValueType;
/** Symbolic names for months */
enum Months {
......
......@@ -58,7 +58,7 @@ namespace System
enum TimeType { Year, Month, Day, Hour, Min, Sec, milliSec, microSec, nanoSec, Native };
/// Convert time from OS native time to requested representation (Experts only)
GAUDI_API longlong adjustTime( TimeType typ, longlong timevalue );
GAUDI_API long long adjustTime( TimeType typ, long long timevalue );
/// Convert the time from OS native time to requested representation (Experts only)
template <TimeType T>
......@@ -69,7 +69,7 @@ namespace System
@param timevalue Time value to be converted.
@return Requested value in the indicated units.
*/
GAUDI_API longlong ellapsedTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
GAUDI_API long long ellapsedTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
/** CPU kernel mode time of process in milliseconds.
@param typ Indicator or the unit the time will be returned.
@param fetch Indicator of the information to be fetched.
......@@ -77,7 +77,7 @@ namespace System
@param pid Process ID of which the information will be returned
@return Requested value in the indicated units.
*/
GAUDI_API longlong kernelTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
GAUDI_API long long kernelTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
/** CPU user mode time of process in milliseconds.
@param typ Indicator or the unit the time will be returned.
@param fetch Indicator of the information to be fetched.
......@@ -85,7 +85,7 @@ namespace System
@param pid Process ID of which the information will be returned
@return Requested value in the indicated units.
*/
GAUDI_API longlong userTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
GAUDI_API long long userTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
/** Consumed CPU time of process in milliseconds.
@param typ Indicator or the unit the time will be returned.
@param fetch Indicator of the information to be fetched.
......@@ -93,7 +93,7 @@ namespace System
@param pid Process ID of which the information will be returned
@return Requested value in the indicated units.
*/
GAUDI_API longlong cpuTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
GAUDI_API long long cpuTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
/** Maximum processing time left for this process.
@param typ Indicator or the unit the time will be returned.
@param fetch Indicator of the information to be fetched.
......@@ -101,7 +101,7 @@ namespace System
@param pid Process ID of which the information will be returned
@return Requested value in the indicated units.
*/
GAUDI_API longlong remainingTime( TimeType typ = milliSec, InfoType fetch = Quota, long pid = -1 );
GAUDI_API long long remainingTime( TimeType typ = milliSec, InfoType fetch = Quota, long pid = -1 );
/** Process Creation time.
@param typ Indicator or the unit the time will be returned.
@param fetch Indicator of the information to be fetched.
......@@ -109,33 +109,33 @@ namespace System
@param pid Process ID of which the information will be returned
@return Requested value in the indicated units.
*/
GAUDI_API longlong creationTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
GAUDI_API long long creationTime( TimeType typ = milliSec, InfoType fetch = Times, long pid = -1 );
/** Maximum processing time left for this process.
@param typ Indicator or the unit the time will be returned.
@return Requested value in the indicated units.
*/
GAUDI_API longlong systemStart( TimeType typ = Sec );
GAUDI_API long long systemStart( TimeType typ = Sec );
/** Maximum processing time left for this process.
@param typ Indicator or the unit the time will be returned.
@return Requested value in the indicated units.
*/
GAUDI_API longlong upTime( TimeType typ = Hour );
GAUDI_API long long upTime( TimeType typ = Hour );
/** Retrieve absolute system time
@param typ Indicator or the unit the time will be returned.
@return Requested value in the indicated units.
*/
/// Get current time in specificed units via template parameter (inlined)
template <TimeType T>
GAUDI_API longlong currentTime();
template <TimeType T>
GAUDI_API long long currentTime();
/// Get current time in specificed units
GAUDI_API longlong currentTime( TimeType typ = milliSec );
GAUDI_API long long currentTime( TimeType typ = milliSec );
/** Retrieve the number of ticks since system startup
@return Requested value in the indicated units.
*/
GAUDI_API longlong tickCount();
GAUDI_API long long tickCount();
/** Simple class to hold the time information of a process.
*
......@@ -266,10 +266,10 @@ namespace System
// This is frequently used and thus we inline it if possible
template <TimeType T>
inline longlong currentTime()
inline long long currentTime()
{
#ifdef _WIN32
longlong current = 0;
long long current = 0;
::GetSystemTimeAsFileTime( (FILETIME*)&current );
return adjustTime<T>( current - UNIX_BASE_TIME );