Changeset 4698 for pjproject

Timestamp:

Dec 19, 2013 3:39:30 AM (11 years ago)

Author:

nanang

Message:

Re #1716: Maintain reference to log writer to avoid crash (caused by premature cleanup by GC).

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android

Files:

• jni/Android.mk (modified) (1 diff)
• src/org/pjsip/pjsua2/app/MainActivity.java (modified) (1 diff)
• src/org/pjsip/pjsua2/app/MyApp.java (modified) (5 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/jni/Android.mk

@@ -8 +8 @@
 LOCAL_LDFLAGS   := $(APP_LDFLAGS)
 LOCAL_LDLIBS    := $(APP_LDLIBS)
-LOCAL_SRC_FILES := $(PJDIR)/pjsip-apps/src/swig/java/output/pjsua2_wrap.cpp
+LOCAL_SRC_FILES := ../output/pjsua2_wrap.cpp
 
 include $(BUILD_SHARED_LIBRARY)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java

@@ -160 +160 @@
                         app.deinit();
                         finish();
-                        System.gc();
+                        Runtime.getRuntime().gc();
                         android.os.Process.killProcess(android.os.Process.myPid());
                         

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java

@@ -233 +233 @@
         private TransportConfig sipTpConfig = new TransportConfig();
         private String appDir;
+        
+        /* Maintain reference to log writer to avoid premature cleanup by GC */
+        private MyLogWriter logWriter;
 
         private final String configName = "pjsua2.json";
@@ -270 +273 @@
                 /* Set log config. */
                 LogConfig log_cfg = epConfig.getLogConfig();
-                log_cfg.setWriter(new MyLogWriter());
+                logWriter = new MyLogWriter();
+                log_cfg.setWriter(logWriter);
                 log_cfg.setDecor(log_cfg.getDecor() & 
                                                  ~(pj_log_decoration.PJ_LOG_HAS_CR.swigValue() | 
@@ -369 +373 @@
                 }
                 
-                /* Suggest to delete, as we found this causes crash when the Java
-                 * deletes it later after lib has been destroyed.
+                /* Force delete json now, as I found that Java somehow destroys it
+                 * after lib has been destroyed and from non-registered thread.
                  */
                 json.delete();
@@ -415 +419 @@
                 } catch (Exception e) {}
 
-                /* Suggest to delete, as we found this causes crash when the Java
-                 * deletes it later after lib has been destroyed.
+                /* Force delete json now, as I found that Java somehow destroys it
+                 * after lib has been destroyed and from non-registered thread.
                  */
                 json.delete();
@@ -428 +432 @@
                  * deleted before lib is destroyed.
                  */
-                System.gc();
-                
+                Runtime.getRuntime().gc();
+                
+                /* Shutdown pjsua. Note that Endpoint destructor will also invoke
+                 * libDestroy(), so this will be a test of double libDestroy().
+                 */
                 try {
                         ep.libDestroy();
                 } catch (Exception e) {}
+                
+                /* Force delete Endpoint here, to avoid deletion from a non-
+                 * registered thread (by GC?). 
+                 */
+                ep.delete();
                 ep = null;
         }