rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

デバッグ出力の整理

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@318 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-06-06 11:10:05 +00:00
parent 587b6272b2
commit e901220d05
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
View File

@ -62,7 +62,7 @@ nn::Result GetEntry(ES_NAMESPACE::ESTitleId titleId, EC_NAMESPACE::ECTitleCatalo
{"==", "string", "PricingSelection", "RELEASED"}
};
COMMON_LOGGER_DEBUG("ID: %016llx\n", titleId);
COMMON_LOGGER_DETAIL("ID: %016llx\n", titleId);
EC_NAMESPACE::ECTitleCatalog *titleCatalog;
nn::Result result = nn::nim::Shop::ListTitles(0, 1,
@ -97,10 +97,10 @@ nn::Result GetTitleConfig(const ES_NAMESPACE::ESTitleId titleId, nn::nim::TitleC
titleConfig->ratingAge=0;
titleConfig->media=GetMediaType(titleId);
COMMON_LOGGER_DEBUG("titleId : 0x%016llx\n", titleConfig->titleId);
COMMON_LOGGER_DEBUG("version : %lld\n" , titleConfig->version);
COMMON_LOGGER_DEBUG("ratingAge : %d\n" , titleConfig->ratingAge);
COMMON_LOGGER_DEBUG("media : %d\n" , titleConfig->media);
COMMON_LOGGER_DETAIL("titleId : 0x%016llx\n", titleConfig->titleId);
COMMON_LOGGER_DETAIL("version : %lld\n" , titleConfig->version);
COMMON_LOGGER_DETAIL("ratingAge : %d\n" , titleConfig->ratingAge);
COMMON_LOGGER_DETAIL("media : %d\n" , titleConfig->media);
return nn::ResultSuccess();
@ -240,12 +240,13 @@ nn::Result TitleDownloader::ListUp()
std::memcpy(ProgramIdStr, &titleListBuf[listHead], i - listHead);
m_ProgramIdList[m_TwlTiteNum] = std::strtoull(ProgramIdStr, &error, 16);
m_TwlTiteNum++;
COMMON_LOGGER_DEBUG("%016llx\n", m_ProgramIdList[m_TwlTiteNum - 1]);
COMMON_LOGGER_DETAIL("%016llx\n", m_ProgramIdList[m_TwlTiteNum - 1]);
listHead = i + 1;
}
}
}
COMMON_LOGGER("%d Title(s) found.\n", m_TwlTiteNum);
common::HeapManager::GetHeap()->Free(titleListBuf);
}
else

26
trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp
View File

@ -43,7 +43,7 @@ do { \
COMMON_LOGGER("CSCode: %d\n", csc); \
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); \
NN_DBG_PRINT_RESULT(result); \
COMMON_LOGGER_DEBUG("Result = %08X\n", result.GetPrintableBits()); \
COMMON_LOGGER_DETAIL("Result = %08X\n", result.GetPrintableBits()); \
s_Result = result; \
goto LABEL_FINALIZE; \
} \
@ -83,7 +83,7 @@ nn::Result ConnectNetwork()
result = nn::ac::ConnectWithoutEula(config);
NN_UTIL_RETURN_IF_FAILED(result);
COMMON_LOGGER_DEBUG("Success nn::ac::ConnectWithoutEula\n");
COMMON_LOGGER_DETAIL("Success nn::ac::ConnectWithoutEula\n");
NN_UTIL_RETURN_IF_FAILED(PrintNetworkSetting());
@ -121,7 +121,7 @@ void UpdateThreadFunc()
{
nn::Result result;
COMMON_LOGGER_DEBUG("********************UpdateThreadFunc Start********************\n");
COMMON_LOGGER_DETAIL("********************UpdateThreadFunc Start********************\n");
nn::cfg::CTR::init::Initialize();
nn::cfg::CfgCountryCode country;
nn::cfg::CfgRegionCode region;
@ -141,11 +141,11 @@ void UpdateThreadFunc()
/* -------------------------------------------------------------------
Initialize
-------------------------------------------------------------------- */
COMMON_LOGGER_DEBUG("[Updater] nn::nim::InitializeForUpdater\n");
COMMON_LOGGER_DETAIL("[Updater] nn::nim::InitializeForUpdater\n");
result = nn::nim::InitializeForUpdater();
NIM_UPDATER_RESULT_CHECK(result);
COMMON_LOGGER_DEBUG("[Updater] InitializeInternal\n");
COMMON_LOGGER_DETAIL("[Updater] InitializeInternal\n");
result = InitializeInternal();
NIM_UPDATER_RESULT_CHECK(result);
@ -153,22 +153,22 @@ void UpdateThreadFunc()
/* -------------------------------------------------------------------
StartNetworkUpdate
-------------------------------------------------------------------- */
COMMON_LOGGER_DEBUG("[Updater] nn::nim::Updater::StartNetworkUpdate()\n");
COMMON_LOGGER_DETAIL("[Updater] nn::nim::Updater::StartNetworkUpdate()\n");
result = nn::nim::Updater::StartNetworkUpdate();
NIM_UPDATER_RESULT_CHECK(result);
/* -------------------------------------------------------------------
GetProgress
-------------------------------------------------------------------- */
COMMON_LOGGER_DEBUG("[Updater] nn::nim::Updater::GetProgress()\n");
COMMON_LOGGER_DETAIL("[Updater] nn::nim::Updater::GetProgress()\n");
while(true)
{
nn::nim::NetworkUpdateProgress progress;
NIM_UPDATER_RESULT_CHECK(nn::nim::Updater::GetProgress(&progress));
NIM_UPDATER_RESULT_CHECK(progress.lastResult);
COMMON_LOGGER_DEBUG("\x1b[1A\x1b[K");
COMMON_LOGGER_DEBUG("Downloading %2lld/%2lld %8lld/%8lld (%d)\n",
COMMON_LOGGER_DETAIL("\x1b[1A\x1b[K");
COMMON_LOGGER_DETAIL("Downloading %2lld/%2lld %8lld/%8lld (%d)\n",
progress.downloadedTitleNum,
progress.totalTitleNum,
progress.currentDownloadedSize,
@ -207,27 +207,27 @@ void UpdateThreadFunc()
/* -------------------------------------------------------------------
Finalize
-------------------------------------------------------------------- */
COMMON_LOGGER_DEBUG("[Updater] nn::nim::FinalizeForUpdater\n");
COMMON_LOGGER_DETAIL("[Updater] nn::nim::FinalizeForUpdater\n");
result = nn::nim::FinalizeForUpdater();
NIM_UPDATER_RESULT_CHECK(result);
result = FinalizeInternal();
NIM_UPDATER_RESULT_CHECK(result);
COMMON_LOGGER_DEBUG("[Updater] Finish nim Updater demo.\n");
COMMON_LOGGER_DETAIL("[Updater] Finish nim Updater demo.\n");
}
void StartFGNetworkUpdate()
{
COMMON_LOGGER_DEBUG("Start FGNetworkUpdate\n");
COMMON_LOGGER_DETAIL("Start FGNetworkUpdate\n");
s_Result = nn::ResultSuccess();
s_UpdaterThread.Start(UpdateThreadFunc, s_UpdaterThreadStack);
}
void FinishFGNetworkUpdate()
{
COMMON_LOGGER_DEBUG("Finalize FGNetworkUpdate\n");
COMMON_LOGGER_DETAIL("Finalize FGNetworkUpdate\n");
s_UpdaterThread.Join();
s_UpdaterThread.Finalize();
}