len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partly revert "Android: use NewGlobalRef for references that are used globally"

Browse source 
The added complexity wasn't needed for most subsystems, as main() never returns
so local references can't be freed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29570 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2011-03-11 19:23:00 +00:00
parent 66f2a08f8a
commit c2ee32b22a
6 changed files with 23 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/hosted/android/keyboard.c
View file

@ -61,17 +61,14 @@ static void kdb_init(void)
{ {
semaphore_init(&kbd_wakeup, 1, 0); semaphore_init(&kbd_wakeup, 1, 0);
/* get the class and its constructor */ /* get the class and its constructor */
jclass kbInput_class = e->FindClass(env_ptr, RockboxKeyboardInput_class = e->FindClass(env_ptr,
"org/rockbox/RockboxKeyboardInput"); "org/rockbox/RockboxKeyboardInput");
RockboxKeyboardInput_class = e->NewGlobalRef(env_ptr, kbInput_class);
jmethodID constructor = e->GetMethodID(env_ptr, jmethodID constructor = e->GetMethodID(env_ptr,
RockboxKeyboardInput_class, RockboxKeyboardInput_class,
"<init>", "()V"); "<init>", "()V");
jobject kbInput_instance = e->NewObject(env_ptr, RockboxKeyboardInput_instance = e->NewObject(env_ptr,
RockboxKeyboardInput_class, RockboxKeyboardInput_class,
constructor); constructor);
RockboxKeyboardInput_instance = e->NewGlobalRef(env_ptr,
kbInput_instance);
kbd_inputfunc = e->GetMethodID(env_ptr, RockboxKeyboardInput_class, kbd_inputfunc = e->GetMethodID(env_ptr, RockboxKeyboardInput_class,
"kbd_input", "kbd_input",
"(Ljava/lang/String;" "(Ljava/lang/String;"

7
apps/hosted/android/notification.c
View file

@ -128,14 +128,13 @@ void notification_init(void)
JNIEnv e = *env_ptr; JNIEnv e = *env_ptr;
jfieldID nNM = e->GetFieldID(env_ptr, RockboxService_class, jfieldID nNM = e->GetFieldID(env_ptr, RockboxService_class,
"fg_runner", "Lorg/rockbox/Helper/RunForegroundManager;"); "fg_runner", "Lorg/rockbox/Helper/RunForegroundManager;");
jobject nMN_instance = e->GetObjectField(env_ptr, NotificationManager_instance = e->GetObjectField(env_ptr,
RockboxService_instance, nNM); RockboxService_instance, nNM);
if (nMN_instance == NULL) if (NotificationManager_instance == NULL)
{ {
DEBUGF("Failed to get RunForegroundManager instance. Performance will be bad"); DEBUGF("Failed to get RunForegroundManager instance. Performance will be bad");
return; return;
} }
NotificationManager_instance = e->NewGlobalRef(env_ptr, nMN_instance);
jclass class = e->GetObjectClass(env_ptr, NotificationManager_instance); jclass class = e->GetObjectClass(env_ptr, NotificationManager_instance);
updateNotification = e->GetMethodID(env_ptr, class, "updateNotification", updateNotification = e->GetMethodID(env_ptr, class, "updateNotification",

17
apps/hosted/android/yesno.c
View file

@ -52,21 +52,20 @@ static void yesno_init(JNIEnv *env_ptr)
{ {
semaphore_init(&yesno_done, 1, 0); semaphore_init(&yesno_done, 1, 0);
/* get the class and its constructor */ /* get the class and its constructor */
jclass yesno_class = e->FindClass(env_ptr, jclass RockboxYesno_class = e->FindClass(env_ptr,
"org/rockbox/RockboxYesno"); "org/rockbox/RockboxYesno");
jmethodID constructor = e->GetMethodID(env_ptr, jmethodID constructor = e->GetMethodID(env_ptr,
yesno_class, RockboxYesno_class,
"<init>", "()V"); "<init>", "()V");
jobject yesno_instance = e->NewObject(env_ptr, RockboxYesno_instance = e->NewObject(env_ptr,
yesno_class, RockboxYesno_class,
constructor); constructor);
RockboxYesno_instance = e->NewGlobalRef(env_ptr, yesno_instance); yesno_func = e->GetMethodID(env_ptr, RockboxYesno_class,
yesno_func = e->GetMethodID(env_ptr, yesno_class,
"yesno_display", "yesno_display",
"(Ljava/lang/String;" "(Ljava/lang/String;"
"Ljava/lang/String;" "Ljava/lang/String;"
"Ljava/lang/String;)V"); "Ljava/lang/String;)V");
yesno_is_usable = e->GetMethodID(env_ptr, yesno_class, yesno_is_usable = e->GetMethodID(env_ptr, RockboxYesno_class,
"is_usable", "()Z"); "is_usable", "()Z");
} }
/* need to get it every time incase the activity died/restarted */ /* need to get it every time incase the activity died/restarted */

11
firmware/target/hosted/android/lcd-android.c
View file

@ -46,7 +46,6 @@ static bool display_on;
void connect_with_java(JNIEnv* env, jobject fb_instance) void connect_with_java(JNIEnv* env, jobject fb_instance)
{ {
JNIEnv e = *env; JNIEnv e = *env;
/* Update RockboxFramebuffer_instance */ /* Update RockboxFramebuffer_instance */
if (!e->IsSameObject(env, RockboxFramebuffer_instance, fb_instance)) { if (!e->IsSameObject(env, RockboxFramebuffer_instance, fb_instance)) {
if (RockboxFramebuffer_instance != NULL) if (RockboxFramebuffer_instance != NULL)
@ -55,7 +54,7 @@ void connect_with_java(JNIEnv* env, jobject fb_instance)
RockboxFramebuffer_instance = e->NewGlobalRef(env, fb_instance); RockboxFramebuffer_instance = e->NewGlobalRef(env, fb_instance);
} }
static bool have_class = false; static bool have_class;
if (!have_class) if (!have_class)
{ {
jclass fb_class = e->GetObjectClass(env, fb_instance); jclass fb_class = e->GetObjectClass(env, fb_instance);
@ -77,13 +76,10 @@ void connect_with_java(JNIEnv* env, jobject fb_instance)
java_lcd_init = e->GetMethodID(env, fb_class, java_lcd_init = e->GetMethodID(env, fb_class,
"java_lcd_init", "java_lcd_init",
"(IILjava/nio/ByteBuffer;)V"); "(IILjava/nio/ByteBuffer;)V");
jobject buffer = e->NewDirectByteBuffer(env, native_buffer = e->NewDirectByteBuffer(env,
lcd_framebuffer, lcd_framebuffer,
(jlong)sizeof(lcd_framebuffer)); (jlong)sizeof(lcd_framebuffer));
native_buffer = e->NewGlobalRef(env, buffer);
have_class = true; have_class = true;
} }
/* we need to setup parts for the java object every time */ /* we need to setup parts for the java object every time */
@ -96,7 +92,6 @@ void lcd_deinit(void)
JNIEnv *env_ptr = getJavaEnvironment(); JNIEnv *env_ptr = getJavaEnvironment();
(*env_ptr)->DeleteGlobalRef(env_ptr, RockboxFramebuffer_instance); (*env_ptr)->DeleteGlobalRef(env_ptr, RockboxFramebuffer_instance);
(*env_ptr)->DeleteGlobalRef(env_ptr, native_buffer);
} }
/* /*

13
firmware/target/hosted/android/pcm-android.c
View file

@ -33,6 +33,7 @@ static char *pcm_data_start;
static jmethodID play_pause_method; static jmethodID play_pause_method;
static jmethodID stop_method; static jmethodID stop_method;
static jmethodID set_volume_method; static jmethodID set_volume_method;
static jclass RockboxPCM_class;
static jobject RockboxPCM_instance; static jobject RockboxPCM_instance;
@ -157,11 +158,10 @@ void pcm_play_dma_init(void)
JNIEnv *env_ptr = getJavaEnvironment(); JNIEnv *env_ptr = getJavaEnvironment();
JNIEnv e = *env_ptr; JNIEnv e = *env_ptr;
/* get the class and its constructor */ /* get the class and its constructor */
jclass RockboxPCM_class = e->FindClass(env_ptr, "org/rockbox/RockboxPCM"); RockboxPCM_class = e->FindClass(env_ptr, "org/rockbox/RockboxPCM");
jmethodID constructor = e->GetMethodID(env_ptr, RockboxPCM_class, "<init>", "()V"); jmethodID constructor = e->GetMethodID(env_ptr, RockboxPCM_class, "<init>", "()V");
/* instance = new RockboxPCM() */ /* instance = new RockboxPCM() */
jobject PCM_instance = e->NewObject(env_ptr, RockboxPCM_class, constructor); RockboxPCM_instance = e->NewObject(env_ptr, RockboxPCM_class, constructor);
RockboxPCM_instance = e->NewGlobalRef(env_ptr, PCM_instance);
/* cache needed methods */ /* cache needed methods */
play_pause_method = e->GetMethodID(env_ptr, RockboxPCM_class, "play_pause", "(Z)V"); play_pause_method = e->GetMethodID(env_ptr, RockboxPCM_class, "play_pause", "(Z)V");
set_volume_method = e->GetMethodID(env_ptr, RockboxPCM_class, "set_volume", "(I)V"); set_volume_method = e->GetMethodID(env_ptr, RockboxPCM_class, "set_volume", "(I)V");
@ -170,13 +170,6 @@ void pcm_play_dma_init(void)
pcm_play_get_more_callback((void*)&pcm_data_start, &pcm_data_size); pcm_play_get_more_callback((void*)&pcm_data_start, &pcm_data_size);
} }
void pcm_deinit(void)
{
JNIEnv *env_ptr = getJavaEnvironment();
(*env_ptr)->DeleteGlobalRef(env_ptr, RockboxPCM_instance);
}
void pcm_postinit(void) void pcm_postinit(void)
{ {
} }

12
firmware/target/hosted/android/system-android.c
View file

@ -37,19 +37,13 @@ uintptr_t *stackend;
extern int main(void); extern int main(void);
extern void telephony_init_device(void); extern void telephony_init_device(void);
extern void lcd_deinit(void); extern void lcd_deinit(void);
extern void pcm_deinit(void);
void system_exception_wait(void) { } void system_exception_wait(void) { }
void system_reboot(void) { } void system_reboot(void) { }
void power_off(void) void power_off(void)
{ {
JNIEnv *env_ptr = getJavaEnvironment();
lcd_deinit(); lcd_deinit();
pcm_deinit();
(*env_ptr)->DeleteGlobalRef(env_ptr, RockboxService_class);
} }
void system_init(void) void system_init(void)
@ -62,8 +56,6 @@ void system_init(void)
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this) Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
{ {
jclass class = (*env)->GetObjectClass(env, this);
/* hack!!! we can't have a valid stack pointer otherwise. /* hack!!! we can't have a valid stack pointer otherwise.
* but we don't really need it anyway, thread.c only needs it * but we don't really need it anyway, thread.c only needs it
* for overflow detection which doesn't apply for the main thread * for overflow detection which doesn't apply for the main thread
@ -73,8 +65,8 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
stackbegin = stackend = (uintptr_t*) &stack; stackbegin = stackend = (uintptr_t*) &stack;
(*env)->GetJavaVM(env, &vm_ptr); (*env)->GetJavaVM(env, &vm_ptr);
RockboxService_instance = (*env)->NewGlobalRef(env, this); RockboxService_instance = this;
RockboxService_class = (*env)->NewGlobalRef(env, class); RockboxService_class = (*env)->GetObjectClass(env, this);
main(); main();
} }