Mercurial > hg > release > icedtea6-1.8

changeset 1151:93f0928ec0ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Supply classpath to vm when initializing - Do not exit java on error - Don't wait forever (c++ side) for java to respond
author Deepak Bhole <dbhole@redhat.com>
date Thu, 23 Oct 2008 12:27:23 -0400
parents 19ff33216eaf
children 1e020b5801bb
files ChangeLog IcedTeaPlugin.cc plugin/icedtea/sun/applet/PluginAppletViewer.java rt/net/sourceforge/jnlp/Launcher.java rt/net/sourceforge/jnlp/NetxPanel.java
diffstat 5 files changed, 93 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 23 12:17:26 2008 -0400
+++ b/ChangeLog	Thu Oct 23 12:27:23 2008 -0400
@@ -1,3 +1,12 @@
+2008-10-23  Deepak Bhole  <dbhole@redhat.com>
+
+	* IcedTeaPlugin.cc: Supply classpath to rt.jar when starting java.
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java: Tell Netx to exit VM
+	on error.
+	* rt/net/sourceforge/jnlp/Launcher.java: Implement an option for not
+	exiting VM on error.
+	* rt/net/sourceforge/jnlp/NetxPanel.java: Same.
+
 2008-10-23  Lillian Angel  <langel@redhat.com>
 
 	PR redhat/468193:
--- a/IcedTeaPlugin.cc	Thu Oct 23 12:17:26 2008 -0400
+++ b/IcedTeaPlugin.cc	Thu Oct 23 12:27:23 2008 -0400
@@ -84,6 +84,9 @@
 // #13 0x0153f91c in ProxyJNIEnv::InvokeMethod (env=0xa8b8040, obj=0x9dad690, method=0xa0ed070, args=0xbff3065c "\235\225$") at ProxyJNI.cpp:580
 // #14 0x0153fdbf in ProxyJNIEnv::CallObjectMethod (env=0xa8b8040, obj=0x9dad690, methodID=0xa0ed070) at ProxyJNI.cpp:641
 
+// timeout (in seconds) for various calls to java side
+#define TIMEOUT 20
+
 #define NOT_IMPLEMENTED() \
   printf ("NOT IMPLEMENTED: %s\n", __PRETTY_FUNCTION__)
 
@@ -312,6 +315,7 @@
 // Fully-qualified appletviewer executable.
 gchar* data_directory = NULL;
 static char* appletviewer_executable = NULL;
+static char* appletviewer_classpath = NULL;
 static char* libjvm_so = NULL;
 
 class IcedTeaPluginFactory;
@@ -2383,14 +2387,28 @@
     {
 
        if (initialized == PR_FALSE) 
-	     {
-
-            PLUGIN_DEBUG_1ARG ("IcedTeaPluginInstance::SetWindow: Instance %p waiting for initialization...\n", this);
-
-           while (initialized == PR_FALSE && this->fatalErrorOccurred == PR_FALSE) {
-              PROCESS_PENDING_EVENTS;
+       {
+
+           PLUGIN_DEBUG_1ARG ("IcedTeaPluginInstance::SetWindow: Instance %p waiting for initialization...\n", this);
+
+           suseconds_t startTime = get_time_in_ms();
+           PRBool timedOut = PR_FALSE;
+
+           while (initialized == PR_FALSE && this->fatalErrorOccurred == PR_FALSE) 
+           {
+               PROCESS_PENDING_EVENTS;
+
+               if ((get_time_in_ms() - startTime) > TIMEOUT*1000)
+               {
+                   timedOut = PR_TRUE;
+                   break;
+                }
             }
 
+            // we timed out
+            if (timedOut == PR_TRUE)
+              return NS_ERROR_FAILURE;
+
             // did we bail because there is no jvm?
             if (this->fatalErrorOccurred == PR_TRUE)
 			{
@@ -2572,8 +2590,13 @@
   nsresult result = NS_OK;
 
   // wait for result
+  suseconds_t startTime = get_time_in_ms();
   while (object_identifier_return == 0) {
 	  current->ProcessNextEvent(PR_TRUE, &processed);
+
+	  // If we have been waiting for more than 20 seconds, something is wrong
+	  if ((get_time_in_ms() - startTime) > TIMEOUT*1000)
+		  break;
   }
 
   PLUGIN_DEBUG_1ARG ("GOT JAVA OBJECT IDENTIFIER: %d\n", object_identifier_return);
@@ -3551,16 +3574,18 @@
   
   if (getenv("ICEDTEAPLUGIN_DEBUG"))
   {
-	  numArgs = 4;
-      char const* javaArgs[4] = { "-Xdebug", "-Xnoagent", "-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n", "sun.applet.PluginMain" };
+	  numArgs = 6;
+      char const* javaArgs[6] = { "-cp", appletviewer_classpath, "-Xdebug", "-Xnoagent", "-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n", "sun.applet.PluginMain" };
 	  args = javaArgs;
   } else
   {
-	  numArgs = 1;
-	  char const* javaArgs[1] = { "sun.applet.PluginMain" };
+	  numArgs = 3;
+	  char const* javaArgs[3] = { "-cp", appletviewer_classpath, "sun.applet.PluginMain" };
 	  args = javaArgs;
   }
 
+  printf("Executing: %s %s\n", appletviewer_executable, args);
+
   // start processing thread
   nsCOMPtr<nsIRunnable> processMessageEvent =
 							new IcedTeaRunnableMethod<IcedTeaPluginFactory>
@@ -3585,14 +3610,14 @@
   PLUGIN_DEBUG_TWO ("clearing old input fifo (if any):", in_pipe_name);
   g_remove(in_pipe_name);
 
-  PLUGIN_DEBUG_TWO ("GCJ_New: creating input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("creating input fifo:", in_pipe_name);
   if (mkfifo (in_pipe_name, 0700) == -1 && errno != EEXIST)
     {
       PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
       result = NS_ERROR_OUT_OF_MEMORY;
       goto cleanup_in_pipe_name;
     }
-  PLUGIN_DEBUG_TWO ("GCJ_New: created input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("created input fifo:", in_pipe_name);
 
   // Create plugin-to-appletviewer pipe which we refer to as the
   // output pipe.
@@ -3614,14 +3639,14 @@
   PLUGIN_DEBUG_TWO ("clearing old output fifo (if any):", out_pipe_name);
   
   g_remove(out_pipe_name);
-  PLUGIN_DEBUG_TWO ("GCJ_New: creating output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("creating output fifo:", out_pipe_name);
   if (mkfifo (out_pipe_name, 0700) == -1 && errno != EEXIST)
     {
       PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
       result = NS_ERROR_OUT_OF_MEMORY;
       goto cleanup_out_pipe_name;
     }
-  PLUGIN_DEBUG_TWO ("GCJ_New: created output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name);
 
   result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull);
   PLUGIN_CHECK_RETURN ("run process", result);
@@ -3696,9 +3721,9 @@
 
   // cleanup_out_pipe:
   // Delete output pipe.
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleting input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleting input fifo:", in_pipe_name);
   unlink (out_pipe_name);
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleted input fifo:", in_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleted input fifo:", in_pipe_name);
 
  cleanup_out_pipe_name:
   g_free (out_pipe_name);
@@ -3706,9 +3731,9 @@
 
   // cleanup_in_pipe:
   // Delete input pipe.
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleting output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleting output fifo:", out_pipe_name);
   unlink (in_pipe_name);
-  PLUGIN_DEBUG_TWO ("GCJ_New: deleted output fifo:", out_pipe_name);
+  PLUGIN_DEBUG_TWO ("deleted output fifo:", out_pipe_name);
 
  cleanup_in_pipe_name:
   g_free (in_pipe_name);
@@ -5536,25 +5561,29 @@
       return NS_ERROR_OUT_OF_MEMORY;
     }
   nsCString executable (dirname (filename));
-  nsCString jar(dirname (filename));
-  nsCString extrajars("");
+  nsCString classpath(dirname (filename));
   free (filename);
   filename = NULL;
 
-  //executableString += nsCString ("/../../bin/pluginappletviewer");
   executable += nsCString ("/../../bin/java");
 
-  //executable += nsCString ("/client/libjvm.so");
-
   // Never freed.
   appletviewer_executable = strdup (executable.get ());
-  //libjvm_so = strdup (executable.get ());
   if (!appletviewer_executable)
     {
       PLUGIN_ERROR ("Failed to create java executable name.");
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
+  classpath += nsCString ("/rt.jar");
+  appletviewer_classpath = strdup (classpath.get ());
+  if (!appletviewer_classpath)
+    {
+      PLUGIN_ERROR ("Failed to create java classpath string.");
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+
   // Make sure the plugin data directory exists, creating it if
   // necessary.
   data_directory = g_strconcat (getenv ("HOME"), "/.icedteaplugin", NULL);
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java	Thu Oct 23 12:17:26 2008 -0400
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java	Thu Oct 23 12:27:23 2008 -0400
@@ -175,7 +175,7 @@
          AccessController.doPrivileged(new PrivilegedAction() {
              public Object run() {
             	 	try {
-            	 		panel = new NetxPanel(doc, atts);
+            	 		panel = new NetxPanel(doc, atts, false);
             	 		AppletViewerPanel.debug("Using NetX panel");
             	 	} catch (Exception ex) {
             	 		AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex);
--- a/rt/net/sourceforge/jnlp/Launcher.java	Thu Oct 23 12:17:26 2008 -0400
+++ b/rt/net/sourceforge/jnlp/Launcher.java	Thu Oct 23 12:27:23 2008 -0400
@@ -59,6 +59,8 @@
     /** whether to create an AppContext (if possible) */
     private boolean context = true;
 
+    /** If the application should call System.exit on fatal errors */
+    private boolean exitOnFailure = true;
 
     /**
      * Create a launcher with the runtime's default update policy
@@ -70,6 +72,21 @@
         if (handler == null)
             handler = JNLPRuntime.getDefaultLaunchHandler();
     }
+    
+    /**
+     * Create a launcher with the runtime's default update policy
+     * and launch handler.
+     * 
+     * @param exitOnError Exit if there is an error (usually default, but false when being used from the plugin)
+     */
+    public Launcher(boolean exitOnFailure) {
+        this(null, null);
+
+        if (handler == null)
+            handler = JNLPRuntime.getDefaultLaunchHandler();
+        
+        this.exitOnFailure = exitOnFailure;
+    }
 
     /**
      * Create a launcher with the specified handler and the
@@ -595,7 +612,8 @@
                 ex.printStackTrace();
                 exception = ex;
                 // Exit if we can't launch the application.
-                System.exit(0);
+                if (exitOnFailure)
+                	System.exit(0);
             }
         }
 
--- a/rt/net/sourceforge/jnlp/NetxPanel.java	Thu Oct 23 12:17:26 2008 -0400
+++ b/rt/net/sourceforge/jnlp/NetxPanel.java	Thu Oct 23 12:27:23 2008 -0400
@@ -39,11 +39,19 @@
 public class NetxPanel extends AppletViewerPanel
 {
     private PluginBridge bridge = null;
+    private boolean exitOnFailure = true;
 
     public NetxPanel(URL documentURL, Hashtable atts)
     {
         super(documentURL, atts);
     }
+    
+    // overloaded constructor, called when initialized via plugin 
+    public NetxPanel(URL documentURL, Hashtable atts, boolean exitOnFailure)
+    {
+        this(documentURL, atts);
+        this.exitOnFailure = exitOnFailure;
+    }
 
     //Overriding to use Netx classloader. You might need to relax visibility
     //in sun.applet.AppletPanel for runLoader().
@@ -72,14 +80,15 @@
     		dispatchAppletEvent(APPLET_LOADING, null);
     		status = APPLET_LOAD;
 
-    		Launcher l = new Launcher();
+    		Launcher l = new Launcher(exitOnFailure);
     		AppletInstance appInst = null;
                 try {
                     appInst = (AppletInstance) l.launch(bridge, this);
                 } catch (LaunchException e) {
                     // Assume user has indicated he does not trust the
                     // applet.
-                    System.exit(0);
+                	if (exitOnFailure)
+                		System.exit(0);
                 }
     		applet = appInst.getApplet();