Merge pull request #11441 from sonninnos/savestate-logging

Savestate logging cleanup
This commit is contained in:
Autechre 2020-10-15 04:49:55 +02:00 committed by GitHub
commit 74f4cd823f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 24 deletions

View File

@ -15752,7 +15752,9 @@ static bool command_event_main_state(
if (push_msg) if (push_msg)
runloop_msg_queue_push(msg, 2, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); runloop_msg_queue_push(msg, 2, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
RARCH_LOG("%s\n", msg);
if (!string_is_empty(msg))
RARCH_LOG("%s\n", msg);
return ret; return ret;
} }

View File

@ -413,13 +413,11 @@ bool content_undo_load_state(void)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool block_sram_overwrite = settings->bools.block_sram_overwrite; bool block_sram_overwrite = settings->bools.block_sram_overwrite;
RARCH_LOG("%s: \"%s\".\n", RARCH_LOG("%s: \"%s\", %s: %u %s.\n",
msg_hash_to_str(MSG_LOADING_STATE), msg_hash_to_str(MSG_LOADING_STATE),
undo_load_buf.path); undo_load_buf.path,
RARCH_LOG("%s: %u %s.\n",
msg_hash_to_str(MSG_STATE_SIZE), msg_hash_to_str(MSG_STATE_SIZE),
(unsigned int)undo_load_buf.size, (unsigned)undo_load_buf.size,
msg_hash_to_str(MSG_BYTES)); msg_hash_to_str(MSG_BYTES));
/* TODO/FIXME - This checking of SRAM overwrite, /* TODO/FIXME - This checking of SRAM overwrite,
@ -597,11 +595,6 @@ static void *get_serialized_data(const char *path, size_t serial_size)
if (!data) if (!data)
return NULL; return NULL;
RARCH_LOG("%s: %d %s.\n",
msg_hash_to_str(MSG_STATE_SIZE),
(int)serial_size,
msg_hash_to_str(MSG_BYTES));
serial_info.data = data; serial_info.data = data;
serial_info.size = serial_size; serial_info.size = serial_size;
ret = core_serialize(&serial_info); ret = core_serialize(&serial_info);
@ -949,18 +942,16 @@ static void content_load_state_cb(retro_task_t *task,
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool block_sram_overwrite = settings->bools.block_sram_overwrite; bool block_sram_overwrite = settings->bools.block_sram_overwrite;
RARCH_LOG("%s: \"%s\".\n", RARCH_LOG("%s: \"%s\", %s: %u %s.\n",
msg_hash_to_str(MSG_LOADING_STATE), msg_hash_to_str(MSG_LOADING_STATE),
load_data->path); load_data->path,
if (size < 0 || !buf)
goto error;
RARCH_LOG("%s: %u %s.\n",
msg_hash_to_str(MSG_STATE_SIZE), msg_hash_to_str(MSG_STATE_SIZE),
(unsigned)size, (unsigned)size,
msg_hash_to_str(MSG_BYTES)); msg_hash_to_str(MSG_BYTES));
if (size < 0 || !buf)
goto error;
/* This means we're backing up the file in memory, /* This means we're backing up the file in memory,
* so content_undo_save_state() * so content_undo_save_state()
* can restore it */ * can restore it */
@ -1284,10 +1275,6 @@ bool content_save_state(const char *path, bool save_to_disk, bool autosave)
if (!save_state_in_background) if (!save_state_in_background)
{ {
RARCH_LOG("%s: \"%s\".\n",
msg_hash_to_str(MSG_SAVING_STATE),
path);
data = get_serialized_data(path, info.size); data = get_serialized_data(path, info.size);
if (!data) if (!data)
@ -1298,9 +1285,11 @@ bool content_save_state(const char *path, bool save_to_disk, bool autosave)
return false; return false;
} }
RARCH_LOG("%s: %d %s.\n", RARCH_LOG("%s: \"%s\", %s: %u %s.\n",
msg_hash_to_str(MSG_SAVING_STATE),
path,
msg_hash_to_str(MSG_STATE_SIZE), msg_hash_to_str(MSG_STATE_SIZE),
(int)info.size, (unsigned)info.size,
msg_hash_to_str(MSG_BYTES)); msg_hash_to_str(MSG_BYTES));
} }