Improve nsIProcess, fix nsIProcess.kill(). b=442393 r=bsmedberg

browser/components/shell/src/nsGNOMEShellService.cpp

@@ -587,8 +587,7 @@ nsGNOMEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const ns
 
   const nsCString spec(aURI);
   const char* specStr = spec.get();
-  PRUint32 pid;
-  return process->Run(PR_FALSE, &specStr, 1, &pid);
+  return process->Run(PR_FALSE, &specStr, 1);
 }
 
 NS_IMETHODIMP

uriloader/exthandler/nsLocalHandlerApp.cpp

@@ -116,8 +116,7 @@ nsLocalHandlerApp::LaunchWithIProcess(const nsCString& aArg)
 
   const char *string = aArg.get();
 
-  PRUint32 pid;
-  return process->Run(PR_FALSE, &string, 1, &pid);
+  return process->Run(PR_FALSE, &string, 1);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

uriloader/exthandler/nsMIMEInfoImpl.cpp

@@ -434,8 +434,7 @@ nsMIMEInfoBase::LaunchWithIProcess(nsIFile* aApp, const nsCString& aArg)
 
   const char *string = aArg.get();
 
-  PRUint32 pid;
-  return process->Run(PR_FALSE, &string, 1, &pid);
+  return process->Run(PR_FALSE, &string, 1);
 }
 
 // nsMIMEInfoImpl implementation

uriloader/exthandler/unix/nsOSHelperAppService.cpp

@@ -1156,8 +1156,7 @@ nsOSHelperAppService::GetHandlerAndDescriptionFromMailcapFile(const nsAString& a
                     continue;
                   const char *args[] = { "-c", testCommand.get() };
                   LOG(("Running Test: %s\n", testCommand.get()));
-                  PRUint32 pid;
-                  rv = process->Run(PR_TRUE, args, 2, &pid);
+                  rv = process->Run(PR_TRUE, args, 2);
                   if (NS_FAILED(rv))
                     continue;
                   PRInt32 exitValue;

xpcom/tests/Makefile.in

@@ -72,6 +72,9 @@ CPPSRCS		= \
 		TestThreadPoolListener.cpp \
 		TestTimers.cpp \
 		TestOOM.cpp \
+		TestBlockingProcess.cpp \
+		TestQuickReturn.cpp \
+		TestArguments.cpp \
 		$(NULL)
 
 ifndef MOZ_ENABLE_LIBXUL

xpcom/tests/TestArguments.cpp

@@ -0,0 +1,14 @@
+#include <iostream>
+#include <string>
+
+using namespace std;
+
+int main(int argc, char* argv[]) {
+
+  string test = "mozilla";
+
+  if (test.compare(argv[1]) != 0)
+      return -1;
+
+  return 0;
+} 

xpcom/tests/TestBlockingProcess.cpp

@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+int main()
+{
+   char text[20];
+   fgets(text, sizeof text, stdin);
+   return 0;
+}
+

xpcom/tests/TestQuickReturn.cpp

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main () {
+
+  return 42;
+}

xpcom/tests/unit/test_bug476919.js

@@ -22,8 +22,7 @@ function run_test() {
     var process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
     process.init(ln);
     var args = ["-s", targetFile.path, link.path];
-    var result = process.run(true, args, args.length);
-    do_check_eq(result, 0);
+    process.run(true, args, args.length);
     do_check_true(link.isSymlink());
   }
 }

xpcom/tests/unit/test_nsIProcess.js

@@ -0,0 +1,142 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is XPCOM unit tests.
+ *
+ * The Initial Developer of the Original Code is
+ * James Boston <mozilla@jamesboston.ca>.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+// nsIProcess unit test
+
+// get the path to {objdir}/dist/bin
+var bindir = Components.classes["@mozilla.org/file/directory_service;1"]
+.getService(Components.interfaces.nsIProperties)
+.get("CurProcD", Components.interfaces.nsIFile);
+
+// the the os
+var isWindows = ("@mozilla.org/windows-registry-key;1" in Components.classes);
+
+var filePrefix = "";
+var fileSuffix = "";
+
+if (isWindows) {
+  filePrefix = bindir.path + "\\";
+  fileSuffix = ".exe";
+} else {
+  filePrefix = bindir.path + "/";
+}
+
+
+// test if a process can be started, polled for its running status
+// and then killed
+function test_kill()
+{
+  var testapp = filePrefix + "TestBlockingProcess" +fileSuffix;
+  print(testapp);
+
+  var file = Components.classes["@mozilla.org/file/local;1"]
+                       .createInstance(Components.interfaces.nsILocalFile);
+  file.initWithPath(testapp);
+
+  var process = Components.classes["@mozilla.org/process/util;1"]
+                          .createInstance(Components.interfaces.nsIProcess);
+  process.init(file);
+
+  process.run(false, [], 0);
+
+  var rv = process.isRunning;
+
+  if (!rv) {    
+    return false;
+  }
+
+  process.kill();
+
+  rv = process.isRunning;
+
+  if (rv){
+    return false;
+  }
+  return true;
+
+}
+
+// test if we can get an exit value from an application that is
+// guaranteed to return an exit value of 42
+function test_quick()
+{
+  var testapp = filePrefix + "TestQuickReturn" + fileSuffix;
+
+  var file = Components.classes["@mozilla.org/file/local;1"]
+  .createInstance(Components.interfaces.nsILocalFile);
+  file.initWithPath(testapp);
+
+  var process = Components.classes["@mozilla.org/process/util;1"]
+  .createInstance(Components.interfaces.nsIProcess);
+  process.init(file);
+
+  // to get an exit value it must be a blocking process
+  process.run(true, [], 0);
+
+  if (process.exitValue != 42) {
+    return false;
+  }
+  return true;
+}
+
+// test if an argument can be successfully passed to an application
+// that will return -1 if "mozilla" is not the first argument
+function test_arguments()
+{
+  var testapp = filePrefix + "TestArguments" + fileSuffix;
+
+  var file = Components.classes["@mozilla.org/file/local;1"]
+  .createInstance(Components.interfaces.nsILocalFile);
+  file.initWithPath(testapp);
+
+  var process = Components.classes["@mozilla.org/process/util;1"]
+  .createInstance(Components.interfaces.nsIProcess);
+  process.init(file);
+
+  var args= ["mozilla"];
+
+  process.run(true, args, args.length);
+
+  if (process.exitValue) {
+    return false;
+  }
+  return true;
+}
+
+function run_test() {
+  do_check_true(test_kill());
+  do_check_true(test_quick());
+  do_check_true(test_arguments());
+}

xpcom/threads/nsIProcess.idl

@@ -1,7 +1,7 @@
 #include "nsIFile.idl"
 #include "nsISupports.idl"
 
-[scriptable, uuid(9da0b650-d07e-4617-a18a-250035572ac8)]
+[scriptable, uuid(d573f1f3-fcdd-4dbe-980b-4ba79e6718dc)]
 
 interface nsIProcess : nsISupports
 {
@@ -14,15 +14,15 @@ interface nsIProcess : nsISupports
         /** Executes the file this object was initialized with
          * @param blocking Whether to wait until the process terminates before returning or not
          * @param args An array of arguments to pass to the process
-         * @param count The length of the args array
-         * @return the PID of the newly spawned process */
-        unsigned long run(in boolean blocking, [array, size_is(count)] in string args, in unsigned long count);
+         * @param count The length of the args array */
+        void run(in boolean blocking, [array, size_is(count)] in string args, in unsigned long count);
 
 	readonly attribute nsIFile location;
 	readonly attribute unsigned long pid;
 	readonly attribute string processName;
 	readonly attribute unsigned long processSignature;
 	readonly attribute long exitValue;
+	readonly attribute unsigned long isRunning;
 };
 
 %{C++

xpcom/threads/nsProcess.h

@@ -40,10 +40,17 @@
 #ifndef _nsPROCESSWIN_H_
 #define _nsPROCESSWIN_H_
 
+#if defined(XP_WIN) && !defined (WINCE) /* wince uses nspr */
+#define PROCESSMODEL_WINAPI
+#endif
+
 #include "nsIProcess.h"
 #include "nsIFile.h"
 #include "nsString.h"
 #include "prproces.h"
+#if defined(PROCESSMODEL_WINAPI) 
+#include <windows.h>
+#endif
 
 #define NS_PROCESS_CID \
 {0x7b4eeb20, 0xd781, 0x11d4, \
@@ -59,13 +66,16 @@ class nsProcess : public nsIProcess
   nsProcess();
 
 private:
-  ~nsProcess() {}
+  ~nsProcess();
 
   nsCOMPtr<nsIFile> mExecutable;
   PRInt32 mExitValue;
   nsCString mTargetPath;
   PRProcess *mProcess;
 
+#if defined(PROCESSMODEL_WINAPI) 
+  PROCESS_INFORMATION procInfo;
+#endif
 };
 
 #endif