mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-26 23:23:33 +00:00
c2306345d5
This patch removes checking of all the callback calls in memory reporter CollectReport() functions, because it's not useful. The patch also does some associated clean-up. - Replaces some uses of nsIMemoryReporterCallback with the preferred nsIHandleReportCallback typedef. - Replaces aCallback/aCb/aClosure with aHandleRepor/aData for CollectReports() parameter names, for consistency. - Adds MOZ_MUST_USE/[must_use] in a few places in nsIMemoryReporter.idl. - Uses the MOZ_COLLECT_REPORT macro in all suitable places. Overall the patch reduces code size by ~300 lines and reduces the size of libxul by about 37 KiB on my Linux64 builds. --HG-- extra : rebase_source : e94323614bd10463a0c5134a7276238a7ca1cf23
106 lines
2.9 KiB
C++
106 lines
2.9 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* vim: set ts=8 sts=4 et sw=4 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef GFXTEXTURESREPORTER_H_
|
|
#define GFXTEXTURESREPORTER_H_
|
|
|
|
#include "mozilla/Atomics.h"
|
|
#include "nsIMemoryReporter.h"
|
|
#include "GLTypes.h"
|
|
|
|
namespace mozilla {
|
|
namespace gl {
|
|
|
|
class GfxTexturesReporter final : public nsIMemoryReporter
|
|
{
|
|
~GfxTexturesReporter() {}
|
|
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
|
|
GfxTexturesReporter()
|
|
{
|
|
#ifdef DEBUG
|
|
// There must be only one instance of this class, due to |sAmount|
|
|
// being static. Assert this.
|
|
static bool hasRun = false;
|
|
MOZ_ASSERT(!hasRun);
|
|
hasRun = true;
|
|
#endif
|
|
}
|
|
|
|
enum MemoryUse {
|
|
// when memory being allocated is reported to a memory reporter
|
|
MemoryAllocated,
|
|
// when memory being freed is reported to a memory reporter
|
|
MemoryFreed
|
|
};
|
|
|
|
// When memory is used/freed for tile textures, call this method to update
|
|
// the value reported by this memory reporter.
|
|
static void UpdateAmount(MemoryUse action, size_t amount);
|
|
|
|
static void UpdateWasteAmount(size_t delta) {
|
|
sTileWasteAmount += delta;
|
|
}
|
|
|
|
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
|
|
nsISupports* aData, bool aAnonymize) override
|
|
{
|
|
MOZ_COLLECT_REPORT(
|
|
"gfx-tiles-waste", KIND_OTHER, UNITS_BYTES,
|
|
int64_t(sTileWasteAmount),
|
|
"Memory lost due to tiles extending past content boundaries");
|
|
|
|
MOZ_COLLECT_REPORT(
|
|
"gfx-textures", KIND_OTHER, UNITS_BYTES,
|
|
int64_t(sAmount),
|
|
"Memory used for storing GL textures.");
|
|
|
|
MOZ_COLLECT_REPORT(
|
|
"gfx-textures-peak", KIND_OTHER, UNITS_BYTES,
|
|
int64_t(sPeakAmount),
|
|
"Peak memory used for storing GL textures.");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
static Atomic<size_t> sAmount;
|
|
static Atomic<size_t> sPeakAmount;
|
|
// Count the amount of memory lost to tile waste
|
|
static Atomic<size_t> sTileWasteAmount;
|
|
};
|
|
|
|
class GfxTextureWasteTracker {
|
|
public:
|
|
GfxTextureWasteTracker()
|
|
: mBytes(0)
|
|
{
|
|
MOZ_COUNT_CTOR(GfxTextureWasteTracker);
|
|
}
|
|
|
|
void Update(int32_t aPixelArea, int32_t aBytesPerPixel) {
|
|
GfxTexturesReporter::UpdateWasteAmount(-mBytes);
|
|
mBytes = aPixelArea * aBytesPerPixel;
|
|
GfxTexturesReporter::UpdateWasteAmount(mBytes);
|
|
}
|
|
|
|
~GfxTextureWasteTracker() {
|
|
GfxTexturesReporter::UpdateWasteAmount(-mBytes);
|
|
MOZ_COUNT_DTOR(GfxTextureWasteTracker);
|
|
}
|
|
private:
|
|
GfxTextureWasteTracker(const GfxTextureWasteTracker& aRef);
|
|
|
|
int32_t mBytes;
|
|
};
|
|
|
|
} // namespace gl
|
|
} // namespace mozilla
|
|
|
|
#endif // GFXTEXTURESREPORTER_H_
|