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

Log: Rename IOS_FILEIO to IOS_FS

Browse Source 
Let's use the actual name of the system module.

Also, the FS code is not all about files.
This commit is contained in:
Léo Lam 2018-03-05 22:47:53 +01:00
parent 5a7b966b6d
commit de15e09a4f
4 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Logging/Log.h
View File

@ -31,7 +31,6 @@ enum LOG_TYPE
IOS, IOS,
IOS_DI, IOS_DI,
IOS_ES, IOS_ES,
IOS_FILEIO,
IOS_FS, IOS_FS,
IOS_NET, IOS_NET,
IOS_SD, IOS_SD,

1
Source/Core/Common/Logging/LogManager.cpp
View File

@ -99,7 +99,6 @@ LogManager::LogManager()
m_log[LogTypes::IOS] = {"IOS", "IOS"}; m_log[LogTypes::IOS] = {"IOS", "IOS"};
m_log[LogTypes::IOS_DI] = {"IOS_DI", "IOS - Drive Interface"}; m_log[LogTypes::IOS_DI] = {"IOS_DI", "IOS - Drive Interface"};
m_log[LogTypes::IOS_ES] = {"IOS_ES", "IOS - ETicket Services"}; m_log[LogTypes::IOS_ES] = {"IOS_ES", "IOS - ETicket Services"};
m_log[LogTypes::IOS_FILEIO] = {"IOS_FILEIO", "IOS - FileIO"};
m_log[LogTypes::IOS_FS] = {"IOS_FS", "IOS - Filesystem Services"}; m_log[LogTypes::IOS_FS] = {"IOS_FS", "IOS - Filesystem Services"};
m_log[LogTypes::IOS_SD] = {"IOS_SD", "IOS - SDIO"}; m_log[LogTypes::IOS_SD] = {"IOS_SD", "IOS - SDIO"};
m_log[LogTypes::IOS_SSL] = {"IOS_SSL", "IOS - SSL"}; m_log[LogTypes::IOS_SSL] = {"IOS_SSL", "IOS - SSL"};

56
Source/Core/Core/IOS/FS/HostBackend/FS.cpp
View File

@ -173,7 +173,7 @@ ResultCode HostFileSystem::CreateFile(Uid, Gid, const std::string& path, FileAtt
// check if the file already exist // check if the file already exist
if (File::Exists(file_name)) if (File::Exists(file_name))
{ {
INFO_LOG(IOS_FILEIO, "\tresult = FS_EEXIST"); INFO_LOG(IOS_FS, "\tresult = FS_EEXIST");
return ResultCode::AlreadyExists; return ResultCode::AlreadyExists;
} }
@ -181,11 +181,11 @@ ResultCode HostFileSystem::CreateFile(Uid, Gid, const std::string& path, FileAtt
File::CreateFullPath(file_name); // just to be sure File::CreateFullPath(file_name); // just to be sure
if (!File::CreateEmptyFile(file_name)) if (!File::CreateEmptyFile(file_name))
{ {
ERROR_LOG(IOS_FILEIO, "couldn't create new file"); ERROR_LOG(IOS_FS, "couldn't create new file");
return ResultCode::Invalid; return ResultCode::Invalid;
} }
INFO_LOG(IOS_FILEIO, "\tresult = IPC_SUCCESS"); INFO_LOG(IOS_FS, "\tresult = IPC_SUCCESS");
return ResultCode::Success; return ResultCode::Success;
} }
@ -195,7 +195,7 @@ ResultCode HostFileSystem::CreateDirectory(Uid, Gid, const std::string& path,
{ {
if (!IsValidWiiPath(path)) if (!IsValidWiiPath(path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
@ -203,7 +203,7 @@ ResultCode HostFileSystem::CreateDirectory(Uid, Gid, const std::string& path,
name += "/"; name += "/";
File::CreateFullPath(name); File::CreateFullPath(name);
DEBUG_ASSERT_MSG(IOS_FILEIO, File::IsDirectory(name), "CREATE_DIR %s failed", name.c_str()); DEBUG_ASSERT_MSG(IOS_FS, File::IsDirectory(name), "CREATE_DIR %s failed", name.c_str());
return ResultCode::Success; return ResultCode::Success;
} }
@ -212,17 +212,17 @@ ResultCode HostFileSystem::Delete(Uid, Gid, const std::string& path)
{ {
if (!IsValidWiiPath(path)) if (!IsValidWiiPath(path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
const std::string file_name = BuildFilename(path); const std::string file_name = BuildFilename(path);
if (File::Delete(file_name)) if (File::Delete(file_name))
INFO_LOG(IOS_FILEIO, "DeleteFile %s", file_name.c_str()); INFO_LOG(IOS_FS, "DeleteFile %s", file_name.c_str());
else if (File::DeleteDirRecursively(file_name)) else if (File::DeleteDirRecursively(file_name))
INFO_LOG(IOS_FILEIO, "DeleteDir %s", file_name.c_str()); INFO_LOG(IOS_FS, "DeleteDir %s", file_name.c_str());
else else
WARN_LOG(IOS_FILEIO, "DeleteFile %s - failed!!!", file_name.c_str()); WARN_LOG(IOS_FS, "DeleteFile %s - failed!!!", file_name.c_str());
return ResultCode::Success; return ResultCode::Success;
} }
@ -232,14 +232,14 @@ ResultCode HostFileSystem::Rename(Uid, Gid, const std::string& old_path,
{ {
if (!IsValidWiiPath(old_path)) if (!IsValidWiiPath(old_path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", old_path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", old_path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
std::string old_name = BuildFilename(old_path); std::string old_name = BuildFilename(old_path);
if (!IsValidWiiPath(new_path)) if (!IsValidWiiPath(new_path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", new_path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", new_path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
@ -257,11 +257,11 @@ ResultCode HostFileSystem::Rename(Uid, Gid, const std::string& old_path,
// finally try to rename the file // finally try to rename the file
if (File::Rename(old_name, new_name)) if (File::Rename(old_name, new_name))
{ {
INFO_LOG(IOS_FILEIO, "Rename %s to %s", old_name.c_str(), new_name.c_str()); INFO_LOG(IOS_FS, "Rename %s to %s", old_name.c_str(), new_name.c_str());
} }
else else
{ {
ERROR_LOG(IOS_FILEIO, "Rename %s to %s - failed", old_name.c_str(), new_name.c_str()); ERROR_LOG(IOS_FS, "Rename %s to %s - failed", old_name.c_str(), new_name.c_str());
return ResultCode::NotFound; return ResultCode::NotFound;
} }
@ -272,20 +272,20 @@ Result<std::vector<std::string>> HostFileSystem::ReadDirectory(Uid, Gid, const s
{ {
if (!IsValidWiiPath(path)) if (!IsValidWiiPath(path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
// the Wii uses this function to define the type (dir or file) // the Wii uses this function to define the type (dir or file)
const std::string dir_name(BuildFilename(path)); const std::string dir_name(BuildFilename(path));
INFO_LOG(IOS_FILEIO, "IOCTL_READ_DIR %s", dir_name.c_str()); INFO_LOG(IOS_FS, "IOCTL_READ_DIR %s", dir_name.c_str());
const File::FileInfo file_info(dir_name); const File::FileInfo file_info(dir_name);
if (!file_info.Exists()) if (!file_info.Exists())
{ {
WARN_LOG(IOS_FILEIO, "Search not found: %s", dir_name.c_str()); WARN_LOG(IOS_FS, "Search not found: %s", dir_name.c_str());
return ResultCode::NotFound; return ResultCode::NotFound;
} }
@ -294,7 +294,7 @@ Result<std::vector<std::string>> HostFileSystem::ReadDirectory(Uid, Gid, const s
// It's not a directory, so error. // It's not a directory, so error.
// Games don't usually seem to care WHICH error they get, as long as it's < // Games don't usually seem to care WHICH error they get, as long as it's <
// Well the system menu CARES! // Well the system menu CARES!
WARN_LOG(IOS_FILEIO, "\tNot a directory - return FS_EINVAL"); WARN_LOG(IOS_FS, "\tNot a directory - return FS_EINVAL");
return ResultCode::Invalid; return ResultCode::Invalid;
} }
@ -318,7 +318,7 @@ Result<std::vector<std::string>> HostFileSystem::ReadDirectory(Uid, Gid, const s
for (File::FSTEntry& child : entry.children) for (File::FSTEntry& child : entry.children)
{ {
output.emplace_back(child.virtualName); output.emplace_back(child.virtualName);
INFO_LOG(IOS_FILEIO, "\tFound: %s", child.virtualName.c_str()); INFO_LOG(IOS_FS, "\tFound: %s", child.virtualName.c_str());
} }
return output; return output;
} }
@ -332,7 +332,7 @@ Result<Metadata> HostFileSystem::GetMetadata(Uid, Gid, const std::string& path)
if (!IsValidWiiPath(path)) if (!IsValidWiiPath(path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
@ -357,17 +357,17 @@ Result<Metadata> HostFileSystem::GetMetadata(Uid, Gid, const std::string& path)
metadata.size = info.GetSize(); metadata.size = info.GetSize();
if (info.IsDirectory()) if (info.IsDirectory())
{ {
INFO_LOG(IOS_FILEIO, "GET_ATTR Directory %s - all permission flags are set", file_name.c_str()); INFO_LOG(IOS_FS, "GET_ATTR Directory %s - all permission flags are set", file_name.c_str());
} }
else else
{ {
if (info.Exists()) if (info.Exists())
{ {
INFO_LOG(IOS_FILEIO, "GET_ATTR %s - all permission flags are set", file_name.c_str()); INFO_LOG(IOS_FS, "GET_ATTR %s - all permission flags are set", file_name.c_str());
} }
else else
{ {
INFO_LOG(IOS_FILEIO, "GET_ATTR unknown %s", file_name.c_str()); INFO_LOG(IOS_FS, "GET_ATTR unknown %s", file_name.c_str());
return ResultCode::NotFound; return ResultCode::NotFound;
} }
} }
@ -380,7 +380,7 @@ ResultCode HostFileSystem::SetMetadata(Uid caller_uid, const std::string& path,
{ {
if (!IsValidWiiPath(path)) if (!IsValidWiiPath(path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
return ResultCode::Success; return ResultCode::Success;
@ -388,7 +388,7 @@ ResultCode HostFileSystem::SetMetadata(Uid caller_uid, const std::string& path,
Result<NandStats> HostFileSystem::GetNandStats() Result<NandStats> HostFileSystem::GetNandStats()
{ {
WARN_LOG(IOS_FILEIO, "GET STATS - returning static values for now"); WARN_LOG(IOS_FS, "GET STATS - returning static values for now");
// TODO: scrape the real amounts from somewhere... // TODO: scrape the real amounts from somewhere...
NandStats stats{}; NandStats stats{};
@ -407,13 +407,13 @@ Result<DirectoryStats> HostFileSystem::GetDirectoryStats(const std::string& wii_
{ {
if (!IsValidWiiPath(wii_path)) if (!IsValidWiiPath(wii_path))
{ {
WARN_LOG(IOS_FILEIO, "Not a valid path: %s", wii_path.c_str()); WARN_LOG(IOS_FS, "Not a valid path: %s", wii_path.c_str());
return ResultCode::Invalid; return ResultCode::Invalid;
} }
DirectoryStats stats{}; DirectoryStats stats{};
std::string path(BuildFilename(wii_path)); std::string path(BuildFilename(wii_path));
INFO_LOG(IOS_FILEIO, "IOCTL_GETUSAGE %s", path.c_str()); INFO_LOG(IOS_FS, "IOCTL_GETUSAGE %s", path.c_str());
if (File::IsDirectory(path)) if (File::IsDirectory(path))
{ {
File::FSTEntry parent_dir = File::ScanDirectoryTree(path, true); File::FSTEntry parent_dir = File::ScanDirectoryTree(path, true);
@ -424,11 +424,11 @@ Result<DirectoryStats> HostFileSystem::GetDirectoryStats(const std::string& wii_
stats.used_clusters = (u32)(total_size / (16 * 1024)); // one block is 16kb stats.used_clusters = (u32)(total_size / (16 * 1024)); // one block is 16kb
INFO_LOG(IOS_FILEIO, "fsBlock: %i, inodes: %i", stats.used_clusters, stats.used_inodes); INFO_LOG(IOS_FS, "fsBlock: %i, inodes: %i", stats.used_clusters, stats.used_inodes);
} }
else else
{ {
WARN_LOG(IOS_FILEIO, "fsBlock failed, cannot find directory: %s", path.c_str()); WARN_LOG(IOS_FS, "fsBlock failed, cannot find directory: %s", path.c_str());
} }
return stats; return stats;
} }

5
Source/Core/Core/WiiRoot.cpp
View File

@ -57,12 +57,11 @@ void InitializeWiiRoot(bool use_temporary)
s_temp_wii_root = File::CreateTempDir(); s_temp_wii_root = File::CreateTempDir();
if (s_temp_wii_root.empty()) if (s_temp_wii_root.empty())
{ {
ERROR_LOG(IOS_FILEIO, "Could not create temporary directory"); ERROR_LOG(IOS_FS, "Could not create temporary directory");
return; return;
} }
File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, s_temp_wii_root); File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, s_temp_wii_root);
WARN_LOG(IOS_FILEIO, "Using temporary directory %s for minimal Wii FS", WARN_LOG(IOS_FS, "Using temporary directory %s for minimal Wii FS", s_temp_wii_root.c_str());
s_temp_wii_root.c_str());
File::SetUserPath(D_SESSION_WIIROOT_IDX, s_temp_wii_root); File::SetUserPath(D_SESSION_WIIROOT_IDX, s_temp_wii_root);
// Generate a SYSCONF with default settings for the temporary Wii NAND. // Generate a SYSCONF with default settings for the temporary Wii NAND.
SysConf sysconf{Common::FromWhichRoot::FROM_SESSION_ROOT}; SysConf sysconf{Common::FromWhichRoot::FROM_SESSION_ROOT};