changeset in /hg/icedtea6: - Supply classpath to vm when initial...
Deepak Bhole
dbhole at redhat.com
Thu Oct 23 15:07:54 PDT 2008
changeset 93f0928ec0ed in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=93f0928ec0ed
description:
- Supply classpath to vm when initializing
- Do not exit java on error
- Don't wait forever (c++ side) for java to respond
diffstat:
5 files changed, 93 insertions(+), 28 deletions(-)
ChangeLog | 9 ++
IcedTeaPlugin.cc | 77 ++++++++++++++-------
plugin/icedtea/sun/applet/PluginAppletViewer.java | 2
rt/net/sourceforge/jnlp/Launcher.java | 20 +++++
rt/net/sourceforge/jnlp/NetxPanel.java | 13 +++
diffs (296 lines):
diff -r 19ff33216eaf -r 93f0928ec0ed ChangeLog
--- 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 Lillian Angel <langel at redha
+2008-10-23 Deepak Bhole <dbhole at 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 at redhat.com>
PR redhat/468193:
diff -r 19ff33216eaf -r 93f0928ec0ed IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Thu Oct 23 12:17:26 2008 -0400
+++ b/IcedTeaPlugin.cc Thu Oct 23 12:27:23 2008 -0400
@@ -83,6 +83,9 @@ PRThread* current_thread ();
// #12 0x0153e62f in ProxyJNIEnv::InvokeMethod (env=0xa8b8040, obj=0x9dad690, method=0xa0ed070, args=0x0) at ProxyJNI.cpp:571
// #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 @@ static GError* channel_error = NULL;
// 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,13 +2387,27 @@ IcedTeaPluginInstance::SetWindow (nsPlug
{
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 @@ IcedTeaPluginFactory::GetJavaObject (PRU
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,15 +3574,17 @@ IcedTeaPluginFactory::StartAppletviewer
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 =
@@ -3585,14 +3610,14 @@ IcedTeaPluginFactory::StartAppletviewer
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 @@ IcedTeaPluginFactory::StartAppletviewer
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 @@ IcedTeaPluginFactory::StartAppletviewer
// 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 @@ IcedTeaPluginFactory::StartAppletviewer
// 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,24 +5561,28 @@ NSGetFactory (nsISupports* aServMgr, nsC
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.
diff -r 19ff33216eaf -r 93f0928ec0ed plugin/icedtea/sun/applet/PluginAppletViewer.java
--- 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 @@ import sun.misc.Ref;
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);
diff -r 19ff33216eaf -r 93f0928ec0ed rt/net/sourceforge/jnlp/Launcher.java
--- 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 @@ public class Launcher {
/** 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
@@ -69,6 +71,21 @@ public class Launcher {
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;
}
/**
@@ -595,7 +612,8 @@ public class Launcher {
ex.printStackTrace();
exception = ex;
// Exit if we can't launch the application.
- System.exit(0);
+ if (exitOnFailure)
+ System.exit(0);
}
}
diff -r 19ff33216eaf -r 93f0928ec0ed rt/net/sourceforge/jnlp/NetxPanel.java
--- 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,10 +39,18 @@ public class NetxPanel extends AppletVie
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
@@ -72,14 +80,15 @@ public class NetxPanel extends AppletVie
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();
More information about the distro-pkg-dev
mailing list