diff options
| author | Richard Linden <none@none> | 2013-09-18 17:08:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-18 17:08:34 -0700 |
| commit | 02dc270620bab6d3bd8035294af4be5b35894b1c (patch) | |
| tree | 2510727908228ca16dc2db90cff4779dbfb44731 /indra | |
| parent | 345421602c57b82487e8b809a2e5388baf5208c9 (diff) | |
BUILDFIX: bad merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/lltrace.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index 3cc0d16b93..3b4370f947 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -474,7 +474,7 @@ public: void operator delete[](void* ptr, size_t size) { - MemStatAccumulator& accumulator = sMemStat.getPrimaryAccumulator(); + MemStatAccumulator& accumulator = sMemStat.getCurrentAccumulator(); accumulator.mSize.sample(accumulator.mSize.hasValue() ? accumulator.mSize.getLastValue() - (F64)size : -(F64)size); accumulator.mAllocatedCount--; accumulator.mDeallocatedCount++; @@ -516,7 +516,7 @@ public: template<typename AMOUNT_T> AMOUNT_T& memClaimAmount(AMOUNT_T& size) { - MemStatAccumulator& accumulator = sMemStat.getPrimaryAccumulator(); + MemStatAccumulator& accumulator = sMemStat.getCurrentAccumulator(); mMemFootprint += (size_t)size; return size; } @@ -569,12 +569,12 @@ private: { static void claim(mem_trackable_t& tracker, TRACKED& tracked) { - accumulator.mChildSize.sample(accumulator.mChildSize.hasValue() ? accumulator.mChildSize.getLastValue() + (F64)MemFootprint<TRACKED>::measure(tracked) : (F64)MemFootprint<TRACKED>::measure(tracked)); + claim_shadow_mem( (F64)MemFootprint<TRACKED>::measure(tracked)); } static void disclaim(mem_trackable_t& tracker, TRACKED& tracked) { - accumulator.mChildSize.sample(accumulator.mChildSize.hasValue() ? accumulator.mChildSize.getLastValue() - (F64)MemFootprint<TRACKED>::measure(tracked) : -(F64)MemFootprint<TRACKED>::measure(tracked)); + disclaim_shadow_mem((F64)MemFootprint<TRACKED>::measure(tracked)); } }; }; |