From 7bce7967b5dc943c56e17e546ac103c3e9132fc5 Mon Sep 17 00:00:00 2001 From: Alexander Yee Date: Tue, 17 Dec 2024 21:03:47 -0800 Subject: [PATCH] Add CPU information to error reports. --- .../Source/CommonFramework/ErrorReports/ErrorReports.cpp | 4 ++++ .../Source/CommonFramework/ErrorReports/ErrorReports.h | 1 + 2 files changed, 5 insertions(+) diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp index eb3e25f13..b472ef303 100644 --- a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp +++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp @@ -14,6 +14,7 @@ #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Environment/Environment.h" #include "CommonFramework/Options/Environment/ThemeSelectorOption.h" #include "CommonFramework/Tools/ConsoleHandle.h" #include "ProgramDumper.h" @@ -96,6 +97,7 @@ ErrorReportOption::ErrorReportOption() SendableErrorReport::SendableErrorReport() : m_timestamp(now_to_filestring()) , m_directory(ERROR_PATH_UNSENT + "/" + m_timestamp + "/") + , m_processor(get_processor_name()) , m_program(PreloadSettings::instance().DEVELOPER_MODE ? PROGRAM_NAME + " (" + PROGRAM_VERSION + "-dev)" : PROGRAM_NAME + " (" + PROGRAM_VERSION + ")" @@ -161,6 +163,7 @@ SendableErrorReport::SendableErrorReport(std::string directory) JsonValue json = load_json_file(m_directory + "Report.json"); const JsonObject& obj = json.to_object_throw(); m_timestamp = obj.get_string_throw("Timestamp"); + m_processor = obj.get_string_throw("Processor"); m_program = obj.get_string_throw("Program"); m_program_id = obj.get_string_throw("ProgramID"); m_program_runtime_millis = obj.get_integer_throw("ElapsedTimeMillis"); @@ -226,6 +229,7 @@ void SendableErrorReport::save(Logger* logger) const{ JsonObject report; report["Timestamp"] = m_timestamp; + report["Processor"] = m_processor; report["Program"] = m_program; report["ProgramID"] = m_program_id; report["ElapsedTimeMillis"] = m_program_runtime_millis; diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h index 038fa9bda..4ca416105 100644 --- a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h +++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h @@ -84,6 +84,7 @@ class SendableErrorReport{ private: std::string m_timestamp; std::string m_directory; + std::string m_processor; std::string m_program; std::string m_program_id; uint64_t m_program_runtime_millis;