Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-12-23 11:31:41 +00:00
Code Issues Projects Releases Wiki Activity

better pthread signaling between ui and cpu threads

Browse Source
This commit is contained in:
Aaron Culliney 2014-03-30 11:17:12 -07:00
parent 209eb86051
commit baf9315d01
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/keys.c
View File

@ -27,7 +27,8 @@ extern unsigned char joy_button1;
/* mutex used to synchronize between cpu and main threads */ /* mutex used to synchronize between cpu and main threads */
pthread_mutex_t interface_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t interface_mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t interface_cond = PTHREAD_COND_INITIALIZER; pthread_cond_t ui_thread_cond = PTHREAD_COND_INITIALIZER;
pthread_cond_t cpu_thread_cond = PTHREAD_COND_INITIALIZER;
#ifdef LINUX_JOYSTICK #ifdef LINUX_JOYSTICK
#include <linux/joystick.h> #include <linux/joystick.h>

4
src/keys.h
View File

@ -137,7 +137,8 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
extern pthread_mutex_t interface_mutex; extern pthread_mutex_t interface_mutex;
extern pthread_cond_t interface_cond; extern pthread_cond_t cpu_thread_cond;
extern pthread_cond_t ui_thread_cond;
extern bool caps_lock; extern bool caps_lock;
#ifdef LINUX_JOYSTICK #ifdef LINUX_JOYSTICK
@ -147,7 +148,6 @@ extern int js_offset_x, js_offset_y;
extern float js_adjustlow_x, js_adjustlow_y, js_adjusthigh_x, js_adjusthigh_y; extern float js_adjustlow_x, js_adjustlow_y, js_adjusthigh_x, js_adjusthigh_y;
#endif #endif
void enter_debugger(void);
int c_mygetch(int block); int c_mygetch(int block);
int c_rawkey(); int c_rawkey();
void c_keys_set_key(int key); void c_keys_set_key(int key);

8
src/meta/debugger.c
View File

@ -1082,10 +1082,10 @@ static void begin_cpu_step()
int err = 0; int err = 0;
do { do {
if ((err = pthread_cond_signal(&interface_cond))) { if ((err = pthread_cond_signal(&cpu_thread_cond))) {
ERRLOG("pthread_cond_signal : %d", err); ERRLOG("pthread_cond_signal : %d", err);
} }
if ((err = pthread_cond_wait(&interface_cond, &interface_mutex))) { if ((err = pthread_cond_wait(&ui_thread_cond, &interface_mutex))) {
ERRLOG("pthread_cond_wait : %d", err); ERRLOG("pthread_cond_wait : %d", err);
} }
@ -1094,7 +1094,7 @@ static void begin_cpu_step()
} }
} while (!stepping_struct.should_break); } while (!stepping_struct.should_break);
if ((err = pthread_cond_signal(&interface_cond))) { if ((err = pthread_cond_signal(&cpu_thread_cond))) {
ERRLOG("pthread_cond_signal : %d", err); ERRLOG("pthread_cond_signal : %d", err);
} }
@ -1384,7 +1384,7 @@ void c_interface_debugging() {
c_interface_exit(-1); c_interface_exit(-1);
is_debugging = false; is_debugging = false;
if ((err = pthread_cond_signal(&interface_cond))) if ((err = pthread_cond_signal(&cpu_thread_cond)))
{ {
ERRLOG("pthread_cond_signal : %d", err); ERRLOG("pthread_cond_signal : %d", err);
} }

6
src/timing.c
View File

@ -32,7 +32,7 @@ double cpu_altscale_factor = 1.0;
int gc_cycles_timer_0 = 0; int gc_cycles_timer_0 = 0;
int gc_cycles_timer_1 = 0; int gc_cycles_timer_1 = 0;
uint8_t emul_reinitialize; uint8_t emul_reinitialize = 0;
pthread_t cpu_thread_id = 0; pthread_t cpu_thread_id = 0;
static unsigned int g_nCyclesExecuted; // # of cycles executed up to last IO access static unsigned int g_nCyclesExecuted; // # of cycles executed up to last IO access
@ -230,10 +230,10 @@ void cpu_thread(void *dummyptr) {
debugging_cycles -= cpu65_cycle_count; debugging_cycles -= cpu65_cycle_count;
if (c_debugger_should_break() || (debugging_cycles <= 0)) { if (c_debugger_should_break() || (debugging_cycles <= 0)) {
int err = 0; int err = 0;
if ((err = pthread_cond_signal(&interface_cond))) { if ((err = pthread_cond_signal(&ui_thread_cond))) {
ERRLOG("pthread_cond_signal : %d", err); ERRLOG("pthread_cond_signal : %d", err);
} }
if ((err = pthread_cond_wait(&interface_cond, &interface_mutex))) { if ((err = pthread_cond_wait(&cpu_thread_cond, &interface_mutex))) {
ERRLOG("pthread_cond_wait : %d", err); ERRLOG("pthread_cond_wait : %d", err);
} }
if (debugging_cycles <= 0) { if (debugging_cycles <= 0) {