Justin Mitchell
ba92cb902e
Implements reportMemory() methods across SdCardFont, SdCardFontManager, and Section classes to track resident heap usage. Adds heap audit logging in EpubReaderActivity to attribute memory to fonts, framebuffer, section data, and other components for measurement-driven optimization.
59 lines
2.2 KiB
C++
59 lines
2.2 KiB
C++
#pragma once
|
|
|
|
#include <SdCardFontManager.h>
|
|
#include <SdCardFontRegistry.h>
|
|
|
|
#include <atomic>
|
|
|
|
class GfxRenderer;
|
|
|
|
/// Facade that owns the SD card font registry, manager, and resolver logic.
|
|
/// Hides implementation details behind a single begin() + ensureLoaded() API.
|
|
class SdCardFontSystem {
|
|
public:
|
|
SdCardFontSystem() = default;
|
|
SdCardFontSystem(const SdCardFontSystem&) = delete;
|
|
SdCardFontSystem& operator=(const SdCardFontSystem&) = delete;
|
|
/// Discover SD card fonts and load user's saved selection. Call once during setup.
|
|
void begin(GfxRenderer& renderer);
|
|
|
|
/// Ensure the correct SD font family is loaded for the current settings.
|
|
/// Call before entering the reader or after settings change.
|
|
/// Also re-discovers if the registry has been marked dirty (e.g. by web upload).
|
|
void ensureLoaded(GfxRenderer& renderer);
|
|
|
|
/// Resolve an SD card font ID from family name + fontSize enum.
|
|
/// Returns 0 if not found. Used by CrossPointSettings::getReaderFontId().
|
|
int resolveFontId(const char* familyName, uint8_t fontSizeEnum) const;
|
|
|
|
/// Access the registry (e.g. for settings UI to enumerate available fonts).
|
|
const SdCardFontRegistry& registry() const { return registry_; }
|
|
|
|
/// Non-const access to the registry (for FontInstaller).
|
|
SdCardFontRegistry& registry() { return registry_; }
|
|
|
|
/// Resident heap held by loaded SD fonts (audit; see SdCardFont::reportMemory).
|
|
size_t reportFontMemory() const { return manager_.reportMemory(); }
|
|
|
|
/// Mark the registry as needing re-discovery.
|
|
/// Thread-safe: can be called from the web server task.
|
|
void markRegistryDirty() { registryDirty_.store(true, std::memory_order_release); }
|
|
|
|
/// If the registry is dirty, re-scan the SD card now and clear the flag.
|
|
/// Used by the web UI so uploaded/deleted fonts appear in the list
|
|
/// without waiting for the reader activity to run ensureLoaded().
|
|
void refreshIfDirty() {
|
|
if (registryDirty_.exchange(false, std::memory_order_acquire)) {
|
|
registry_.discover();
|
|
}
|
|
}
|
|
|
|
private:
|
|
SdCardFontRegistry registry_;
|
|
SdCardFontManager manager_;
|
|
std::atomic<bool> registryDirty_{false};
|
|
};
|
|
|
|
// Global SD card font system instance (defined in main.cpp).
|
|
extern SdCardFontSystem sdFontSystem;
|