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

nim系デバッグ出力の整理

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@296 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-05-31 08:43:54 +00:00
parent ed497bbfe5
commit a96ae0accd
4 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
View File

@ -38,6 +38,7 @@ do { \
COMMON_LOGGER("CSCode: %d\n", csc); \
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); \
nn::dbg::PrintResult(result); \
COMMON_LOGGER_DEBUG("Result = %08X\n", result.GetPrintableBits()); \
s_ShopResult = result; \
return; \
} \
@ -123,75 +124,75 @@ void PrintECTicketVersions(const ECTicketVersions& ticketVersions)
{
if (ticketVersions.nTicketVersions == 0)
{
NN_LOG("No TicketVersions\n");
COMMON_LOGGER_DEBUG("No TicketVersions\n");
return;
}
NN_LOG("----- ECTicketVersions -----\n");
COMMON_LOGGER_DEBUG("----- ECTicketVersions -----\n");
for (u32 i = 0; i < ticketVersions.nTicketVersions; i++)
{
#ifdef NN_BUILD_VERBOSE
ECTicketVersion version = ticketVersions.ticketVersions[i];
#endif
NN_LOG("%03d: 0x%016llx v%d\n", i, version.ticketId, version.version);
COMMON_LOGGER_DEBUG("%03d: 0x%016llx v%d\n", i, version.ticketId, version.version);
}
NN_LOG("---------------------------\n");
COMMON_LOGGER_DEBUG("---------------------------\n");
}
// ECAccountInfo の情報を出力
void PrintECAccountInfo(const ECAccountInfo& accountInfo)
{
NN_LOG("========== ECAccountInfo ==========\n");
COMMON_LOGGER_DEBUG("========== ECAccountInfo ==========\n");
NN_LOG("accountId\n %s\n", Cstr(accountInfo.accountId));
COMMON_LOGGER_DEBUG("accountId\n %s\n", Cstr(accountInfo.accountId));
NN_LOG("accountStatus\n %s\n", Cstr(accountInfo.accountStatus));
COMMON_LOGGER_DEBUG("accountStatus\n %s\n", Cstr(accountInfo.accountStatus));
if (accountInfo.accountBalance == NULL)
{
NN_LOG("accountBalance\n NULL\n");
COMMON_LOGGER_DEBUG("accountBalance\n NULL\n");
}
else
{
NN_LOG("accountBalance->amount\n %s\n",
COMMON_LOGGER_DEBUG("accountBalance->amount\n %s\n",
Cstr(accountInfo.accountBalance->amount));
NN_LOG("accountBalance->currency\n %s\n",
COMMON_LOGGER_DEBUG("accountBalance->currency\n %s\n",
Cstr(accountInfo.accountBalance->currency));
}
if (accountInfo.agreedEULAVersion == NULL)
{
NN_LOG("agreedEULAVersion\n NULL\n");
COMMON_LOGGER_DEBUG("agreedEULAVersion\n NULL\n");
}
else
{
NN_LOG("agreedEULAVersion\n %lld\n",
COMMON_LOGGER_DEBUG("agreedEULAVersion\n %lld\n",
*accountInfo.agreedEULAVersion);
}
if (accountInfo.latestEULAVersion == NULL)
{
NN_LOG("latestEULAVersion\n NULL\n");
COMMON_LOGGER_DEBUG("latestEULAVersion\n NULL\n");
}
else
{
NN_LOG("latestEULAVersion\n %lld\n",
COMMON_LOGGER_DEBUG("latestEULAVersion\n %lld\n",
*accountInfo.latestEULAVersion);
}
NN_LOG("country\n %s\n", Cstr(accountInfo.country));
COMMON_LOGGER_DEBUG("country\n %s\n", Cstr(accountInfo.country));
NN_LOG("extAccountId\n %s\n", Cstr(accountInfo.extAccountId));
COMMON_LOGGER_DEBUG("extAccountId\n %s\n", Cstr(accountInfo.extAccountId));
NN_LOG("deviceToken\n %s\n", Cstr(accountInfo.deviceToken));
COMMON_LOGGER_DEBUG("deviceToken\n %s\n", Cstr(accountInfo.deviceToken));
NN_LOG("weakToken\n %s\n", Cstr(accountInfo.weakToken));
COMMON_LOGGER_DEBUG("weakToken\n %s\n", Cstr(accountInfo.weakToken));
NN_LOG("isStandbyMode\n %d\n", accountInfo.isStandbyMode);
COMMON_LOGGER_DEBUG("isStandbyMode\n %d\n", accountInfo.isStandbyMode);
if (accountInfo.owned == NULL)
{
NN_LOG("owned\n NULL\n");
COMMON_LOGGER_DEBUG("owned\n NULL\n");
}
else
{
@ -225,7 +226,7 @@ nn::Result ConnectNetwork()
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
NN_UTIL_RETURN_IF_FAILED(result);
NN_LOG("Success nn::ac::ConnectWithoutEula\n");
COMMON_LOGGER_DEBUG("Success nn::ac::ConnectWithoutEula\n");
result = PrintNetworkSetting();
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
@ -291,14 +292,14 @@ nn::Result ShopOperationConnect(ECAccountInfo** pAccountInfo)
/* -------------------------------------------------------------------
Connect
-------------------------------------------------------------------- */
NN_LOG("nim::Shop::Connect\n");
COMMON_LOGGER_DEBUG("nim::Shop::Connect\n");
result = nn::nim::Shop::Connect(pAccountInfo, s_EcBufffer, EC_BUFFER_SIZE);
NN_UTIL_RETURN_IF_FAILED(result);
result = CheckStandbyMode((*pAccountInfo)->isStandbyMode);
NN_UTIL_RETURN_IF_FAILED(result);
PrintECAccountInfo(**pAccountInfo);
NN_LOG("\n");
COMMON_LOGGER_DEBUG("\n");
return result;
}
@ -312,7 +313,7 @@ nn::Result ShopOperationInitialize()
-------------------------------------------------------------------- */
if (!s_IsNimShopInitialized)
{
NN_LOG("nim::InitializeForShop\n");
COMMON_LOGGER_DEBUG("nim::InitializeForShop\n");
result = nn::nim::InitializeForShop();
NN_UTIL_RETURN_IF_FAILED(result);
s_IsNimShopInitialized = true;
@ -321,12 +322,12 @@ nn::Result ShopOperationInitialize()
/* -------------------------------------------------------------------
SetParameter
-------------------------------------------------------------------- */
NN_LOG("nim::Shop::SetApplication Id\n");
COMMON_LOGGER_DEBUG("nim::Shop::SetApplication Id\n");
nn::nim::Shop::SetApplicationId();
NN_UTIL_RETURN_IF_FAILED(result);
NN_LOG("nim::Shop::SetTIN\n");
COMMON_LOGGER_DEBUG("nim::Shop::SetTIN\n");
result = nn::nim::Shop::SetTin(CONSOLE_RESTORE_TIN);
NN_UTIL_RETURN_IF_FAILED(result);
@ -356,12 +357,12 @@ nn::Result ShopOperationFinalize()
/* -------------------------------------------------------------------
Finalize
-------------------------------------------------------------------- */
NN_LOG("nim::FinalizeForShop\n");
COMMON_LOGGER_DEBUG("nim::FinalizeForShop\n");
result = nn::nim::FinalizeForShop();
NN_UTIL_RETURN_IF_FAILED(result);
s_IsNimShopInitialized = false;
NN_LOG("util::ac::Finalize\n");
COMMON_LOGGER_DEBUG("util::ac::Finalize\n");
result = FinalizeInternal();
NN_UTIL_RETURN_IF_FAILED(result);
@ -384,7 +385,7 @@ void ShopOperationUnregisterCore(bool force)
if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R' ||
pAccountInfo->accountStatus[0] == 'T'))
{
NN_LOG("nim::Shop::Unregister\n");
COMMON_LOGGER_DEBUG("nim::Shop::Unregister\n");
result = nn::nim::Shop::Unregister();
NIM_SHOP_RESULT_CHECK(result);
}
@ -393,13 +394,13 @@ void ShopOperationUnregisterCore(bool force)
{
if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R'))
{
NN_LOG("nim::Shop::Unregister\n");
COMMON_LOGGER_DEBUG("nim::Shop::Unregister\n");
result = nn::nim::Shop::Unregister();
NIM_SHOP_RESULT_CHECK(result);
}
else
{
NN_LOG("Not registered.\n");
COMMON_LOGGER_DEBUG("Not registered.\n");
}
}
}
@ -411,7 +412,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
s_ShopResult = nn::ResultSuccess();
NN_LOG("util::ac::Initialize\n");
COMMON_LOGGER_DEBUG("util::ac::Initialize\n");
result = InitializeInternal();
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
NIM_SHOP_RESULT_CHECK(result);
@ -457,7 +458,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
{
case SHOP_OPERATION_DOWNLOAD_TITLE:
NN_LOG("Try Download %016llx\n", param.config.titleId);
COMMON_LOGGER_DEBUG("Try Download %016llx\n", param.config.titleId);
result = nn::nim::Shop::StartDownload(param.config);
if (result == nn::nim::ResultBusy() || result == nn::nim::ResultAlreadyDone())
@ -477,7 +478,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
GetProgress
-------------------------------------------------------------------- */
NN_LOG("nim::Shop::GetProgress()\n");
COMMON_LOGGER_DEBUG("nim::Shop::GetProgress()\n");
nn::nim::TitleProgress before;
nn::nim::TitleProgress latest;
while (true)
@ -494,7 +495,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
// Print progress
if (latest != before)
{
NN_LOG("%8lld / %8lld (%d:%s)\n",
COMMON_LOGGER_DEBUG("%8lld / %8lld (%d:%s)\n",
latest.downloadedSize,
latest.totalSize,
latest.state.Get(),
@ -502,7 +503,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
if (latest.state == nn::nim::TITLE_STATE_FINISHED)
{
NN_LOG("Finished Download\n");
COMMON_LOGGER_DEBUG("Finished Download\n");
break;
}
@ -526,7 +527,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
void StartShopOperationSingle(ShopOperation op, nn::nim::TitleConfig config)
{
NN_LOG("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
COMMON_LOGGER_DEBUG("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
ShopThreadParam param;
param.op = op;
@ -539,13 +540,13 @@ void StartShopOperationSingle(ShopOperation op)
ShopThreadParam param;
param.op = op;
NN_LOG("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
COMMON_LOGGER_DEBUG("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
s_ShopOperationThread.Start(ShopOperationSingleThreadFunc, param, s_ShopOperationThreadStack);
}
void FinalizeShopOperationSingle()
{
NN_LOG("Finalize ShopOperationSingle\n");
COMMON_LOGGER_DEBUG("Finalize ShopOperationSingle\n");
s_ShopOperationThread.Join();
s_ShopOperationThread.Finalize();
}

12
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"}
};
NN_LOG("ID: %016llx\n", titleId);
COMMON_LOGGER_DEBUG("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);
NN_LOG("titleId : 0x%016llx\n", titleConfig->titleId);
NN_LOG("version : %lld\n" , titleConfig->version);
NN_LOG("ratingAge : %d\n" , titleConfig->ratingAge);
NN_LOG("media : %d\n" , titleConfig->media);
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);
return nn::ResultSuccess();
@ -236,7 +236,7 @@ nn::Result TitleDownloader::ListUp()
std::memcpy(ProgramIdStr, &titleListBuf[listHead], i - listHead);
m_ProgramIdList[m_TwlTiteNum] = std::strtoull(ProgramIdStr, &error, 16);
m_TwlTiteNum++;
NN_LOG("%016llx\n", m_ProgramIdList[m_TwlTiteNum - 1]);
COMMON_LOGGER_DEBUG("%016llx\n", m_ProgramIdList[m_TwlTiteNum - 1]);
listHead = i + 1;
}

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

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

6
trunk/ConsoleDataMigration/sources/common/CommonLogger.h
View File

@ -27,6 +27,12 @@
(void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Func = %s\n", func); \
(void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Result = %X\n", result.GetPrintableBits()); \
#ifndef NN_SWITCH_DISABLE_DEBUG_PRINT
#define COMMON_LOGGER_DEBUG( ... ) COMMON_LOGGER(__VA_ARGS__)
#else // ifndef NN_SWITCH_DISABLE_DEBUG_PRINT
#define COMMON_LOGGER_DEBUG( ... ) ((void)0)
#endif // ifndef NN_SWITCH_DISABLE_DEBUG_PRINT else
#define COMMON_LOGGER_RESULT_WITH_LINE(result, line, func) \
(void)nn::dbg::detail::Printf("%s\n", func); \
(void)nn::dbg::detail::Printf("%d\n", line); \