diff options
| author | JosJuice <josjuice@gmail.com> | 2017-02-12 13:02:57 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-03-13 17:13:20 +0100 |
| commit | b470fa5454088effae64377f147db3e213947cd0 (patch) | |
| tree | 5d4bcbca1c2faebc5ecef14b25daa5978b070e31 /Source/Core/DiscIO/FileMonitor.cpp | |
| parent | 8035270aa8771ddbf1d57262f79735e4bff61c4a (diff) | |
FileMonitor redesign
Advantages:
* Simpler code in general
* No extra volume objects created
* Now actually notices if the disc or partition gets
changed while the core is running
* No longer picks up on disc access done by the GUI
(it used to do so as long as the core was running)
* Gets rid of a Core dependency in DiscIO
There are two performance disadvantages:
* FileMonitor is now a bit slower when used with VolumeDirectory
because FileMonitor now always uses the FileSystemGCWii code
for finding filenames instead of VolumeDirectory finding the
filename on its own and directly hooking into FileMonitor.
But this isn't such a big deal, because it's happening on the
DVD thread, and my currently unmerged file system PR will make
FileSystemGCWii's file finding code about as fast as
VolumeDirectory's.
* FileMonitor's creation of the file system object is now
done on the CPU thread instead of the DVD thread, and
it will be done even if FileMonitor logging is disabled.
This will be fixed in the next commit.
Diffstat (limited to 'Source/Core/DiscIO/FileMonitor.cpp')
| -rw-r--r-- | Source/Core/DiscIO/FileMonitor.cpp | 151 |
1 files changed, 0 insertions, 151 deletions
diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp deleted file mode 100644 index adc29de250..0000000000 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright 2009 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#include <algorithm> -#include <cctype> -#include <cstring> -#include <memory> -#include <string> -#include <unordered_set> -#include <vector> - -#include "Common/CommonTypes.h" -#include "Common/Logging/LogManager.h" -#include "Common/StringUtil.h" - -#include "Core/Boot/Boot.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" - -#include "DiscIO/Enums.h" -#include "DiscIO/FileMonitor.h" -#include "DiscIO/Filesystem.h" -#include "DiscIO/Volume.h" -#include "DiscIO/VolumeCreator.h" - -namespace FileMon -{ -static std::unique_ptr<DiscIO::IVolume> s_open_iso; -static std::unique_ptr<DiscIO::IFileSystem> s_filesystem; -static std::string ISOFile = "", CurrentFile = ""; -static bool FileAccess = true; - -// Filtered files -bool IsSoundFile(const std::string& filename) -{ - std::string extension; - SplitPath(filename, nullptr, nullptr, &extension); - std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower); - - static std::unordered_set<std::string> extensions = { - ".adp", // 1080 Avalanche, Crash Bandicoot, etc. - ".adx", // Sonic Adventure 2 Battle, etc. - ".afc", // Zelda WW - ".ast", // Zelda TP, Mario Kart - ".brstm", // Wii Sports, Wario Land, etc. - ".dsp", // Metroid Prime - ".hps", // SSB Melee - ".ogg", // Tony Hawk's Underground 2 - ".sad", // Disaster - ".snd", // Tales of Symphonia - ".song", // Tales of Symphonia - ".ssm", // Custom Robo, Kirby Air Ride, etc. - ".str", // Harry Potter & the Sorcerer's Stone - }; - - return extensions.find(extension) != extensions.end(); -} - -// Read the file system -void ReadFileSystem(const std::string& filename) -{ - // Should have an actual Shutdown procedure or something - s_open_iso.reset(); - s_filesystem.reset(); - - s_open_iso = DiscIO::CreateVolumeFromFilename(filename); - if (!s_open_iso) - return; - - if (s_open_iso->GetVolumeType() != DiscIO::Platform::WII_WAD) - { - s_filesystem = DiscIO::CreateFileSystem(s_open_iso.get()); - - if (!s_filesystem) - return; - } - - FileAccess = true; -} - -// Logs a file if it passes a few checks -void CheckFile(const std::string& file, u64 size) -{ - // Don't do anything if the log is unselected - if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON, LogTypes::LWARNING)) - return; - // Do nothing if we found the same file again - if (CurrentFile == file) - return; - - if (size > 0) - size = (size / 1000); - - std::string str = StringFromFormat("%s kB %s", ThousandSeparate(size, 7).c_str(), file.c_str()); - if (IsSoundFile(file)) - { - INFO_LOG(FILEMON, "%s", str.c_str()); - } - else - { - WARN_LOG(FILEMON, "%s", str.c_str()); - } - - // Update the current file - CurrentFile = file; -} - -// Find the filename -void FindFilename(u64 offset) -{ - // Don't do anything if a game is not running - if (Core::GetState() != Core::State::Running) - return; - - // Or if the log is unselected - if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON, LogTypes::LWARNING)) - return; - - // Or if we don't have file access - if (!FileAccess) - return; - - if (!s_filesystem || ISOFile != SConfig::GetInstance().m_LastFilename) - { - FileAccess = false; - ReadFileSystem(SConfig::GetInstance().m_LastFilename); - ISOFile = SConfig::GetInstance().m_LastFilename; - INFO_LOG(FILEMON, "Opening '%s'", ISOFile.c_str()); - return; - } - - const std::string filename = s_filesystem->GetFileName(offset); - - if (filename.empty()) - return; - - CheckFile(filename, s_filesystem->GetFileSize(filename)); -} - -void Close() -{ - s_open_iso.reset(); - s_filesystem.reset(); - - ISOFile = ""; - CurrentFile = ""; - FileAccess = true; -} - -} // FileMon |
