FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added use of Mutex into osg::Stats to better handle multi-threaded usage

Browse Source
This commit is contained in:
Robert Osfield
2007-02-14 16:24:49 +00:00
parent 02ff109746
commit 810e7291fc
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/osg/Stats
View File

@@ -15,6 +15,8 @@
#define OSG_STATS 1
#include <osg/Referenced>
#include <OpenThreads/Mutex>
#include <OpenThreads/ScopedLock>
#include <string>
#include <map>
@@ -43,13 +45,28 @@ class OSG_EXPORT Stats : public osg::Referenced
typedef std::vector<AttributeMap> AttributeMapList;
bool setAttribute(int frameNumber, const std::string& attributeName, double value);
bool getAttribute(int frameNumber, const std::string& attributeName, double& value) const;
inline bool getAttribute(int frameNumber, const std::string& attributeName, double& value) const
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return getAttributeNoMutex(frameNumber, attributeName, value);
}
bool getAveragedAttribute(const std::string& attributeName, double& value, bool averageInInverseSpace=false) const;
bool getAveragedAttribute(int startFrameNumber, int endFrameNumber, const std::string& attributeName, double& value, bool averageInInverseSpace=false) const;
AttributeMap& getAttributeMap(int frameNumber);
const AttributeMap& getAttributeMap(int frameNumber) const;
inline AttributeMap& getAttributeMap(int frameNumber)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return getAttributeMapNoMutex(frameNumber);
}
inline const AttributeMap& getAttributeMap(int frameNumber) const
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return getAttributeMapNoMutex(frameNumber);
}
typedef std::map<std::string, bool> CollectMap;
@@ -57,17 +74,25 @@ class OSG_EXPORT Stats : public osg::Referenced
inline bool collectStats(const std::string& str) const
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
CollectMap::const_iterator itr = _collectMap.find(str);
return (itr != _collectMap.end()) ? itr->second : false;
}
void report(std::ostream& out, const char* indent=0) const ;
void report(std::ostream& out, const char* indent=0) const;
void report(std::ostream& out, unsigned int frameNumber, const char* indent=0) const;
protected:
virtual ~Stats() {}
bool getAttributeNoMutex(int frameNumber, const std::string& attributeName, double& value) const;
Stats::AttributeMap& Stats::getAttributeMapNoMutex(int frameNumber);
const AttributeMap& getAttributeMapNoMutex(int frameNumber) const;
int getIndex(int frameNumber) const
{
// reject frame that are in the future
@@ -82,6 +107,8 @@ class OSG_EXPORT Stats : public osg::Referenced
std::string _name;
mutable OpenThreads::Mutex _mutex;
int _baseFrameNumber;
int _latestFrameNumber;