mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce two enums

Browse Source
This commit is contained in:
twinaphex 2016-05-08 06:09:39 +02:00
parent e165954395
commit 0f7cdeaf78
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
runloop.c
View File

@ -120,7 +120,7 @@ static bool runloop_overrides_active = false;
static bool runloop_game_options_active = false; static bool runloop_game_options_active = false;
static core_option_manager_t *runloop_core_options = NULL; static core_option_manager_t *runloop_core_options = NULL;
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
static slock_t *runloop_msg_queue_lock = NULL; static slock_t *_runloop_msg_queue_lock = NULL;
#endif #endif
static msg_queue_t *runloop_msg_queue = NULL; static msg_queue_t *runloop_msg_queue = NULL;
@ -130,6 +130,20 @@ global_t *global_get_ptr(void)
return &g_extern; return &g_extern;
} }
static void runloop_msg_queue_lock(void)
{
#ifdef HAVE_THREADS
slock_lock(_runloop_msg_queue_lock);
#endif
}
static void runloop_msg_queue_unlock(void)
{
#ifdef HAVE_THREADS
slock_unlock(_runloop_msg_queue_lock);
#endif
}
void runloop_msg_queue_push(const char *msg, void runloop_msg_queue_push(const char *msg,
unsigned prio, unsigned duration, unsigned prio, unsigned duration,
bool flush) bool flush)
@ -139,7 +153,7 @@ void runloop_msg_queue_push(const char *msg,
if(!settings->video.font_enable) if(!settings->video.font_enable)
return; return;
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_LOCK, NULL); runloop_msg_queue_lock();
if (flush) if (flush)
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_CLEAR, NULL); runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_CLEAR, NULL);
@ -151,8 +165,7 @@ void runloop_msg_queue_push(const char *msg,
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_PUSH, &msg_info); runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_PUSH, &msg_info);
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_UNLOCK, NULL); runloop_msg_queue_unlock();
} }
char* runloop_msg_queue_pull(void) char* runloop_msg_queue_pull(void)
@ -988,19 +1001,19 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
} }
break; break;
case RUNLOOP_CTL_MSG_QUEUE_PULL: case RUNLOOP_CTL_MSG_QUEUE_PULL:
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_LOCK, NULL); runloop_msg_queue_lock();
{ {
const char **ret = (const char**)data; const char **ret = (const char**)data;
if (!ret) if (!ret)
return false; return false;
*ret = msg_queue_pull(runloop_msg_queue); *ret = msg_queue_pull(runloop_msg_queue);
} }
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_UNLOCK, NULL); runloop_msg_queue_unlock();
break; break;
case RUNLOOP_CTL_MSG_QUEUE_FREE: case RUNLOOP_CTL_MSG_QUEUE_FREE:
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
slock_free(runloop_msg_queue_lock); slock_free(_runloop_msg_queue_lock);
runloop_msg_queue_lock = NULL; _runloop_msg_queue_lock = NULL;
#endif #endif
break; break;
case RUNLOOP_CTL_MSG_QUEUE_CLEAR: case RUNLOOP_CTL_MSG_QUEUE_CLEAR:
@ -1010,11 +1023,11 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
if (!runloop_msg_queue) if (!runloop_msg_queue)
return true; return true;
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_LOCK, NULL); runloop_msg_queue_lock();
msg_queue_free(runloop_msg_queue); msg_queue_free(runloop_msg_queue);
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_UNLOCK, NULL); runloop_msg_queue_unlock();
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_FREE, NULL); runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_FREE, NULL);
runloop_msg_queue = NULL; runloop_msg_queue = NULL;
@ -1025,18 +1038,8 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
retro_assert(runloop_msg_queue); retro_assert(runloop_msg_queue);
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
runloop_msg_queue_lock = slock_new(); _runloop_msg_queue_lock = slock_new();
retro_assert(runloop_msg_queue_lock); retro_assert(_runloop_msg_queue_lock);
#endif
break;
case RUNLOOP_CTL_MSG_QUEUE_LOCK:
#ifdef HAVE_THREADS
slock_lock(runloop_msg_queue_lock);
#endif
break;
case RUNLOOP_CTL_MSG_QUEUE_UNLOCK:
#ifdef HAVE_THREADS
slock_unlock(runloop_msg_queue_lock);
#endif #endif
break; break;
case RUNLOOP_CTL_TASK_INIT: case RUNLOOP_CTL_TASK_INIT:

4
runloop.h
View File

@ -107,10 +107,6 @@ enum runloop_ctl_state
/* Deinitializes message queue. */ /* Deinitializes message queue. */
RUNLOOP_CTL_MSG_QUEUE_DEINIT, RUNLOOP_CTL_MSG_QUEUE_DEINIT,
/* Initializes dummy core. */
RUNLOOP_CTL_MSG_QUEUE_LOCK,
RUNLOOP_CTL_MSG_QUEUE_UNLOCK,
RUNLOOP_CTL_MSG_QUEUE_FREE, RUNLOOP_CTL_MSG_QUEUE_FREE,
RUNLOOP_CTL_MSG_QUEUE_PULL, RUNLOOP_CTL_MSG_QUEUE_PULL,
RUNLOOP_CTL_MSG_QUEUE_PUSH, RUNLOOP_CTL_MSG_QUEUE_PUSH,