New NaCl zygote implementation 2

chrome/common/nacl_helper_linux.h

Index: chrome/common/nacl_helper_linux.h
diff --git a/chrome/common/nacl_helper_linux.h b/chrome/common/nacl_helper_linux.h
new file mode 100644
index 0000000000000000000000000000000000000000..0116ab71cc6e7beb1e2442dcd902bd664e720bcf
--- /dev/null
+++ b/chrome/common/nacl_helper_linux.h
@@ -0,0 +1,29 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// A mini-zygote specifically for Native Client.
+
+// Please do not include Chrome-specific include files here.

[jam, 2011/06/21 20:54:08]

this isn't the case anymore right?

[Brad Chen, 2011/06/21 23:43:48]

Done.

+// This include file is meant to be usable outside of Chrome.
+#ifndef CHROME_COMMON_NACL_HELPER_LINUX_H_
+#define CHROME_COMMON_NACL_HELPER_LINUX_H_
+#pragma once
+
+static const char kNaClHelperStartupAck[] = "NACLHELPER_OK";

[jam, 2011/06/21 20:54:08]

nit: the chrome style is to have the 

extern const char kNaClHelperStartupAck[];
and in a cc file
const char kNaClHelperStartupAck[] = "NACLHELPER_OK";

I believe this is because otherwise the string can be duplicated across the code
each time the header is included.

[Brad Chen, 2011/06/21 23:43:48]

There is a problem is that this header is used to build two executables, and I
don't think they share any CC files that I have modified. So I will try #define.
Alternative would be to add a data-only .CC file.

On 2011/06/21 20:54:08, John Abd-El-Malek wrote:
Done.

+static const char kNaClForkRequest[] = "NACLFORK";
+// kNaClBrowserDescriptor and kNaClSandboxDescriptor must match
+// content/browser/zygote_main_linux.cc kBrowserDescriptor and
+// kMagicSandboxIPCDescriptor.
+// We put the kNaClZygoteDescriptor on 3 together with the
+// kNaClBrowserDescriptor. They are never used at the same
+// time, and this prevents /dev/urandom from using the fd.
+static const int kNaClBrowserDescriptor = 3;
+static const int kNaClZygoteDescriptor = 3;
+static const int kNaClSandboxDescriptor = 5;
+
+static const int kNaClBrowserFDIndex = 0;
+static const int kNaClDummyFDIndex = 1;
+static const int kNaClParentFDIndex = 2;
+
+#endif  // CHROME_COMMON_NACL_HELPER_LINUX_H_