mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-04-22 04:24:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More cleanup

Browse source
This commit is contained in:
XorTroll 2020-12-22 19:08:19 +01:00
parent 9b08454557
commit 3dbd63ef71
7 changed files with 32 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config_templates/system_settings.ini
View file

@ -32,10 +32,6 @@
; NOTE: EXPERIMENTAL
; If you do not know what you are doing, do not touch this yet.
; fsmitm_redirect_saves_to_sd = u8!0x0
; Controls whether debug system/game logs should be saved on the SD card.
; 0 = Do not save, 1 = Save.
; If you do not know what you are doing, do not touch this yet.
; logmanager_save_debug_logs = u8!0x0
; Controls whether to enable the deprecated hid mitm
; to fix compatibility with old homebrew.
; 0 = Do not enable, 1 = Enable.

1
libraries/libstratosphere/source/diag/detail/diag_detail_log.cpp
View file

@ -23,7 +23,6 @@ namespace ams::diag::detail {
char *print_str_start;
char *print_str_end;
char *print_str_cur;
/* void *d; */
const LogMetaData &log_metadata;
bool is_head;
char buffer[40];

58
stratosphere/lm/source/impl/lm_custom_sink_buffer.cpp
View file

@ -4,27 +4,27 @@ namespace ams::lm::impl {
namespace {
u8 g_log_getter_log_buffer[0x8000];
void *g_log_getter_log_data = nullptr;
size_t g_log_getter_log_size = 0;
u64 g_log_getter_log_packet_drop_count = 0;
u8 g_sink_buffer_log_buffer[0x8000];
void *g_sink_buffer_log_data = nullptr;
size_t g_sink_buffer_log_size = 0;
u64 g_sink_buffer_log_packet_drop_count = 0;
u64 g_log_getter_current_process_id = 0;
u64 g_log_getter_current_thread_id = 0;
size_t g_log_getter_remaining_size = 0;
u64 g_sink_buffer_current_process_id = 0;
u64 g_sink_buffer_current_thread_id = 0;
size_t g_sink_buffer_remaining_size = 0;
bool CustomSinkBuffer_PrepareLogData(u8 *log_data, size_t log_data_size) {
/* Simply update the global values with the buffer and size. */
g_log_getter_log_data = log_data;
g_log_getter_log_size = log_data_size;
g_sink_buffer_log_data = log_data;
g_sink_buffer_log_size = log_data_size;
return true;
}
bool WriteToLogGetterImpl(const void *log_data, size_t size, u64 unk_param) {
bool WriteToSinkBufferImpl(const void *log_data, size_t size, u64 unk_param) {
const auto ok = GetCustomSinkBuffer()->Log(log_data, size);
if (!ok) {
/* Logging failed, thus increase packet drop count. */
g_log_getter_log_packet_drop_count++;
g_sink_buffer_log_packet_drop_count++;
}
return ok;
@ -62,19 +62,19 @@ namespace ams::lm::impl {
}
CustomSinkBuffer *GetCustomSinkBuffer() {
static CustomSinkBuffer custom_sink_buffer(g_log_getter_log_buffer, sizeof(g_log_getter_log_buffer), CustomSinkBuffer_PrepareLogData);
static CustomSinkBuffer custom_sink_buffer(g_sink_buffer_log_buffer, sizeof(g_sink_buffer_log_buffer), CustomSinkBuffer_PrepareLogData);
return std::addressof(custom_sink_buffer);
}
void WriteLogToCustomSink(const detail::LogPacketHeader *log_packet_header, size_t log_packet_size, u64 unk_param) {
/* Process ID value is set earlier, so it's guaranteed to be valid. */
if (log_packet_header->GetProcessId() != g_log_getter_current_process_id) {
if (log_packet_header->GetProcessId() != g_sink_buffer_current_process_id) {
/* We're starting to log from a different process, so we need first a head packet. */
if (!log_packet_header->IsHead()) {
return;
}
}
const auto logging_in_same_thread = log_packet_header->GetThreadId() == g_log_getter_current_thread_id;
const auto logging_in_same_thread = log_packet_header->GetThreadId() == g_sink_buffer_current_thread_id;
if (!logging_in_same_thread) {
/* We're starting to log from a different thread, so we need first a head packet. */
if (!log_packet_header->IsHead()) {
@ -87,17 +87,17 @@ namespace ams::lm::impl {
/* No need to check packet header's payload size, since it has already been validated. */
auto log_payload_size = log_packet_size - sizeof(detail::LogPacketHeader);
if (logging_in_same_thread && (g_log_getter_remaining_size > 0)) {
if (logging_in_same_thread && (g_sink_buffer_remaining_size > 0)) {
auto log_remaining_size = log_payload_size;
if (log_payload_size >= g_log_getter_remaining_size) {
log_remaining_size = g_log_getter_remaining_size;
if (log_payload_size >= g_sink_buffer_remaining_size) {
log_remaining_size = g_sink_buffer_remaining_size;
}
if (GetCustomSinkBuffer()->ExpectsMorePackets()) {
WriteToLogGetterImpl(log_payload_cur, log_remaining_size, unk_param);
WriteToSinkBufferImpl(log_payload_cur, log_remaining_size, unk_param);
}
log_payload_cur += log_remaining_size;
log_payload_size -= log_remaining_size;
g_log_getter_remaining_size -= log_remaining_size;
g_sink_buffer_remaining_size -= log_remaining_size;
}
size_t remaining_chunk_size = 0;
@ -119,7 +119,7 @@ namespace ams::lm::impl {
if (chunk_size < actual_size) {
actual_size = chunk_size;
}
WriteToLogGetterImpl(log_payload_cur, actual_size, unk_param);
WriteToSinkBufferImpl(log_payload_cur, actual_size, unk_param);
}
log_payload_cur += chunk_size;
if (log_payload_cur >= log_payload_end) {
@ -130,28 +130,28 @@ namespace ams::lm::impl {
if (!log_packet_header->IsTail()) {
/* If more packets will come after this one, set current values. */
g_log_getter_current_process_id = log_packet_header->GetProcessId();
g_log_getter_current_thread_id = log_packet_header->GetThreadId();
g_log_getter_remaining_size = remaining_chunk_size;
g_sink_buffer_current_process_id = log_packet_header->GetProcessId();
g_sink_buffer_current_thread_id = log_packet_header->GetThreadId();
g_sink_buffer_remaining_size = remaining_chunk_size;
GetCustomSinkBuffer()->SetExpectsMorePackets(contains_log_data);
}
}
size_t ReadLogFromCustomSink(void *out_log_data, size_t size, u64 *out_packet_drop_count) {
/* Copy log data from the global pointer and size values. */
auto read_size = g_log_getter_log_size;
if (g_log_getter_log_size > size) {
auto read_size = g_sink_buffer_log_size;
if (g_sink_buffer_log_size > size) {
/* Buffer can't hold all the log data, thus increase the drop count. */
read_size = size;
g_log_getter_log_packet_drop_count++;
g_sink_buffer_log_packet_drop_count++;
}
/* Copy data. */
std::memcpy(out_log_data, g_log_getter_log_data, read_size);
std::memcpy(out_log_data, g_sink_buffer_log_data, read_size);
/* Get the packet drop count value, and reset it. */
*out_packet_drop_count = g_log_getter_log_packet_drop_count;
g_log_getter_log_packet_drop_count = 0;
*out_packet_drop_count = g_sink_buffer_log_packet_drop_count;
g_sink_buffer_log_packet_drop_count = 0;
return read_size;
}

4
stratosphere/lm/source/impl/lm_log_buffer.hpp
View file

@ -28,10 +28,6 @@ namespace ams::lm::impl {
size_t current_data_size;
uint64_t some_count;
LogBuffer *second_log_buffer;
/*
uint64_t unk_3;
uint64_t unk_4;
*/
LogBuffer *main_target_buffer;
LogBuffer *sub_target_buffer;
size_t data_buffer_size;

4
stratosphere/lm/source/impl/lm_log_server_proxy.hpp
View file

@ -31,10 +31,6 @@ namespace ams::lm::impl {
std::atomic_int htcs_server_fd;
std::atomic_int htcs_client_fd;
UpdateEnabledFunction update_enabled_fn;
/*
u64 data_4;
char data_5[3566];
*/
public:
LogServerProxy() : htcs_thread_stack{}, htcs_thread(), some_cond_var(), finalize_event(os::EventClearMode_ManualClear), some_cond_var_lock(), update_enabled_fn_lock(), htcs_server_fd(INT_MAX), htcs_client_fd(INT_MAX), update_enabled_fn(nullptr) /*, data_4(0), data_5{}*/ {}

4
stratosphere/lm/source/impl/lm_sd_card_logging.hpp
View file

@ -34,12 +34,10 @@ namespace ams::lm::impl {
bool sd_card_mounted;
bool sd_card_ok;
char log_file_path[0x80];
/* bool some_flag_4; */
size_t log_file_offset;
UpdateEnabledFunction update_enabled_fn;
/* size_t unk; */
public:
SdCardLogging() : update_enabled_fn_lock(), enabled(false), sd_card_mounted(false), sd_card_ok(false), log_file_path{}, /*some_flag_4(false),*/ log_file_offset(0), update_enabled_fn(nullptr) /*, unk(0)*/ {}
SdCardLogging() : update_enabled_fn_lock(), enabled(false), sd_card_mounted(false), sd_card_ok(false), log_file_path{}, log_file_offset(0), update_enabled_fn(nullptr) {}
bool Initialize();
void Dispose();

4
stratosphere/sm/source/impl/sm_service_manager.cpp
View file

@ -370,8 +370,8 @@ namespace ams::sm::impl {
/* Create both handles. */
{
os::ManagedHandle fwd_hnd, hnd;
R_ABORT_UNLESS(svcConnectToPort(fwd_hnd.GetPointer(), service_info->port_h.Get()));
R_ABORT_UNLESS(svcConnectToPort(hnd.GetPointer(), service_info->mitm_port_h.Get()));
R_TRY(svcConnectToPort(fwd_hnd.GetPointer(), service_info->port_h.Get()));
R_TRY(svcConnectToPort(hnd.GetPointer(), service_info->mitm_port_h.Get()));
service_info->mitm_fwd_sess_h = std::move(fwd_hnd);
*out = hnd.Move();
}