Commit 37bf28c2 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: rename Profiling -> profiling

parent e86d3f2e
......@@ -59,7 +59,7 @@ Description
#include "IOmanip.H"
#include "decompositionModel.H"
#include "fvMeshTools.H"
#include "Profiling.H"
#include "profiling.H"
using namespace Foam;
......@@ -929,7 +929,7 @@ int main(int argc, char *argv[])
}
// for the impatient who want to see some output files:
Profiling::writeNow();
profiling::writeNow();
// Read geometry
// ~~~~~~~~~~~~~
......@@ -1006,7 +1006,7 @@ int main(int argc, char *argv[])
initialCellSize/defaultCellSize
);
Profiling::writeNow();
profiling::writeNow();
}
else
{
......@@ -1542,7 +1542,7 @@ int main(int argc, char *argv[])
Info<< "Mesh refined in = "
<< timer.cpuTimeIncrement() << " s." << endl;
Profiling::writeNow();
profiling::writeNow();
}
if (wantSnap)
......@@ -1592,7 +1592,7 @@ int main(int argc, char *argv[])
Info<< "Mesh snapped in = "
<< timer.cpuTimeIncrement() << " s." << endl;
Profiling::writeNow();
profiling::writeNow();
}
if (wantLayers)
......@@ -1650,7 +1650,7 @@ int main(int argc, char *argv[])
Info<< "Layers added in = "
<< timer.cpuTimeIncrement() << " s." << endl;
Profiling::writeNow();
profiling::writeNow();
}
......@@ -1679,7 +1679,7 @@ int main(int argc, char *argv[])
Info<< "Finished meshing without any errors" << endl;
}
Profiling::writeNow();
profiling::writeNow();
}
......@@ -1744,7 +1744,7 @@ int main(int argc, char *argv[])
cellCentres.write();
}
Profiling::writeNow();
profiling::writeNow();
Info<< "Finished meshing in = "
<< runTime.elapsedCpuTime() << " s." << endl;
......
......@@ -3,8 +3,8 @@ global/global.Cver
/* global/constants/dimensionedConstants.C in global.Cver */
global/argList/argList.C
global/clock/clock.C
global/profiling/Profiling.C
global/profiling/ProfilingSysInfo.C
global/profiling/profiling.C
global/profiling/profilingSysInfo.C
bools = primitives/bools
$(bools)/bool/bool.C
......
......@@ -27,7 +27,7 @@ License
#include "PstreamReduceOps.H"
#include "argList.H"
#include "HashSet.H"
#include "Profiling.H"
#include "profiling.H"
#include <sstream>
......@@ -351,7 +351,7 @@ void Foam::Time::setMonitoring(bool forceProfiling)
&& profilingDict->lookupOrDefault<Switch>("active", true)
)
{
Profiling::initialize
profiling::initialize
(
*profilingDict,
IOobject
......@@ -687,7 +687,7 @@ Foam::Time::~Time()
functionObjects_.clear();
// cleanup profiling
Profiling::stop(*this);
profiling::stop(*this);
}
......
......@@ -27,7 +27,7 @@ License
#include "Pstream.H"
#include "simpleObjectRegistry.H"
#include "dimensionedConstants.H"
#include "Profiling.H"
#include "profiling.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
......
......@@ -26,7 +26,7 @@ License
#include "functionObjectList.H"
#include "Time.H"
#include "mapPolyMesh.H"
#include "Profiling.H"
#include "profiling.H"
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
......
......@@ -23,8 +23,8 @@ License
\*---------------------------------------------------------------------------*/
#include "Profiling.H"
#include "ProfilingSysInfo.H"
#include "profiling.H"
#include "profilingSysInfo.H"
#include "cpuInfo.H"
#include "memInfo.H"
#include "OSspecific.H"
......@@ -34,9 +34,9 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
Foam::Profiling* Foam::Profiling::pool_(0);
Foam::profiling* Foam::profiling::pool_(0);
Foam::label Foam::Profiling::Information::nextId_(0);
Foam::label Foam::profiling::Information::nextId_(0);
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
......@@ -52,13 +52,13 @@ inline static void writeEntry
}
Foam::label Foam::Profiling::Information::getNextId()
Foam::label Foam::profiling::Information::getNextId()
{
return nextId_++;
}
void Foam::Profiling::Information::raiseID(label maxVal)
void Foam::profiling::Information::raiseID(label maxVal)
{
if (nextId_ < maxVal)
{
......@@ -67,17 +67,17 @@ void Foam::Profiling::Information::raiseID(label maxVal)
}
bool Foam::Profiling::active()
bool Foam::profiling::active()
{
return pool_;
}
bool Foam::Profiling::writeNow()
bool Foam::profiling::writeNow()
{
if (pool_)
{
Info<<"Profiling::writeNow() at time = "
Info<<"profiling::writeNow() at time = "
<< pool_->owner().timeName() << endl;
return pool_->write();
}
......@@ -88,7 +88,7 @@ bool Foam::Profiling::writeNow()
}
void Foam::Profiling::initialize
void Foam::profiling::initialize
(
const IOobject& ioObj,
const Time& owner
......@@ -101,7 +101,7 @@ void Foam::Profiling::initialize
}
else
{
pool_ = new Profiling(ioObj, owner);
pool_ = new profiling(ioObj, owner);
Information *info = pool_->store
(
......@@ -109,12 +109,12 @@ void Foam::Profiling::initialize
);
pool_->push(info, pool_->clockTime_);
Info<< "Profiling initialized" << nl;
Info<< "profiling initialized" << nl;
}
}
void Foam::Profiling::initialize
void Foam::profiling::initialize
(
const dictionary& dict,
const IOobject& ioObj,
......@@ -128,7 +128,7 @@ void Foam::Profiling::initialize
}
else
{
pool_ = new Profiling(dict, ioObj, owner);
pool_ = new profiling(dict, ioObj, owner);
Information *info = pool_->store
(
......@@ -136,12 +136,12 @@ void Foam::Profiling::initialize
);
pool_->push(info, pool_->clockTime_);
Info<< "Profiling initialized" << nl;
Info<< "profiling initialized" << nl;
}
}
void Foam::Profiling::stop(const Time& owner)
void Foam::profiling::stop(const Time& owner)
{
if (pool_ && &owner == &(pool_->owner_))
{
......@@ -151,7 +151,7 @@ void Foam::Profiling::stop(const Time& owner)
}
Foam::Profiling::Information* Foam::Profiling::New
Foam::profiling::Information* Foam::profiling::New
(
const string& name,
clockTime& timer
......@@ -177,7 +177,7 @@ Foam::Profiling::Information* Foam::Profiling::New
}
void Foam::Profiling::unstack(const Information *info)
void Foam::profiling::unstack(const Information *info)
{
if (pool_ && info)
{
......@@ -200,7 +200,7 @@ void Foam::Profiling::unstack(const Information *info)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::Profiling::Profiling
Foam::profiling::profiling
(
const IOobject& io,
const Time& owner
......@@ -218,7 +218,7 @@ Foam::Profiling::Profiling
{}
Foam::Profiling::Profiling
Foam::profiling::profiling
(
const dictionary& dict,
const IOobject& io,
......@@ -249,7 +249,7 @@ Foam::Profiling::Profiling
{}
Foam::Profiling::Information::Information()
Foam::profiling::Information::Information()
:
id_(getNextId()),
description_("application::main"),
......@@ -257,11 +257,12 @@ Foam::Profiling::Information::Information()
calls_(0),
totalTime_(0),
childTime_(0),
maxMem_(0),
onStack_(false)
{}
Foam::Profiling::Information::Information
Foam::profiling::Information::Information
(
Information *parent,
const string& descr
......@@ -277,23 +278,23 @@ Foam::Profiling::Information::Information
{}
Foam::Profiling::Trigger::Trigger(const char* name)
Foam::profiling::Trigger::Trigger(const char* name)
:
clock_(),
ptr_(Profiling::New(name, clock_))
ptr_(profiling::New(name, clock_))
{}
Foam::Profiling::Trigger::Trigger(const string& name)
Foam::profiling::Trigger::Trigger(const string& name)
:
clock_(),
ptr_(Profiling::New(name, clock_))
ptr_(profiling::New(name, clock_))
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::Profiling::~Profiling()
Foam::profiling::~profiling()
{
deleteDemandDrivenData(sysInfo_);
deleteDemandDrivenData(cpuInfo_);
......@@ -307,11 +308,11 @@ Foam::Profiling::~Profiling()
}
Foam::Profiling::Information::~Information()
Foam::profiling::Information::~Information()
{}
Foam::Profiling::Trigger::~Trigger()
Foam::profiling::Trigger::~Trigger()
{
stop();
}
......@@ -319,25 +320,25 @@ Foam::Profiling::Trigger::~Trigger()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const Foam::Time& Foam::Profiling::owner() const
const Foam::Time& Foam::profiling::owner() const
{
return owner_;
}
Foam::label Foam::Profiling::size() const
Foam::label Foam::profiling::size() const
{
return stack_.size();
}
Foam::Profiling::Information* Foam::Profiling::find(const string& name)
Foam::profiling::Information* Foam::profiling::find(const string& name)
{
StorageContainer::iterator iter = hash_.find(name);
return (iter != hash_.end() ? iter() : 0);
}
void Foam::Profiling::Information::update(const scalar& elapsed)
void Foam::profiling::Information::update(const scalar& elapsed)
{
++calls_;
totalTime_ += elapsed;
......@@ -349,7 +350,7 @@ void Foam::Profiling::Information::update(const scalar& elapsed)
}
bool Foam::Profiling::writeData(Ostream& os) const
bool Foam::profiling::writeData(Ostream& os) const
{
os << indent << "profiling" << nl
<< indent << token::BEGIN_LIST << incrIndent << nl;
......@@ -429,14 +430,14 @@ bool Foam::Profiling::writeData(Ostream& os) const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::Profiling::Information* Foam::Profiling::store(Information *info)
Foam::profiling::Information* Foam::profiling::store(Information *info)
{
hash_.insert(info->description(), info);
return info;
}
void Foam::Profiling::push(Information *info, clockTime& timer)
void Foam::profiling::push(Information *info, clockTime& timer)
{
stack_.push(info);
timers_.set(info->id(), &timer);
......@@ -444,7 +445,7 @@ void Foam::Profiling::push(Information *info, clockTime& timer)
}
Foam::Profiling::Information* Foam::Profiling::pop()
Foam::profiling::Information* Foam::profiling::pop()
{
Information *info = stack_.pop();
timers_.erase(info->id());
......@@ -454,37 +455,37 @@ Foam::Profiling::Information* Foam::Profiling::pop()
}
bool Foam::Profiling::Trigger::running() const
bool Foam::profiling::Trigger::running() const
{
return ptr_;
}
void Foam::Profiling::Trigger::stop()
void Foam::profiling::Trigger::stop()
{
if (ptr_)
{
ptr_->update(clock_.elapsedTime());
Profiling::unstack(ptr_);
profiling::unstack(ptr_);
// pointer is managed by pool storage -> thus no delete here
}
ptr_ = 0;
}
void Foam::Profiling::Information::push() const
void Foam::profiling::Information::push() const
{
onStack_ = true;
}
void Foam::Profiling::Information::pop() const
void Foam::profiling::Information::pop() const
{
onStack_ = false;
}
Foam::Ostream& Foam::Profiling::Information::write
Foam::Ostream& Foam::profiling::Information::write
(
Ostream& os,
const bool offset,
......@@ -521,7 +522,7 @@ Foam::Ostream& Foam::Profiling::Information::write
Foam::Ostream& Foam::operator<<
(
Ostream& os,
const Profiling::Information& info
const profiling::Information& info
)
{
return info.write(os);
......
......@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::Profiling
Foam::profiling
Description
Code profiling.
......@@ -44,12 +44,12 @@ Description
\endcode
SourceFiles
Profiling.C
profiling.C
\*---------------------------------------------------------------------------*/
#ifndef Profiling_H
#define Profiling_H
#ifndef profiling_H
#define profiling_H
#include "HashPtrTable.H"
#include "LIFOStack.H"
......@@ -69,10 +69,10 @@ class cpuInfo;
class memInfo;
/*---------------------------------------------------------------------------*\
Class Profiling Declaration
Class profiling Declaration
\*---------------------------------------------------------------------------*/
class Profiling
class profiling
:
public regIOobject
{
......@@ -89,7 +89,7 @@ private:
// Private Static Data Members
//- Only one global pool object is possible
static Profiling *pool_;
static profiling *pool_;
// Private Data Members
......@@ -126,10 +126,10 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
Profiling(const Profiling&) = delete;
profiling(const profiling&) = delete;
//- Disallow default bitwise assignment
void operator=(const Profiling&) = delete;
void operator=(const profiling&) = delete;
protected:
......@@ -142,14 +142,14 @@ protected:
// Constructors
//- Construct IO object, everything enabled
Profiling(const IOobject&, const Time&);
profiling(const IOobject&, const Time&);
//- Construct IO object with finer control over behaviour
Profiling(const dictionary&, const IOobject&, const Time&);
profiling(const dictionary&, const IOobject&, const Time&);
//- Destructor
~Profiling();
~profiling();
// Protected Member Functions
......@@ -210,10 +210,10 @@ public:
/*---------------------------------------------------------------------------*\
Class Profiling::Information Declaration
Class profiling::Information Declaration
\*---------------------------------------------------------------------------*/
class Profiling::Information
class profiling::Information
{
// Private Static Data Members
......@@ -264,7 +264,7 @@ protected:
// Friendship
friend class Profiling;
friend class profiling;
// Constructors
......@@ -365,10 +365,10 @@ public:
/*---------------------------------------------------------------------------*\
Class Profiling::Trigger Declaration
Class profiling::Trigger Declaration
\*---------------------------------------------------------------------------*/
class Profiling::Trigger
class profiling::Trigger
{
// Private Data Members
......@@ -431,19 +431,18 @@ public:
// Macros
//- Define profiling with specified name and description correspond to the name
// \sa addProfiling
// \sa endProfiling
#define addProfiling0(name) \
Foam::Profiling::Trigger profilingTriggerFor##name(#name)
//- Define profiling with specified name and description string
// This is required if the description contains space, colons etc.
// \sa addProfiling0
// \sa endProfiling
#define addProfiling(name,descr) \
Foam::Profiling::Trigger profilingTriggerFor##name(descr)
::Foam::profiling::Trigger profilingTriggerFor##name(descr)
//- Define profiling with specified name and description correspond to the name
// \sa addProfiling
// \sa endProfiling
#define addProfiling0(name) \
::Foam::Profiling::Trigger profilingTriggerFor##name(#name)
//- Remove profiling with specified name
......
......@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "ProfilingSysInfo.H"
#include "profilingSysInfo.H"
#include "demandDrivenData.H"
#include "foamVersion.H"
......@@ -56,20 +56,20 @@ inline static void printEnv
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::Profiling::sysInfo::sysInfo()
Foam::profiling::sysInfo::sysInfo()
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::Profiling::sysInfo::~sysInfo()
Foam::profiling::sysInfo::~sysInfo()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //