hoc-clk: make logging toggle config based
This commit is contained in:
1 parent
abfe4774a3
commit
2fd78d6c30
6 files changed
+82
-29
No files matched your search
@@ -81,6 +81,9 @@ typedef enum {
|
|||||||
|
|
||||||
HocClkConfigValue_Watchdog,
|
HocClkConfigValue_Watchdog,
|
||||||
|
|
||||||
|
HocClkConfigValue_FileLogging,
|
||||||
|
HocClkConfigValue_UartLogging,
|
||||||
|
|
||||||
KipConfigValue_custRev,
|
KipConfigValue_custRev,
|
||||||
KipConfigValue_KipVersion,
|
KipConfigValue_KipVersion,
|
||||||
// KipConfigValue_mtcConf,
|
// KipConfigValue_mtcConf,
|
||||||
@@ -341,6 +344,11 @@ static inline const char* hocclkFormatConfigValue(HocClkConfigValue val, bool pr
|
|||||||
|
|
||||||
case HocClkConfigValue_Watchdog:
|
case HocClkConfigValue_Watchdog:
|
||||||
return pretty ? "Watchcat" : "watchdog"; // More dignified
|
return pretty ? "Watchcat" : "watchdog"; // More dignified
|
||||||
|
|
||||||
|
case HocClkConfigValue_FileLogging:
|
||||||
|
return pretty ? "File Logging" : "file_logging";
|
||||||
|
case HocClkConfigValue_UartLogging:
|
||||||
|
return pretty ? "UART Logging" : "uart_logging";
|
||||||
// KIP config values
|
// KIP config values
|
||||||
case KipConfigValue_custRev:
|
case KipConfigValue_custRev:
|
||||||
return pretty ? "Custom Revision" : "kip_cust_rev";
|
return pretty ? "Custom Revision" : "kip_cust_rev";
|
||||||
@@ -593,6 +601,8 @@ static inline uint64_t hocclkDefaultConfigValue(HocClkConfigValue val)
|
|||||||
case HocClkConfigValue_MemoryFrequencyMeasurementMode:
|
case HocClkConfigValue_MemoryFrequencyMeasurementMode:
|
||||||
case HocClkConfigValue_MarikoMiddleFreqs:
|
case HocClkConfigValue_MarikoMiddleFreqs:
|
||||||
case HocClkConfigValue_LiveGpuVoltage:
|
case HocClkConfigValue_LiveGpuVoltage:
|
||||||
|
case HocClkConfigValue_FileLogging:
|
||||||
|
case HocClkConfigValue_UartLogging:
|
||||||
return 0ULL;
|
return 0ULL;
|
||||||
case HocClkConfigValue_RamDisplayUnit:
|
case HocClkConfigValue_RamDisplayUnit:
|
||||||
return (uint64_t)RamDisplayUnit_MHz;
|
return (uint64_t)RamDisplayUnit_MHz;
|
||||||
@@ -654,6 +664,9 @@ static inline uint64_t hocclkValidConfigValue(HocClkConfigValue val, uint64_t in
|
|||||||
case HocClkConfigValue_MarikoMiddleFreqs:
|
case HocClkConfigValue_MarikoMiddleFreqs:
|
||||||
case HocClkConfigValue_LiveGpuVoltage:
|
case HocClkConfigValue_LiveGpuVoltage:
|
||||||
case HocClkConfigValue_Watchdog:
|
case HocClkConfigValue_Watchdog:
|
||||||
|
case HocClkConfigValue_FileLogging:
|
||||||
|
case HocClkConfigValue_UartLogging:
|
||||||
|
case KipConfigValue_eristaCpuUnlock:
|
||||||
return (input & 0x1) == input;
|
return (input & 0x1) == input;
|
||||||
|
|
||||||
case KipConfigValue_KipVersion:
|
case KipConfigValue_KipVersion:
|
||||||
@@ -790,7 +803,6 @@ static inline uint64_t hocclkValidConfigValue(HocClkConfigValue val, uint64_t in
|
|||||||
case KipConfigValue_g_soc_volt_3266000:
|
case KipConfigValue_g_soc_volt_3266000:
|
||||||
case KipConfigValue_g_soc_volt_3333000:
|
case KipConfigValue_g_soc_volt_3333000:
|
||||||
case KipConfigValue_eristaCpuVmin:
|
case KipConfigValue_eristaCpuVmin:
|
||||||
case KipConfigValue_eristaCpuUnlock:
|
|
||||||
case KipConfigValue_t6_tRTW_fine_tune:
|
case KipConfigValue_t6_tRTW_fine_tune:
|
||||||
case KipConfigValue_t7_tWTR_fine_tune:
|
case KipConfigValue_t7_tWTR_fine_tune:
|
||||||
case KipCrc32:
|
case KipCrc32:
|
||||||
|
|||||||
@@ -560,6 +560,18 @@ std::vector<std::string> ConfigInfoStrings(HocClkConfigValue val, bool isMariko,
|
|||||||
"Voltage applies globally across all frequencies.",
|
"Voltage applies globally across all frequencies.",
|
||||||
"\"Reset\" restores default or RAM-stable minimum."
|
"\"Reset\" restores default or RAM-stable minimum."
|
||||||
};
|
};
|
||||||
|
case HocClkConfigValue_FileLogging:
|
||||||
|
return {
|
||||||
|
"Write sysmodule logs to log.txt in the config folder.",
|
||||||
|
"Takes effect after a reboot.",
|
||||||
|
"Default: Off"
|
||||||
|
};
|
||||||
|
case HocClkConfigValue_UartLogging:
|
||||||
|
return {
|
||||||
|
"Output sysmodule logs over UART.",
|
||||||
|
"Takes effect after a reboot.",
|
||||||
|
"Default: Off"
|
||||||
|
};
|
||||||
default:
|
default:
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -806,6 +806,13 @@ class GeneralSettingsSubMenuGui : public MiscGui {
|
|||||||
addConfigButton(HocClkConfigValue_PollingIntervalMs, "Polling Interval", ValueRange(50, 1000, 50, "ms", 1), "Polling Interval",
|
addConfigButton(HocClkConfigValue_PollingIntervalMs, "Polling Interval", ValueRange(50, 1000, 50, "ms", 1), "Polling Interval",
|
||||||
&thresholdsDisabled, {}, {}, false);
|
&thresholdsDisabled, {}, {}, false);
|
||||||
|
|
||||||
|
tsl::elm::CustomDrawer *loggingSpacer = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *, s32, s32, s32, s32) {});
|
||||||
|
loggingSpacer->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 12);
|
||||||
|
this->listElement->addItem(loggingSpacer);
|
||||||
|
this->listElement->addItem(new CompactCategoryHeader("Logging"));
|
||||||
|
addConfigToggle(HocClkConfigValue_FileLogging, nullptr);
|
||||||
|
addConfigToggle(HocClkConfigValue_UartLogging, nullptr);
|
||||||
|
|
||||||
tsl::elm::CustomDrawer *exSetWarning = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
|
tsl::elm::CustomDrawer *exSetWarning = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
|
||||||
renderer->drawString("\uE150 Experimental Settings are incomplete ", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
|
renderer->drawString("\uE150 Experimental Settings are incomplete ", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
|
||||||
renderer->drawString("and may not work correctly or at all!", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
|
renderer->drawString("and may not work correctly or at all!", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
|
||||||
|
|||||||
@@ -30,8 +30,12 @@
|
|||||||
|
|
||||||
#include "../hos/apm_ext.h"
|
#include "../hos/apm_ext.h"
|
||||||
#include "file_utils.hpp"
|
#include "file_utils.hpp"
|
||||||
|
#include "config.hpp"
|
||||||
#include <ipc_server.h>
|
#include <ipc_server.h>
|
||||||
#include <lockable_mutex.h>
|
#include <lockable_mutex.h>
|
||||||
|
#include <string>
|
||||||
|
#include <utility>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
extern "C" void __libnx_init_time(void);
|
extern "C" void __libnx_init_time(void);
|
||||||
|
|
||||||
@@ -45,19 +49,24 @@ namespace file::utils {
|
|||||||
std::atomic_bool g_has_initialized = false;
|
std::atomic_bool g_has_initialized = false;
|
||||||
bool g_log_enabled = false;
|
bool g_log_enabled = false;
|
||||||
bool g_uart_enabled = false;
|
bool g_uart_enabled = false;
|
||||||
|
bool g_flags_resolved = false;
|
||||||
|
|
||||||
bool FlagExists(const char *path) {
|
constexpr size_t MaxPendingLines = 64;
|
||||||
FILE *file = fopen(path, "r");
|
std::vector<std::pair<u64, std::string>> g_pending_lines;
|
||||||
if (file) {
|
|
||||||
fclose(file);
|
void EmitLine(u64 secs, const char *buff, int len) {
|
||||||
return true;
|
if (g_uart_enabled) {
|
||||||
|
svcOutputDebugString(buff, len);
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void RefreshFlags() {
|
if (g_log_enabled) {
|
||||||
g_log_enabled = FlagExists(FILE_LOG_FLAG_PATH);
|
FILE *file = fopen(FILE_LOG_FILE_PATH, "a");
|
||||||
g_uart_enabled = FlagExists(FILE_UART_FLAG_PATH);
|
|
||||||
|
if (file) {
|
||||||
|
fprintf(file, "[%luls] %s", secs, buff);
|
||||||
|
fclose(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InitializeThreadFunc(void *args) {
|
void InitializeThreadFunc(void *args) {
|
||||||
@@ -66,6 +75,24 @@ namespace file::utils {
|
|||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
void InitializeLogging() {
|
||||||
|
const bool logEnabled = config::GetConfigValue(HocClkConfigValue_FileLogging);
|
||||||
|
const bool uartEnabled = config::GetConfigValue(HocClkConfigValue_UartLogging);
|
||||||
|
|
||||||
|
std::scoped_lock lock{ g_log_mutex };
|
||||||
|
g_log_enabled = logEnabled;
|
||||||
|
g_uart_enabled = uartEnabled;
|
||||||
|
g_flags_resolved = true;
|
||||||
|
|
||||||
|
if (g_log_enabled || g_uart_enabled) {
|
||||||
|
for (const auto &[secs, line] : g_pending_lines) {
|
||||||
|
EmitLine(secs, line.c_str(), (int)line.size());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
g_pending_lines.clear();
|
||||||
|
g_pending_lines.shrink_to_fit();
|
||||||
|
}
|
||||||
|
|
||||||
bool IsInitialized() {
|
bool IsInitialized() {
|
||||||
return g_has_initialized;
|
return g_has_initialized;
|
||||||
}
|
}
|
||||||
@@ -85,7 +112,7 @@ namespace file::utils {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!g_log_enabled && !g_uart_enabled) {
|
if (g_flags_resolved && !g_log_enabled && !g_uart_enabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,22 +133,18 @@ namespace file::utils {
|
|||||||
buff[len++] = '\n';
|
buff[len++] = '\n';
|
||||||
buff[len] = '\0';
|
buff[len] = '\0';
|
||||||
|
|
||||||
// Debug UART log
|
timespec now = {};
|
||||||
if (g_uart_enabled) {
|
clock_gettime(CLOCK_REALTIME, &now);
|
||||||
svcOutputDebugString(buff, len);
|
const u64 secs = now.tv_sec - bootTimeS;
|
||||||
}
|
|
||||||
|
|
||||||
if (g_log_enabled) {
|
if (!g_flags_resolved) {
|
||||||
FILE *file = fopen(FILE_LOG_FILE_PATH, "a");
|
if (g_pending_lines.size() < MaxPendingLines) {
|
||||||
|
g_pending_lines.emplace_back(secs, std::string(buff, len));
|
||||||
if (file) {
|
|
||||||
timespec now = {};
|
|
||||||
clock_gettime(CLOCK_REALTIME, &now);
|
|
||||||
|
|
||||||
fprintf(file, "[%luls] %s", now.tv_sec - bootTimeS, buff);
|
|
||||||
fclose(file);
|
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EmitLine(secs, buff, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WriteContextToCsv(const HocClkContext *context) {
|
void WriteContextToCsv(const HocClkContext *context) {
|
||||||
@@ -212,7 +235,6 @@ namespace file::utils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (R_SUCCEEDED(rc)) {
|
if (R_SUCCEEDED(rc)) {
|
||||||
RefreshFlags();
|
|
||||||
g_has_initialized = true;
|
g_has_initialized = true;
|
||||||
LogLine("=== hoc-clk " TARGET_VERSION " ===");
|
LogLine("=== hoc-clk " TARGET_VERSION " ===");
|
||||||
LogLine("by m4xw, natinusala, p-sam, Souldbminer, Lightos_ and Dominatorul");
|
LogLine("by m4xw, natinusala, p-sam, Souldbminer, Lightos_ and Dominatorul");
|
||||||
|
|||||||
@@ -36,8 +36,6 @@
|
|||||||
|
|
||||||
#define FILE_CONFIG_DIR "/config/" CONFIG_DIR
|
#define FILE_CONFIG_DIR "/config/" CONFIG_DIR
|
||||||
#define FILE_CONTEXT_CSV_PATH FILE_CONFIG_DIR "/context.csv"
|
#define FILE_CONTEXT_CSV_PATH FILE_CONFIG_DIR "/context.csv"
|
||||||
#define FILE_LOG_FLAG_PATH FILE_CONFIG_DIR "/log.flag"
|
|
||||||
#define FILE_UART_FLAG_PATH FILE_CONFIG_DIR "/uart.flag"
|
|
||||||
#define FILE_LOG_FILE_PATH FILE_CONFIG_DIR "/log.txt"
|
#define FILE_LOG_FILE_PATH FILE_CONFIG_DIR "/log.txt"
|
||||||
#define FILE_SETTINGS_PATH FILE_CONFIG_DIR "/settings.ini"
|
#define FILE_SETTINGS_PATH FILE_CONFIG_DIR "/settings.ini"
|
||||||
#define FILE_KIP_DIR FILE_CONFIG_DIR "/kip"
|
#define FILE_KIP_DIR FILE_CONFIG_DIR "/kip"
|
||||||
@@ -53,6 +51,7 @@ namespace file::utils {
|
|||||||
bool IsLogEnabled();
|
bool IsLogEnabled();
|
||||||
bool IsUartEnabled();
|
bool IsUartEnabled();
|
||||||
void InitializeAsync();
|
void InitializeAsync();
|
||||||
|
void InitializeLogging();
|
||||||
void LogLine(const char *format, ...);
|
void LogLine(const char *format, ...);
|
||||||
void WriteContextToCsv(const HocClkContext *context);
|
void WriteContextToCsv(const HocClkContext *context);
|
||||||
|
|
||||||
|
|||||||
@@ -126,7 +126,8 @@ int main(int argc, char **argv) {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
file::config::Initialize();
|
file::config::Initialize();
|
||||||
file::config::Refresh(); // Get config from file
|
file::config::Refresh();
|
||||||
|
file::utils::InitializeLogging();
|
||||||
|
|
||||||
board::Initialize();
|
board::Initialize();
|
||||||
hos::InitializeProcessManagement();
|
hos::InitializeProcessManagement();
|
||||||
|
|||||||
Reference in new issue
Block a user