mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-03 08:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

(runloop.c) Add some locks around message queue calls

Browse Source
This commit is contained in:
Higor Eurípedes 2015-05-20 13:37:48 -03:00
parent 80310d8df3
commit 9bbff40a46
1 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
runloop.c
View File

@ -38,6 +38,10 @@
static struct runloop *g_runloop = NULL; static struct runloop *g_runloop = NULL;
static struct global *g_extern = NULL; static struct global *g_extern = NULL;
#ifdef HAVE_THREADS
static slock_t *mq_lock = NULL;
#endif
/** /**
* check_pause: * check_pause:
* @pressed : was libretro pause key pressed? * @pressed : was libretro pause key pressed?
@ -864,10 +868,22 @@ static void rarch_main_iterate_linefeed_overlay(void)
const char *rarch_main_msg_queue_pull(void) const char *rarch_main_msg_queue_pull(void)
{ {
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
const char *ret = NULL;
if (!runloop) if (!runloop)
return NULL; return NULL;
return msg_queue_pull(runloop->msg_queue);
#ifdef HAVE_THREADS
slock_lock(mq_lock);
#endif
ret = msg_queue_pull(runloop->msg_queue);
#ifdef HAVE_THREADS
slock_unlock(mq_lock);
#endif
return ret;
} }
void rarch_main_msg_queue_push(const char *msg, unsigned prio, unsigned duration, void rarch_main_msg_queue_push(const char *msg, unsigned prio, unsigned duration,
@ -877,9 +893,17 @@ void rarch_main_msg_queue_push(const char *msg, unsigned prio, unsigned duration
if (!runloop->msg_queue) if (!runloop->msg_queue)
return; return;
#ifdef HAVE_THREADS
slock_lock(mq_lock);
#endif
if (flush) if (flush)
msg_queue_clear(runloop->msg_queue); msg_queue_clear(runloop->msg_queue);
msg_queue_push(runloop->msg_queue, msg, prio, duration); msg_queue_push(runloop->msg_queue, msg, prio, duration);
#ifdef HAVE_THREADS
slock_unlock(mq_lock);
#endif
} }
void rarch_main_msg_queue_free(void) void rarch_main_msg_queue_free(void)
@ -889,7 +913,19 @@ void rarch_main_msg_queue_free(void)
return; return;
if (runloop->msg_queue) if (runloop->msg_queue)
{
#ifdef HAVE_THREADS
slock_lock(mq_lock);
#endif
msg_queue_free(runloop->msg_queue); msg_queue_free(runloop->msg_queue);
#ifdef HAVE_THREADS
slock_unlock(mq_lock);
slock_free(mq_lock);
#endif
}
runloop->msg_queue = NULL; runloop->msg_queue = NULL;
} }
@ -900,7 +936,15 @@ void rarch_main_msg_queue_init(void)
return; return;
if (!runloop->msg_queue) if (!runloop->msg_queue)
rarch_assert(runloop->msg_queue = msg_queue_new(8)); {
runloop->msg_queue = msg_queue_new(8);
rarch_assert(runloop->msg_queue);
#ifdef HAVE_THREADS
mq_lock = slock_new();
rarch_assert(mq_lock);
#endif
}
} }
global_t *global_get_ptr(void) global_t *global_get_ptr(void)