From 4b931bb913af7636b987b8069a2fe3339c1ad4db Mon Sep 17 00:00:00 2001 From: wwylele Date: Wed, 8 Mar 2017 17:25:09 +0200 Subject: [PATCH 1/5] loader: lower file name logging level --- src/core/loader/loader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 147bf8591..be719d74c 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -139,7 +139,7 @@ std::unique_ptr GetLoader(const std::string& filename) { type = filename_type; } - LOG_INFO(Loader, "Loading file %s as %s...", filename.c_str(), GetFileTypeString(type)); + LOG_DEBUG(Loader, "Loading file %s as %s...", filename.c_str(), GetFileTypeString(type)); return GetFileLoader(std::move(file), type, filename_filename, filename); } From 6551a72ec8ef6106635670c4071b4b4f9a498e66 Mon Sep 17 00:00:00 2001 From: wwylele Date: Wed, 8 Mar 2017 17:37:24 +0200 Subject: [PATCH 2/5] loader/ncch: less verbose log for loading game list. only log program ID when booting --- src/core/loader/ncch.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 98b8259d9..1a4e3efa8 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include #include #include "common/logging/log.h" @@ -253,7 +254,7 @@ ResultStatus AppLoader_NCCH::LoadExeFS() { // Skip NCSD header and load first NCCH (NCSD is just a container of NCCH files)... if (MakeMagic('N', 'C', 'S', 'D') == ncch_header.magic) { - LOG_WARNING(Loader, "Only loading the first (bootable) NCCH within the NCSD file!"); + LOG_DEBUG(Loader, "Only loading the first (bootable) NCCH within the NCSD file!"); ncch_offset = 0x4000; file.Seek(ncch_offset, SEEK_SET); file.ReadBytes(&ncch_header, sizeof(NCCH_Header)); @@ -277,8 +278,8 @@ ResultStatus AppLoader_NCCH::LoadExeFS() { priority = exheader_header.arm11_system_local_caps.priority; resource_limit_category = exheader_header.arm11_system_local_caps.resource_limit_category; - LOG_INFO(Loader, "Name: %s", exheader_header.codeset_info.name); - LOG_INFO(Loader, "Program ID: %016llX", ncch_header.program_id); + LOG_DEBUG(Loader, "Name: %s", exheader_header.codeset_info.name); + LOG_DEBUG(Loader, "Program ID: %016" PRIX64, ncch_header.program_id); LOG_DEBUG(Loader, "Code compressed: %s", is_compressed ? "yes" : "no"); LOG_DEBUG(Loader, "Entry point: 0x%08X", entry_point); LOG_DEBUG(Loader, "Code size: 0x%08X", code_size); @@ -336,6 +337,8 @@ ResultStatus AppLoader_NCCH::Load() { if (result != ResultStatus::Success) return result; + LOG_INFO(Loader, "Program ID: %016" PRIX64, ncch_header.program_id); + is_loaded = true; // Set state to loaded result = LoadExec(); // Load the executable into memory for booting From 7cd6cc0fd901ac755286dfebfb256fca86cf0cc4 Mon Sep 17 00:00:00 2001 From: wwylele Date: Wed, 8 Mar 2017 17:42:10 +0200 Subject: [PATCH 3/5] file_util: lower logging level for harmless cases --- src/common/file_util.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index df234c225..d3cc371de 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -118,8 +118,7 @@ bool IsDirectory(const std::string& filename) { #endif if (result < 0) { - LOG_WARNING(Common_Filesystem, "stat failed on %s: %s", filename.c_str(), - GetLastErrorMsg()); + LOG_DEBUG(Common_Filesystem, "stat failed on %s: %s", filename.c_str(), GetLastErrorMsg()); return false; } @@ -129,12 +128,12 @@ bool IsDirectory(const std::string& filename) { // Deletes a given filename, return true on success // Doesn't supports deleting a directory bool Delete(const std::string& filename) { - LOG_INFO(Common_Filesystem, "file %s", filename.c_str()); + LOG_TRACE(Common_Filesystem, "file %s", filename.c_str()); // Return true because we care about the file no // being there, not the actual delete. if (!Exists(filename)) { - LOG_WARNING(Common_Filesystem, "%s does not exist", filename.c_str()); + LOG_DEBUG(Common_Filesystem, "%s does not exist", filename.c_str()); return true; } @@ -169,8 +168,7 @@ bool CreateDir(const std::string& path) { return true; DWORD error = GetLastError(); if (error == ERROR_ALREADY_EXISTS) { - LOG_WARNING(Common_Filesystem, "CreateDirectory failed on %s: already exists", - path.c_str()); + LOG_DEBUG(Common_Filesystem, "CreateDirectory failed on %s: already exists", path.c_str()); return true; } LOG_ERROR(Common_Filesystem, "CreateDirectory failed on %s: %i", path.c_str(), error); @@ -182,7 +180,7 @@ bool CreateDir(const std::string& path) { int err = errno; if (err == EEXIST) { - LOG_WARNING(Common_Filesystem, "mkdir failed on %s: already exists", path.c_str()); + LOG_DEBUG(Common_Filesystem, "mkdir failed on %s: already exists", path.c_str()); return true; } @@ -197,7 +195,7 @@ bool CreateFullPath(const std::string& fullPath) { LOG_TRACE(Common_Filesystem, "path %s", fullPath.c_str()); if (FileUtil::Exists(fullPath)) { - LOG_WARNING(Common_Filesystem, "path exists %s", fullPath.c_str()); + LOG_DEBUG(Common_Filesystem, "path exists %s", fullPath.c_str()); return true; } @@ -229,7 +227,7 @@ bool CreateFullPath(const std::string& fullPath) { // Deletes a directory filename, returns true on success bool DeleteDir(const std::string& filename) { - LOG_INFO(Common_Filesystem, "directory %s", filename.c_str()); + LOG_TRACE(Common_Filesystem, "directory %s", filename.c_str()); // check if a directory if (!FileUtil::IsDirectory(filename)) { From 047a1586fe8440e8c6f11e3dd11938ca97743f83 Mon Sep 17 00:00:00 2001 From: wwylele Date: Wed, 8 Mar 2017 17:47:24 +0200 Subject: [PATCH 4/5] file_sys: lower log level for setting host path --- src/core/file_sys/archive_extsavedata.cpp | 2 +- src/core/file_sys/archive_sdmc.cpp | 2 +- src/core/file_sys/archive_sdmcwriteonly.cpp | 2 +- src/core/file_sys/archive_source_sd_savedata.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index dd2fb167f..f454e7840 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -173,7 +173,7 @@ Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low) { ArchiveFactory_ExtSaveData::ArchiveFactory_ExtSaveData(const std::string& mount_location, bool shared) : shared(shared), mount_point(GetExtDataContainerPath(mount_location, shared)) { - LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str()); + LOG_DEBUG(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str()); } bool ArchiveFactory_ExtSaveData::Initialize() { diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp index 72ff05c65..679909d06 100644 --- a/src/core/file_sys/archive_sdmc.cpp +++ b/src/core/file_sys/archive_sdmc.cpp @@ -306,7 +306,7 @@ u64 SDMCArchive::GetFreeBytes() const { ArchiveFactory_SDMC::ArchiveFactory_SDMC(const std::string& sdmc_directory) : sdmc_directory(sdmc_directory) { - LOG_INFO(Service_FS, "Directory %s set as SDMC.", sdmc_directory.c_str()); + LOG_DEBUG(Service_FS, "Directory %s set as SDMC.", sdmc_directory.c_str()); } bool ArchiveFactory_SDMC::Initialize() { diff --git a/src/core/file_sys/archive_sdmcwriteonly.cpp b/src/core/file_sys/archive_sdmcwriteonly.cpp index 2aafc9b1d..244aef48a 100644 --- a/src/core/file_sys/archive_sdmcwriteonly.cpp +++ b/src/core/file_sys/archive_sdmcwriteonly.cpp @@ -32,7 +32,7 @@ ResultVal> SDMCWriteOnlyArchive::OpenDirectory ArchiveFactory_SDMCWriteOnly::ArchiveFactory_SDMCWriteOnly(const std::string& mount_point) : sdmc_directory(mount_point) { - LOG_INFO(Service_FS, "Directory %s set as SDMCWriteOnly.", sdmc_directory.c_str()); + LOG_DEBUG(Service_FS, "Directory %s set as SDMCWriteOnly.", sdmc_directory.c_str()); } bool ArchiveFactory_SDMCWriteOnly::Initialize() { diff --git a/src/core/file_sys/archive_source_sd_savedata.cpp b/src/core/file_sys/archive_source_sd_savedata.cpp index e01357891..f31a68038 100644 --- a/src/core/file_sys/archive_source_sd_savedata.cpp +++ b/src/core/file_sys/archive_source_sd_savedata.cpp @@ -39,7 +39,7 @@ std::string GetSaveDataMetadataPath(const std::string& mount_location, u64 progr ArchiveSource_SDSaveData::ArchiveSource_SDSaveData(const std::string& sdmc_directory) : mount_point(GetSaveDataContainerPath(sdmc_directory)) { - LOG_INFO(Service_FS, "Directory %s set as SaveData.", mount_point.c_str()); + LOG_DEBUG(Service_FS, "Directory %s set as SaveData.", mount_point.c_str()); } ResultVal> ArchiveSource_SDSaveData::Open(u64 program_id) { From d040a73bed93fc89520dd390dc8ed9874675bc14 Mon Sep 17 00:00:00 2001 From: wwylele Date: Sat, 11 Mar 2017 18:31:17 +0200 Subject: [PATCH 5/5] file_util: Log when using local user directory --- src/common/file_util.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index d3cc371de..5ab036b34 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -691,6 +691,8 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string& new paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; if (!FileUtil::IsDirectory(paths[D_USER_IDX])) { paths[D_USER_IDX] = AppDataRoamingDirectory() + DIR_SEP EMU_DATA_DIR DIR_SEP; + } else { + LOG_INFO(Common_Filesystem, "Using the local user directory"); } paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;