mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13207 from Jamiras/cheevos_rewind_reset

Browse Source 
(cheevos) don't queue rewind re-init if already on main thread
This commit is contained in:
Autechre 2021-11-08 19:24:18 +01:00 committed by GitHub
commit 56e150d68f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cheevos/cheevos.c
View File

@ -821,13 +821,16 @@ static void rcheevos_toggle_hardcore_active(rcheevos_locals_t* locals)
if (rewind_enable)
{
#ifdef HAVE_THREADS
/* have to "schedule" this.
* CMD_EVENT_REWIND_DEINIT should
* only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_DEINIT;
#else
command_event(CMD_EVENT_REWIND_DEINIT, NULL);
if (!task_is_on_main_thread())
{
/* have to "schedule" this.
* CMD_EVENT_REWIND_DEINIT should
* only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_DEINIT;
}
else
#endif
command_event(CMD_EVENT_REWIND_DEINIT, NULL);
}
}
else
@ -847,13 +850,16 @@ static void rcheevos_toggle_hardcore_active(rcheevos_locals_t* locals)
if (rewind_enable)
{
#ifdef HAVE_THREADS
/* have to "schedule" this.
* CMD_EVENT_REWIND_INIT should
* only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_INIT;
#else
command_event(CMD_EVENT_REWIND_INIT, NULL);
if (!task_is_on_main_thread())
{
/* have to "schedule" this.
* CMD_EVENT_REWIND_INIT should
* only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_INIT;
}
else
#endif
command_event(CMD_EVENT_REWIND_INIT, NULL);
}
}
@ -1341,12 +1347,15 @@ static void rcheevos_start_session(void)
if (settings->bools.rewind_enable)
{
#ifdef HAVE_THREADS
/* Have to "schedule" this. CMD_EVENT_REWIND_INIT should
* only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_INIT;
#else
command_event(CMD_EVENT_REWIND_INIT, NULL);
if (!task_is_on_main_thread())
{
/* Have to "schedule" this. CMD_EVENT_REWIND_INIT should
* only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_INIT;
}
else
#endif
command_event(CMD_EVENT_REWIND_INIT, NULL);
}
}
#endif
@ -1420,15 +1429,18 @@ static void rcheevos_fetch_game_data(void)
if (settings->bools.rewind_enable)
{
#ifdef HAVE_THREADS
/* have to "schedule" this. CMD_EVENT_REWIND_DEINIT should only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_DEINIT;
if (!task_is_on_main_thread())
{
/* have to "schedule" this. CMD_EVENT_REWIND_DEINIT should only be called on the main thread */
rcheevos_locals.queued_command = CMD_EVENT_REWIND_DEINIT;
/* wait for rewind to be disabled */
while (rcheevos_locals.queued_command != CMD_EVENT_NONE)
retro_sleep(1);
#else
command_event(CMD_EVENT_REWIND_DEINIT, NULL);
/* wait for rewind to be disabled */
while (rcheevos_locals.queued_command != CMD_EVENT_NONE)
retro_sleep(1);
}
else
#endif
command_event(CMD_EVENT_REWIND_DEINIT, NULL);
}
}
#endif

2
libretro-common/include/queues/task_queue.h
View File

@ -191,6 +191,8 @@ char* task_get_title(retro_task_t *task);
void* task_get_data(retro_task_t *task);
bool task_is_on_main_thread(void);
void task_queue_set_threaded(void);
void task_queue_unset_threaded(void);

11
libretro-common/queues/task_queue.c
View File

@ -66,6 +66,7 @@ static struct retro_task_impl *impl_current = NULL;
static bool task_threaded_enable = false;
#ifdef HAVE_THREADS
static uintptr_t main_thread_id = NULL;
static slock_t *running_lock = NULL;
static slock_t *finished_lock = NULL;
static slock_t *property_lock = NULL;
@ -614,6 +615,7 @@ void task_queue_init(bool threaded, retro_task_queue_msg_t msg_push)
impl_current = &impl_regular;
#ifdef HAVE_THREADS
main_thread_id = sthread_get_current_thread_id();
if (threaded)
{
task_threaded_enable = true;
@ -750,6 +752,15 @@ void task_queue_retriever_info_free(task_retriever_info_t *list)
}
}
bool task_is_on_main_thread(void)
{
#ifdef HAVE_THREADS
return sthread_get_current_thread_id() == main_thread_id;
#else
return true;
#endif
}
void task_set_finished(retro_task_t *task, bool finished)
{
SLOCK_LOCK(property_lock);