mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow perf counter reset from RGUI.

Browse Source
This commit is contained in:
Themaister 2014-06-01 20:24:55 +02:00
parent 88a0fa81c2
commit 3138152a80
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/menu/backend/menu_common_backend.c
View File

@ -391,7 +391,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
#ifdef HAVE_OSK #ifdef HAVE_OSK
file_list_push(rgui->selection_buf, "Onscreen Keyboard Enable", RGUI_SETTINGS_ONSCREEN_KEYBOARD_ENABLE, 0); file_list_push(rgui->selection_buf, "Onscreen Keyboard Enable", RGUI_SETTINGS_ONSCREEN_KEYBOARD_ENABLE, 0);
#endif #endif
last = (driver.input && driver.input->set_keybinds && !driver.input->get_joypad_driver) ? RGUI_SETTINGS_BIND_R3 : RGUI_SETTINGS_BIND_MENU_TOGGLE; last = (driver.input && driver.input->set_keybinds && !driver.input->get_joypad_driver) ? RGUI_SETTINGS_BIND_R3 : RGUI_SETTINGS_BIND_ALL_LAST;
for (i = RGUI_SETTINGS_BIND_BEGIN; i <= last; i++) for (i = RGUI_SETTINGS_BIND_BEGIN; i <= last; i++)
file_list_push(rgui->selection_buf, input_config_bind_map[i - RGUI_SETTINGS_BIND_BEGIN].desc, i, 0); file_list_push(rgui->selection_buf, input_config_bind_map[i - RGUI_SETTINGS_BIND_BEGIN].desc, i, 0);
break; break;
@ -3092,7 +3092,20 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
{ {
unsigned port = driver.menu->current_pad; unsigned port = driver.menu->current_pad;
if (setting >= RGUI_SETTINGS_BIND_BEGIN && setting <= RGUI_SETTINGS_BIND_ALL_LAST) if (setting >= RGUI_SETTINGS_PERF_COUNTERS_BEGIN && setting <= RGUI_SETTINGS_PERF_COUNTERS_END)
{
#ifdef PERF_TEST
struct retro_perf_counter **counters = (struct retro_perf_counter**)perf_counters_rarch;
unsigned offset = setting - RGUI_SETTINGS_PERF_COUNTERS_BEGIN;
if (counters[offset] && action == RGUI_ACTION_START)
{
counters[offset]->total = 0;
counters[offset]->call_cnt = 0;
}
#endif
return 0;
}
else if (setting >= RGUI_SETTINGS_BIND_BEGIN && setting <= RGUI_SETTINGS_BIND_ALL_LAST)
{ {
if (driver.input->set_keybinds && !driver.input->get_joypad_driver) if (driver.input->set_keybinds && !driver.input->get_joypad_driver)
{ {
@ -4669,9 +4682,9 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size,
#ifdef PERF_TEST #ifdef PERF_TEST
const struct retro_perf_counter **counters = (const struct retro_perf_counter**)perf_counters_rarch; const struct retro_perf_counter **counters = (const struct retro_perf_counter**)perf_counters_rarch;
if (counters[type]) unsigned offset = type - RGUI_SETTINGS_PERF_COUNTERS_BEGIN;
if (counters[offset] && counters[offset]->call_cnt)
{ {
unsigned offset = type - RGUI_SETTINGS_PERF_COUNTERS_BEGIN;
snprintf(type_str, type_str_size, PERF_LOG_FMT, snprintf(type_str, type_str_size, PERF_LOG_FMT,
((unsigned long long)counters[offset]->total / (unsigned long long)counters[offset]->call_cnt), ((unsigned long long)counters[offset]->total / (unsigned long long)counters[offset]->call_cnt),
(unsigned long long)counters[offset]->call_cnt); (unsigned long long)counters[offset]->call_cnt);

11
performance.c
View File

@ -117,10 +117,13 @@ static void log_counters(const struct retro_perf_counter **counters, unsigned nu
unsigned i; unsigned i;
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
{ {
RARCH_LOG(PERF_LOG_FMT, if (counters[i]->call_cnt)
counters[i]->ident, {
(unsigned long long)counters[i]->total / (unsigned long long)counters[i]->call_cnt, RARCH_LOG(PERF_LOG_FMT,
(unsigned long long)counters[i]->call_cnt); counters[i]->ident,
(unsigned long long)counters[i]->total / (unsigned long long)counters[i]->call_cnt,
(unsigned long long)counters[i]->call_cnt);
}
} }
} }