Changeset 368

Timestamp:

May 24, 2012, 12:13:31 AM (13 years ago)

Author:

dmik

Message:

icedtea-web: Pass file descriptors to JVM process rather than pipe names.

Pipes on OS/2 don't have real FS entries so the Unix approach wouldn't work.

Location:

trunk/icedtea-web/plugin/icedteanp

Files:

• IcedTeaNPPlugin.cc (modified) (14 diffs)
• java/sun/applet/PluginMain.java (modified) (4 diffs)
• os2/java/sun/applet/PluginMainBase.java (added)
• x11/java/sun/applet/PluginMainBase.java (added)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc ¶

@@ -44 +44 @@
 #include <os2.h>
 #include <emx/startup.h>
+#include <sys/socket.h>
 #endif
 
@@ -160 +161 @@
 static GIOChannel* in_from_appletviewer = NULL;
 
+#ifdef __OS2__
+#define CLOSE_FD(fd) do { if (fd != -1) { close (fd); fd = -1; } } while (0)
+#endif
+
+#ifdef __OS2__
+int in_pipe[2] = { -1 };
+#else
 // Applet viewer input pipe name.
 gchar* in_pipe_name;
+#endif
 
 // Applet viewer input watch source.
 gint in_watch_source;
 
+#ifdef __OS2__
+int out_pipe[2] = { -1 };
+#else
 // Applet viewer output pipe name.
 gchar* out_pipe_name;
+#endif
 
 // Applet viewer output watch source.
@@ -453 +466 @@
   // pipe.
 
+#ifdef __OS2__
+  if (socketpair (AF_LOCAL, SOCK_STREAM, 0, in_pipe) == -1)
+    {
+      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      np_error = NPERR_GENERIC_ERROR;
+      goto cleanup_in_pipe;
+    }
+  PLUGIN_DEBUG ("ITNP_New: created input fifo: %d/%d\n", in_pipe[0], in_pipe[1]);
+#else
   // in_pipe_name
   in_pipe_name = g_strdup_printf ("%s/%d-icedteanp-appletviewer-to-plugin",
@@ -476 +498 @@
     }
   PLUGIN_DEBUG ("ITNP_New: created input fifo: %s\n", in_pipe_name);
+#endif
 
   // Create plugin-to-appletviewer pipe which we refer to as the
   // output pipe.
 
+#ifdef __OS2__
+  if (socketpair (AF_LOCAL, SOCK_STREAM, 0, out_pipe) == -1)
+    {
+      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      np_error = NPERR_GENERIC_ERROR;
+      goto cleanup_out_pipe;
+    }
+  PLUGIN_DEBUG ("ITNP_New: created output fifo: %d/%d\n", out_pipe[0], out_pipe[1]);
+#else
   // out_pipe_name
   out_pipe_name = g_strdup_printf ("%s/%d-icedteanp-plugin-to-appletviewer",
@@ -502 +534 @@
     }
   PLUGIN_DEBUG ("ITNP_New: created output fifo: %s\n", out_pipe_name);
+#endif
 
   // Start a separate appletviewer process for each applet, even if
@@ -510 +543 @@
   np_error = plugin_start_appletviewer (data);
 
+#ifdef __OS2__
+  // close child ends of the pipes (not needed)
+  CLOSE_FD (in_pipe[1]);
+  CLOSE_FD (out_pipe[1]);
+#endif
+
   // Create plugin-to-appletviewer channel.  The default encoding for
   // the file is UTF-8.
   // out_to_appletviewer
+#ifdef __OS2__
+  out_to_appletviewer = g_io_channel_unix_new (out_pipe[0]);
+#else
   out_to_appletviewer = g_io_channel_new_file (out_pipe_name,
                                                "w", &channel_error);
+#endif
   if (!out_to_appletviewer)
     {
@@ -540 +583 @@
   // the file is UTF-8.
   // in_from_appletviewer
+#ifdef __OS2__
+  in_from_appletviewer = g_io_channel_unix_new (in_pipe [0]);
+#else
   in_from_appletviewer = g_io_channel_new_file (in_pipe_name,
                                                       "r", &channel_error);
+#endif
   if (!in_from_appletviewer)
     {
@@ -591 +638 @@
 
   // cleanup_out_pipe:
+#ifdef __OS2__
+ cleanup_out_pipe:
+  CLOSE_FD (out_pipe [0]);
+  CLOSE_FD (out_pipe[1]);
+#else
   // Delete output pipe.
-  PLUGIN_DEBUG ("ITNP_New: deleting input fifo: %s\n", in_pipe_name);
+  PLUGIN_DEBUG ("ITNP_New: deleting output fifo: %s\n", out_pipe_name);
   unlink (out_pipe_name);
-  PLUGIN_DEBUG ("ITNP_New: deleted input fifo: %s\n", in_pipe_name);
+  PLUGIN_DEBUG ("ITNP_New: deleted output fifo: %s\n", out_pipe_name);
 
  cleanup_out_pipe_name:
   g_free (out_pipe_name);
   out_pipe_name = NULL;
+#endif
 
   // cleanup_in_pipe:
+#ifdef __OS2__
+ cleanup_in_pipe:
+  CLOSE_FD (in_pipe[0]);
+  CLOSE_FD (out_pipe[1]);
+#else
   // Delete input pipe.
-  PLUGIN_DEBUG ("ITNP_New: deleting output fifo: %s\n", out_pipe_name);
+  PLUGIN_DEBUG ("ITNP_New: deleting input fifo: %s\n", in_pipe_name);
   unlink (in_pipe_name);
-  PLUGIN_DEBUG ("ITNP_New: deleted output fifo: %s\n", out_pipe_name);
+  PLUGIN_DEBUG ("ITNP_New: deleted input fifo: %s\n", in_pipe_name);
 
  cleanup_in_pipe_name:
   g_free (in_pipe_name);
   in_pipe_name = NULL;
+#endif
 
  done:
@@ -1570 +1629 @@
       }
       command_line[cmd_num++] = g_strdup("sun.applet.PluginMain");
+#ifdef __OS2__
+      command_line[cmd_num++] = g_strdup_printf("%d", out_pipe [1]);
+      command_line[cmd_num++] = g_strdup_printf("%d", in_pipe [1]);
+#else
       command_line[cmd_num++] = g_strdup(out_pipe_name);
       command_line[cmd_num++] = g_strdup(in_pipe_name);
+#endif
       command_line[cmd_num] = NULL;
   } else
@@ -1581 +1645 @@
       command_line[cmd_num++] = g_strdup_printf("%s/lib/rt.jar", ICEDTEA_WEB_JRE);
       command_line[cmd_num++] = g_strdup("sun.applet.PluginMain");
+#ifdef __OS2__
+      command_line[cmd_num++] = g_strdup_printf("%d", out_pipe [1]);
+      command_line[cmd_num++] = g_strdup_printf("%d", in_pipe [1]);
+#else
       command_line[cmd_num++] = g_strdup(out_pipe_name);
       command_line[cmd_num++] = g_strdup(in_pipe_name);
+#endif
       command_line[cmd_num] = NULL;
   }
@@ -1603 +1672 @@
       error = NPERR_GENERIC_ERROR;
     }
+
+  // make sure we get an error rather than crash the browser when talking to the
+  // jvm process if it dies unexpectedly (we do it here since g_spawn() is known
+  // to reset SIGPIPE handler to SIG_DFL)
+  signal (SIGPIPE, SIG_IGN);
 
   g_strfreev (environment);
@@ -2423 +2497 @@
 
   // cleanup_out_pipe:
+#ifdef __OS2__
+  CLOSE_FD (out_pipe [0]);
+  CLOSE_FD (out_pipe [1]);
+#else
   // Delete output pipe.
   PLUGIN_DEBUG ("NP_Shutdown: deleting output fifo: %s\n", out_pipe_name);
@@ -2431 +2509 @@
   g_free (out_pipe_name);
   out_pipe_name = NULL;
+#endif
 
   // cleanup_in_pipe:
+#ifdef __OS2__
+  CLOSE_FD (in_pipe [0]);
+  CLOSE_FD (in_pipe [1]);
+#else
   // Delete input pipe.
   PLUGIN_DEBUG ("NP_Shutdown: deleting input fifo: %s\n", in_pipe_name);
@@ -2441 +2524 @@
   g_free (in_pipe_name);
   in_pipe_name = NULL;
+#endif
 
   // Destroy the call queue mutex

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginMain.java ¶

@@ -63 +63 @@
 package sun.applet;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.Authenticator;
@@ -81 +78 @@
  * The main entry point into PluginAppletViewer.
  */
-public class PluginMain {
+public class PluginMain extends PluginMainBase {
     // the files where stdout/stderr are sent to
     public static final String PLUGIN_STDERR_FILE = "java.stderr";
@@ -95 +92 @@
     public static void main(String args[])
             throws IOException {
-        if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) {
-            System.err.println("Invalid pipe names provided. Refusing to proceed.");
+        if (!checkArgs(args)) {
             System.exit(1);
         }
 
         try {
-            PluginStreamHandler streamHandler = connect(args[0], args[1]);
+            PluginStreamHandler streamHandler = connect(args);
             boolean redirectStreams = System.getenv().containsKey("ICEDTEAPLUGIN_DEBUG");
 
@@ -128 +124 @@
     private PluginMain() {
         // The PluginMain constructor should never, EVER, be called
-    }
-
-    private static PluginStreamHandler connect(String inPipe, String outPipe) {
-        PluginStreamHandler streamHandler = null;
-        try {
-            streamHandler = new PluginStreamHandler(new FileInputStream(inPipe), new FileOutputStream(outPipe));
-            PluginDebug.debug("Streams initialized");
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        }
-        return streamHandler;
     }