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

g_data_runloop is now no longer a pointer

Browse Source
This commit is contained in:
twinaphex 2015-07-27 14:52:21 +02:00
parent c8c35ed8d3
commit a31192c55a
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
runloop_data.c
View File

@ -55,11 +55,11 @@ typedef struct data_runloop
static char data_runloop_msg[PATH_MAX_LENGTH]; static char data_runloop_msg[PATH_MAX_LENGTH];
static data_runloop_t *g_data_runloop; static data_runloop_t g_data_runloop;
static data_runloop_t *rarch_main_data_get_ptr(void) static data_runloop_t *rarch_main_data_get_ptr(void)
{ {
return g_data_runloop; return &g_data_runloop;
} }
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
@ -101,18 +101,6 @@ void rarch_main_data_deinit(void)
runloop->inited = false; runloop->inited = false;
} }
static void rarch_main_data_free_internal(void)
{
data_runloop_t *runloop = rarch_main_data_get_ptr();
if (!runloop)
return;
if (runloop)
free(runloop);
runloop = NULL;
}
void rarch_main_data_free(void) void rarch_main_data_free(void)
{ {
rarch_main_data_nbio_uninit(); rarch_main_data_nbio_uninit();
@ -123,7 +111,7 @@ void rarch_main_data_free(void)
rarch_main_data_db_uninit(); rarch_main_data_db_uninit();
#endif #endif
rarch_main_data_free_internal(); memset(&g_data_runloop, 0, sizeof(g_data_runloop));
} }
static void data_runloop_iterate(bool is_thread) static void data_runloop_iterate(bool is_thread)
@ -291,33 +279,21 @@ void rarch_main_data_iterate(void)
data_runloop_iterate(false); data_runloop_iterate(false);
} }
static data_runloop_t *rarch_main_data_new(void) static void rarch_main_data_init(void)
{ {
data_runloop_t *runloop = (data_runloop_t*)
calloc(1, sizeof(data_runloop_t));
if (!runloop)
return NULL;
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
runloop->thread_inited = false; g_data_runloop.thread_inited = false;
runloop->alive = false; g_data_runloop.alive = false;
#endif #endif
runloop->inited = true; g_data_runloop.inited = true;
return runloop;
} }
void rarch_main_data_clear_state(void) void rarch_main_data_clear_state(void)
{ {
rarch_main_data_deinit(); rarch_main_data_deinit();
rarch_main_data_free(); rarch_main_data_free();
g_data_runloop = rarch_main_data_new(); rarch_main_data_init();
if (!g_data_runloop)
return;
rarch_main_data_nbio_init(); rarch_main_data_nbio_init();
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING

2
runloop_data.h
View File

@ -48,8 +48,6 @@ void rarch_main_data_free(void);
void rarch_main_data_init_queues(void); void rarch_main_data_init_queues(void);
void rarch_main_data_init(void);
bool rarch_main_data_active(void); bool rarch_main_data_active(void);
#ifdef __cplusplus #ifdef __cplusplus