piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

LogManager: Stop using manual memory management

Browse Source 
This fixes a memory leak that would occur when the Android frontend
calls LogManager::Init more than once in order to reload settings.

Note that the log window listener is now owned by LogManager instead of
by the frontend, making it consistent with the other log listeners.
This commit is contained in:
JosJuice
2025-05-02 13:56:44 +02:00
parent b566e81644
commit c8be819711
4 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/Logging/LogManager.h
View File

@ -5,6 +5,7 @@
#include <array>
#include <cstdarg>
#include <memory>
#include <string>
#include <vector>
@ -31,7 +32,7 @@ public:
};
};
class LogManager
class LogManager final
{
public:
struct LogContainer
@ -41,6 +42,8 @@ public:
bool m_enable = false;
};
~LogManager();
static LogManager* GetInstance();
static void Init();
static void Shutdown();
@ -60,7 +63,7 @@ public:
const char* GetShortName(LogType type) const;
const char* GetFullName(LogType type) const;
void RegisterListener(LogListener::LISTENER id, LogListener* listener);
void RegisterListener(LogListener::LISTENER id, std::unique_ptr<LogListener> listener);
void EnableListener(LogListener::LISTENER id, bool enable);
bool IsListenerEnabled(LogListener::LISTENER id) const;
@ -68,7 +71,6 @@ public:
private:
LogManager();
~LogManager();
LogManager(const LogManager&) = delete;
LogManager& operator=(const LogManager&) = delete;
@ -79,7 +81,7 @@ private:
LogLevel m_level;
EnumMap<LogContainer, LAST_LOG_TYPE> m_log{};
std::array<LogListener*, LogListener::NUMBER_OF_LISTENERS> m_listeners{};
std::array<std::unique_ptr<LogListener>, LogListener::NUMBER_OF_LISTENERS> m_listeners{};
BitSet32 m_listener_ids;
size_t m_path_cutoff_point = 0;
};