Merge pull request #2014 from atom/enable-zygote

Use zygote process on Linux

atom/common/atom_command_line.cc

@@ -0,0 +1,31 @@
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/common/atom_command_line.h"
+
+#include "base/command_line.h"
+#include "node/deps/uv/include/uv.h"
+
+namespace atom {
+
+// static
+std::vector<std::string> AtomCommandLine::argv_;
+
+// static
+void AtomCommandLine::Init(int argc, const char* const* argv) {
+  // Hack around with the argv pointer. Used for process.title = "blah"
+  char** new_argv = uv_setup_args(argc, const_cast<char**>(argv));
+  for (int i = 0; i < argc; ++i) {
+    argv_.push_back(new_argv[i]);
+  }
+}
+
+#if defined(OS_LINUX)
+// static
+void AtomCommandLine::InitializeFromCommandLine() {
+  argv_ = base::CommandLine::ForCurrentProcess()->argv();
+}
+#endif
+
+}  // namespace atom

atom/common/atom_command_line.h

@@ -0,0 +1,35 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_COMMON_ATOM_COMMAND_LINE_H_
+#define ATOM_COMMON_ATOM_COMMAND_LINE_H_
+
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+
+namespace atom {
+
+// Singleton to remember the original "argc" and "argv".
+class AtomCommandLine {
+ public:
+  static void Init(int argc, const char* const* argv);
+  static std::vector<std::string> argv() { return argv_; }
+
+#if defined(OS_LINUX)
+  // On Linux the command line has to be read from base::CommandLine since
+  // it is using zygote.
+  static void InitializeFromCommandLine();
+#endif
+
+ private:
+  static std::vector<std::string> argv_;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(AtomCommandLine);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_COMMON_ATOM_COMMAND_LINE_H_

atom/common/node_bindings.cc

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "atom/app/atom_main_args.h"
+#include "atom/common/atom_command_line.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "base/command_line.h"
 #include "base/base_paths.h"
@@ -128,6 +128,12 @@ void NodeBindings::Initialize() {
   node::g_standalone_mode = is_browser_;
   node::g_upstream_node_mode = false;
 
+#if defined(OS_LINUX)
+  // Get real command line in renderer process forked by zygote.
+  if (!is_browser_)
+    AtomCommandLine::InitializeFromCommandLine();
+#endif
+
   // Parse the debug args.
   auto args = AtomCommandLine::argv();
   for (const std::string& arg : args)