livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-3275 WIP Run viewer metrics for object update messages 

added buffer merging and copying
meow-7.2.2
Richard Linden 2012-09-07 19:12:41 -07:00
parent a8c0d23bde
commit fa91ea69cc
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
indra/llcommon/lltrace.h
View File

@ -31,7 +31,6 @@
#include "llpreprocessor.h"
#include <vector>
#include <boost/type_traits/alignment_of.hpp>
namespace LLTrace
{
@ -42,6 +41,35 @@ namespace LLTrace
}
template<typename ACCUMULATOR>
struct AccumulatorStorage
{
std::vector<ACCUMULATOR> mStorage;
ACCUMULATOR& operator[](size_t index) { return mStorage[index]; }
void mergeFrom(const AccumulatorStorage<ACCUMULATOR>& other)
{
llassert(mStorage.size() == other.mStorage.size());
for (size_t i = 0; i < mStorage.size(); i++)
{
mStorage[i].mergeFrom(other.mStorage[i]);
}
}
void copyFrom(const AccumulatorStorage<Accumulator>& other)
{
mStorage = other.mStorage;
}
void resize(size_t size)
{
//TODO: get this grow more rapidly (as if with push back)
mStorage.reserve(size);
}
};
template<typename ACCUMULATOR>
class Trace
{
@ -50,7 +78,7 @@ namespace LLTrace
: mName(name)
{
mStorageIndex = sNextIndex++;
sStorage.reserve(sNextIndex);
sStorage.resize(sNextIndex);
}
LL_FORCE_INLINE ACCUMULATOR& getAccumulator()
@ -69,8 +97,8 @@ namespace LLTrace
ptrdiff_t mStorageIndex;
// this needs to be thread local
static std::vector<ACCUMULATOR> sStorage;
static size_t sNextIndex;
static AccumulatorStorage<ACCUMULATOR> sStorage;
static size_t sNextIndex;
};
template<typename ACCUMULATOR> std::vector<ACCUMULATOR> Trace<ACCUMULATOR>::sStorage;
@ -81,7 +109,7 @@ namespace LLTrace
{
public:
Accumulator()
: mSum(),
: mSum(),
mMin(),
mMax(),
mNumSamples(0)