components/nacl/common/nacl_helper_linux.h - Issue 22911027: Pass StatsTable shared memory via global descriptors on Posix rather than using named shared memory.

Side by Side Diff: components/nacl/common/nacl_helper_linux.h

Issue 22911027: Pass StatsTable shared memory via global descriptors on Posix rather than using named shared memory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update kNaClSandboxDescriptor. Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « base/metrics/stats_table.cc ('k') | content/browser/child_process_launcher.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_	5 #ifndef COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_

6 #define COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_	6 #define COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_

7	7

8 // A mini-zygote specifically for Native Client. This file defines	8 // A mini-zygote specifically for Native Client. This file defines

9 // constants used to implement communication between the nacl_helper	9 // constants used to implement communication between the nacl_helper

10 // process and the Chrome zygote.	10 // process and the Chrome zygote.

(...skipping 10 matching lines...) Expand all Loading...
21	21

22 // The next set of constants define global Linux file descriptors.	22 // The next set of constants define global Linux file descriptors.

23 // For communications between NaCl loader and browser.	23 // For communications between NaCl loader and browser.

24 // See also content/common/zygote_main_linux.cc and	24 // See also content/common/zygote_main_linux.cc and

25 // http://code.google.com/p/chromium/wiki/LinuxZygote	25 // http://code.google.com/p/chromium/wiki/LinuxZygote

26	26

27 // For communications between NaCl loader and zygote.	27 // For communications between NaCl loader and zygote.

28 #define kNaClZygoteDescriptor 3	28 #define kNaClZygoteDescriptor 3

29 // For communications between the NaCl loader process and	29 // For communications between the NaCl loader process and

30 // the SUID sandbox.	30 // the SUID sandbox.

31 #define kNaClSandboxDescriptor 5	31 #define kNaClSandboxDescriptor 6

32 // NOTE: kNaClSandboxDescriptor must match	32 // NOTE: kNaClSandboxDescriptor must match

33 // content/browser/zygote_main_linux.cc	33 // content/public/common/content_descriptors.h

34 // kMagicSandboxIPCDescriptor.	34 // kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor
	Mark Seaborn 2013/10/14 22:01:50 Would you mind removing kNaClSandboxDescriptor fro Would you mind removing kNaClSandboxDescriptor from this file and changing components/nacl/zygote/nacl_fork_delegate_linux.cc to use kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor instead of kNaClSandboxDescriptor? It's just a small cleanup now, but I think it's better to clean that up than document that two parts of the code have to be kept in sync manually. rmcilroy 2013/10/15 18:47:50 Done. Show quoted text On 2013/10/14 22:01:50, Mark Seaborn wrote: > Would you mind removing kNaClSandboxDescriptor from this file and changing > components/nacl/zygote/nacl_fork_delegate_linux.cc to use kSandboxIPCChannel + > base::GlobalDescriptors::kBaseDescriptor instead of kNaClSandboxDescriptor? > > It's just a small cleanup now, but I think it's better to clean that up than > document that two parts of the code have to be kept in sync manually. Done.
35	35

36 // A fork request from the Zygote to the helper includes an array	36 // A fork request from the Zygote to the helper includes an array

37 // of three file descriptors. These constants are used as indicies	37 // of three file descriptors. These constants are used as indicies

38 // into the array.	38 // into the array.

39 // Used to pass in the descriptor for talking to the Browser	39 // Used to pass in the descriptor for talking to the Browser

40 #define kNaClBrowserFDIndex 0	40 #define kNaClBrowserFDIndex 0
	Mark Seaborn 2013/10/14 22:01:50 BTW, it looks like you haven't rebased, because I BTW, it looks like you haven't rebased, because I removed this block in trunk. Presumably you've only tested this via the trybots and not locally, which is why this works. rmcilroy 2013/10/15 18:47:50 Strange, I thought I had synced. It did work on t Show quoted text On 2013/10/14 22:01:50, Mark Seaborn wrote: > BTW, it looks like you haven't rebased, because I removed this block in trunk. > Presumably you've only tested this via the trybots and not locally, which is why > this works. Strange, I thought I had synced. It did work on the trybots though (and I thought locally too...). Done.
41 // The next two are used in the protocol for discovering the	41 // The next two are used in the protocol for discovering the

42 // child processes real PID from within the SUID sandbox. See	42 // child processes real PID from within the SUID sandbox. See

43 // http://code.google.com/p/chromium/wiki/LinuxZygote	43 // http://code.google.com/p/chromium/wiki/LinuxZygote

44 #define kNaClDummyFDIndex 1	44 #define kNaClDummyFDIndex 1

45 #define kNaClParentFDIndex 2	45 #define kNaClParentFDIndex 2

46	46

47 #endif // COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_	47 #endif // COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_

OLD	NEW