1
0
Fork 0
forked from len0rd/rockbox

android: Add facility for java code to wait native code to be ready.

Especially when unzipping rockbox.zip, the native code can be initialized
a lot later than the java code. The java code needs to be prevented from
accessing rockbox structures (e.g. current_tick, event queues) before they're
ready.

This commit adds wait_rockbox_ready() and fixes dodgy behavior of starting
rockbox via widget play button, headset remote buttons or multimedia keys.
Also fixes wrong small list items before first redraw.

Change-Id: I1caf925e829a9c1c6bb6e0016d5c80574574c91e
This commit is contained in:
Thomas Martitz 2012-03-22 20:35:57 +01:00
parent b0df323391
commit 58e097d4a6
5 changed files with 62 additions and 2 deletions

View file

@ -22,6 +22,7 @@
#include <setjmp.h>
#include <jni.h>
#include <pthread.h>
#include "config.h"
#include "system.h"
@ -95,3 +96,40 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
/* simply return here. this will allow the VM to clean up objects and do
* garbage collection */
}
/* below is the facility for external (from other java threads) to safely call
* into our snative code. When extracting rockbox.zip the main function is
* called only after extraction. This delay can be accounted for by calling
* wait_rockbox_ready(). This does not return until the critical parts of Rockbox
* can be considered up and running. */
static pthread_cond_t btn_cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t btn_mtx = PTHREAD_MUTEX_INITIALIZER;
static bool initialized;
bool is_rockbox_ready(void)
{
/* don't bother with mutexes for this */
return initialized;
}
void wait_rockbox_ready(void)
{
pthread_mutex_lock(&btn_mtx);
if (!initialized)
pthread_cond_wait(&btn_cond, &btn_mtx);
pthread_mutex_unlock(&btn_mtx);
}
void set_rockbox_ready(void)
{
pthread_mutex_lock(&btn_mtx);
initialized = true;
/* now ready. signal all waiters */
pthread_cond_broadcast(&btn_cond);
pthread_mutex_unlock(&btn_mtx);
}