mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put this block inside rarch_main_data_iterate

Browse Source
This commit is contained in:
twinaphex 2015-11-22 21:46:02 +01:00
parent eb3cacf14c
commit 6eda4bc9af
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
runloop_data.c
View File

@ -28,13 +28,6 @@
#include "menu/menu.h" #include "menu/menu.h"
#endif #endif
enum thread_code_enum
{
THREAD_CODE_INIT = 0,
THREAD_CODE_DEINIT,
THREAD_CODE_ALIVE
};
typedef struct data_runloop typedef struct data_runloop
{ {
bool inited; bool inited;
@ -42,7 +35,6 @@ typedef struct data_runloop
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
bool thread_sleeping; bool thread_sleeping;
bool thread_inited; bool thread_inited;
unsigned thread_code;
bool alive; bool alive;
slock_t *lock; slock_t *lock;
@ -82,7 +74,6 @@ void rarch_main_data_deinit(void)
data_runloop_thread_deinit(); data_runloop_thread_deinit();
g_data_runloop.thread_inited = false; g_data_runloop.thread_inited = false;
g_data_runloop.thread_code = THREAD_CODE_DEINIT;
} }
#endif #endif
@ -200,7 +191,6 @@ static void rarch_main_data_thread_init(void)
slock_lock(g_data_runloop.lock); slock_lock(g_data_runloop.lock);
g_data_runloop.thread_inited = true; g_data_runloop.thread_inited = true;
g_data_runloop.alive = true; g_data_runloop.alive = true;
g_data_runloop.thread_code = THREAD_CODE_ALIVE;
slock_unlock(g_data_runloop.lock); slock_unlock(g_data_runloop.lock);
return; return;
@ -227,6 +217,20 @@ void rarch_main_data_iterate(void)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
(void)settings; (void)settings;
#ifdef HAVE_THREADS
if (settings->threaded_data_runloop_enable)
{
if (!g_data_runloop.thread_inited)
rarch_main_data_thread_init();
else if (g_data_runloop.thread_sleeping)
{
slock_lock(g_data_runloop.cond_lock);
g_data_runloop.thread_sleeping = false;
scond_signal(g_data_runloop.cond);
slock_unlock(g_data_runloop.cond_lock);
}
}
#endif
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
#ifdef HAVE_MENU #ifdef HAVE_MENU
@ -341,20 +345,6 @@ void rarch_main_data_msg_queue_push(unsigned type,
msg_queue_clear(queue); msg_queue_clear(queue);
msg_queue_push(queue, new_msg, prio, duration); msg_queue_push(queue, new_msg, prio, duration);
#ifdef HAVE_THREADS
if (settings->threaded_data_runloop_enable)
{
if (!g_data_runloop.thread_inited)
rarch_main_data_thread_init();
else if (g_data_runloop.thread_sleeping)
{
slock_lock(g_data_runloop.cond_lock);
g_data_runloop.thread_sleeping = false;
scond_signal(g_data_runloop.cond);
slock_unlock(g_data_runloop.cond_lock);
}
}
#endif
} }
void data_runloop_osd_msg(const char *msg, size_t len) void data_runloop_osd_msg(const char *msg, size_t len)