The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

HW: Convert FileMonitor::Log into a class.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2022-09-09 22:35:51 +02:00
parent 426b5b1927
commit b51d37fe49
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/DVD/DVDThread.cpp
View File

@ -90,6 +90,8 @@ struct DVDThreadState::Data
std::map<u64, ReadResult> result_map; std::map<u64, ReadResult> result_map;
std::unique_ptr<DiscIO::Volume> disc; std::unique_ptr<DiscIO::Volume> disc;
FileMonitor::FileLogger file_logger;
}; };
DVDThreadState::DVDThreadState() : m_data(std::make_unique<Data>()) DVDThreadState::DVDThreadState() : m_data(std::make_unique<Data>())
@ -411,7 +413,7 @@ static void DVDThread()
ReadRequest request; ReadRequest request;
while (state.request_queue.Pop(request)) while (state.request_queue.Pop(request))
{ {
FileMonitor::Log(*state.disc, request.partition, request.dvd_offset); state.file_logger.Log(*state.disc, request.partition, request.dvd_offset);
std::vector<u8> buffer(request.length); std::vector<u8> buffer(request.length);
if (!state.disc->Read(request.dvd_offset, request.length, buffer.data(), request.partition)) if (!state.disc->Read(request.dvd_offset, request.length, buffer.data(), request.partition))

15
Source/Core/Core/HW/DVD/FileMonitor.cpp
View File

@ -20,9 +20,6 @@
namespace FileMonitor namespace FileMonitor
{ {
static DiscIO::Partition s_previous_partition;
static u64 s_previous_file_offset;
// Filtered files // Filtered files
static bool IsSoundFile(const std::string& filename) static bool IsSoundFile(const std::string& filename)
{ {
@ -49,7 +46,11 @@ static bool IsSoundFile(const std::string& filename)
return extensions.find(extension) != extensions.end(); return extensions.find(extension) != extensions.end();
} }
void Log(const DiscIO::Volume& volume, const DiscIO::Partition& partition, u64 offset) FileLogger::FileLogger() = default;
FileLogger::~FileLogger() = default;
void FileLogger::Log(const DiscIO::Volume& volume, const DiscIO::Partition& partition, u64 offset)
{ {
// Do nothing if the log isn't selected // Do nothing if the log isn't selected
if (!Common::Log::LogManager::GetInstance()->IsEnabled(Common::Log::LogType::FILEMON, if (!Common::Log::LogManager::GetInstance()->IsEnabled(Common::Log::LogType::FILEMON,
@ -73,7 +74,7 @@ void Log(const DiscIO::Volume& volume, const DiscIO::Partition& partition, u64 o
const u64 file_offset = file_info->GetOffset(); const u64 file_offset = file_info->GetOffset();
// Do nothing if we found the same file again // Do nothing if we found the same file again
if (s_previous_partition == partition && s_previous_file_offset == file_offset) if (m_previous_partition == partition && m_previous_file_offset == file_offset)
return; return;
const std::string size_string = ThousandSeparate(file_info->GetSize() / 1000, 7); const std::string size_string = ThousandSeparate(file_info->GetSize() / 1000, 7);
@ -85,8 +86,8 @@ void Log(const DiscIO::Volume& volume, const DiscIO::Partition& partition, u64 o
WARN_LOG_FMT(FILEMON, "{}", log_string); WARN_LOG_FMT(FILEMON, "{}", log_string);
// Update the last accessed file // Update the last accessed file
s_previous_partition = partition; m_previous_partition = partition;
s_previous_file_offset = file_offset; m_previous_file_offset = file_offset;
} }
} // namespace FileMonitor } // namespace FileMonitor

22
Source/Core/Core/HW/DVD/FileMonitor.h
View File

@ -4,14 +4,20 @@
#pragma once #pragma once
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "DiscIO/Volume.h"
namespace DiscIO
{
struct Partition;
class Volume;
} // namespace DiscIO
namespace FileMonitor namespace FileMonitor
{ {
void Log(const DiscIO::Volume& volume, const DiscIO::Partition& partition, u64 offset); class FileLogger
} {
public:
FileLogger();
~FileLogger();
void Log(const DiscIO::Volume& volume, const DiscIO::Partition& partition, u64 offset);
private:
DiscIO::Partition m_previous_partition;
u64 m_previous_file_offset;
};
} // namespace FileMonitor