diff options
| author | Richard Linden <none@none> | 2013-09-18 14:45:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-18 14:45:15 -0700 |
| commit | f5ca3695f22fa52b4d6b2db9c8a9e10a78869518 (patch) | |
| tree | 6c57bef56acb9606715bd514de23031b5ae24562 | |
| parent | 72f979135b3497d16c2635babf057900ddbc42fe (diff) | |
BUILDFIX: bad merge
| -rw-r--r-- | indra/llcommon/lltrace.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index 472f0b0cf0..3cc0d16b93 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -539,8 +539,7 @@ public: template<typename AMOUNT_T> AMOUNT_T& memDisclaimAmount(AMOUNT_T& size) { - MemStatAccumulator& accumulator = sMemStat.getPrimaryAccumulator(); - accumulator.mSize.sample(accumulator.mSize.hasValue() ? accumulator.mSize.getLastValue() - (F64)size : -(F64)size); + disclaim_mem(size); return size; } @@ -552,7 +551,6 @@ private: { static void claim(mem_trackable_t& tracker, const TRACKED& tracked) { - MemStatAccumulator& accumulator = sMemStat.getPrimaryAccumulator(); size_t footprint = MemFootprint<TRACKED>::measure(tracked); claim_mem(sMemStat, footprint); tracker.mMemFootprint += footprint; @@ -560,7 +558,6 @@ private: static void disclaim(mem_trackable_t& tracker, const TRACKED& tracked) { - MemStatAccumulator& accumulator = sMemStat.getPrimaryAccumulator(); size_t footprint = MemFootprint<TRACKED>::measure(tracked); disclaim_mem(sMemStat, footprint); tracker.mMemFootprint -= footprint; @@ -572,13 +569,11 @@ private: { static void claim(mem_trackable_t& tracker, TRACKED& tracked) { - MemStatAccumulator& accumulator = sMemStat.getPrimaryAccumulator(); accumulator.mChildSize.sample(accumulator.mChildSize.hasValue() ? accumulator.mChildSize.getLastValue() + (F64)MemFootprint<TRACKED>::measure(tracked) : (F64)MemFootprint<TRACKED>::measure(tracked)); } static void disclaim(mem_trackable_t& tracker, TRACKED& tracked) { - MemStatAccumulator& accumulator = sMemStat.getPrimaryAccumulator(); accumulator.mChildSize.sample(accumulator.mChildSize.hasValue() ? accumulator.mChildSize.getLastValue() - (F64)MemFootprint<TRACKED>::measure(tracked) : -(F64)MemFootprint<TRACKED>::measure(tracked)); } }; |