Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: base/memory/shared_memory_handle_mac.cc

Issue 2875453002: Add a size parameter to SharedMemoryHandle. (Closed)
Patch Set: Fix IPC on POSIX. Created 3 years, 7 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "base/memory/shared_memory_handle.h" 5 #include "base/memory/shared_memory_handle.h"
6 6
7 #include <mach/mach_vm.h> 7 #include <mach/mach_vm.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <sys/mman.h> 9 #include <sys/mman.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include "base/mac/mac_util.h" 12 #include "base/mac/mac_util.h"
13 #include "base/mac/mach_logging.h" 13 #include "base/mac/mach_logging.h"
14 #include "base/posix/eintr_wrapper.h" 14 #include "base/posix/eintr_wrapper.h"
15 #include "base/unguessable_token.h" 15 #include "base/unguessable_token.h"
16 16
17 namespace base { 17 namespace base {
18 18
19 SharedMemoryHandle::SharedMemoryHandle() 19 SharedMemoryHandle::SharedMemoryHandle()
20 : type_(MACH), memory_object_(MACH_PORT_NULL) {} 20 : type_(MACH), memory_object_(MACH_PORT_NULL) {}
21 21
22 SharedMemoryHandle::SharedMemoryHandle( 22 SharedMemoryHandle::SharedMemoryHandle(
23 const base::FileDescriptor& file_descriptor, 23 const base::FileDescriptor& file_descriptor,
24 size_t size,
24 const base::UnguessableToken& guid) 25 const base::UnguessableToken& guid)
25 : type_(POSIX), file_descriptor_(file_descriptor), guid_(guid) {} 26 : type_(POSIX),
27 file_descriptor_(file_descriptor),
28 guid_(guid),
29 size_(size) {}
26 30
27 SharedMemoryHandle::SharedMemoryHandle(mach_vm_size_t size, 31 SharedMemoryHandle::SharedMemoryHandle(mach_vm_size_t size,
28 const base::UnguessableToken& guid) { 32 const base::UnguessableToken& guid) {
29 type_ = MACH; 33 type_ = MACH;
30 mach_port_t named_right; 34 mach_port_t named_right;
31 kern_return_t kr = mach_make_memory_entry_64( 35 kern_return_t kr = mach_make_memory_entry_64(
32 mach_task_self(), 36 mach_task_self(),
33 &size, 37 &size,
34 0, // Address. 38 0, // Address.
35 MAP_MEM_NAMED_CREATE | VM_PROT_READ | VM_PROT_WRITE, 39 MAP_MEM_NAMED_CREATE | VM_PROT_READ | VM_PROT_WRITE,
36 &named_right, 40 &named_right,
37 MACH_PORT_NULL); // Parent handle. 41 MACH_PORT_NULL); // Parent handle.
38 if (kr != KERN_SUCCESS) { 42 if (kr != KERN_SUCCESS) {
39 memory_object_ = MACH_PORT_NULL; 43 memory_object_ = MACH_PORT_NULL;
40 return; 44 return;
41 } 45 }
42 46
43 memory_object_ = named_right; 47 memory_object_ = named_right;
44 size_ = size; 48 size_ = size;
45 ownership_passes_to_ipc_ = false; 49 ownership_passes_to_ipc_ = false;
46 guid_ = guid; 50 guid_ = guid;
47 } 51 }
48 52
49 SharedMemoryHandle::SharedMemoryHandle(mach_port_t memory_object, 53 SharedMemoryHandle::SharedMemoryHandle(mach_port_t memory_object,
50 mach_vm_size_t size, 54 mach_vm_size_t size,
51 const base::UnguessableToken& guid) 55 const base::UnguessableToken& guid)
52 : type_(MACH), 56 : type_(MACH),
53 memory_object_(memory_object), 57 memory_object_(memory_object),
54 size_(size),
55 ownership_passes_to_ipc_(false), 58 ownership_passes_to_ipc_(false),
56 guid_(guid) {} 59 guid_(guid),
60 size_(size) {}
57 61
58 SharedMemoryHandle SharedMemoryHandle::Duplicate() const { 62 SharedMemoryHandle SharedMemoryHandle::Duplicate() const {
59 switch (type_) { 63 switch (type_) {
60 case POSIX: { 64 case POSIX: {
61 if (!IsValid()) 65 if (!IsValid())
62 return SharedMemoryHandle(); 66 return SharedMemoryHandle();
63 int duped_fd = HANDLE_EINTR(dup(file_descriptor_.fd)); 67 int duped_fd = HANDLE_EINTR(dup(file_descriptor_.fd));
64 if (duped_fd < 0) 68 if (duped_fd < 0)
65 return SharedMemoryHandle(); 69 return SharedMemoryHandle();
66 return SharedMemoryHandle(FileDescriptor(duped_fd, true), guid_); 70 return SharedMemoryHandle(FileDescriptor(duped_fd, true), size_, guid_);
67 } 71 }
68 case MACH: { 72 case MACH: {
69 if (!IsValid()) 73 if (!IsValid())
70 return SharedMemoryHandle(); 74 return SharedMemoryHandle();
71 75
72 // Increment the ref count. 76 // Increment the ref count.
73 kern_return_t kr = mach_port_mod_refs(mach_task_self(), memory_object_, 77 kern_return_t kr = mach_port_mod_refs(mach_task_self(), memory_object_,
74 MACH_PORT_RIGHT_SEND, 1); 78 MACH_PORT_RIGHT_SEND, 1);
75 DCHECK_EQ(kr, KERN_SUCCESS); 79 DCHECK_EQ(kr, KERN_SUCCESS);
76 SharedMemoryHandle handle(*this); 80 SharedMemoryHandle handle(*this);
(...skipping 10 matching lines...) Expand all
87 case MACH: 91 case MACH:
88 return memory_object_ != MACH_PORT_NULL; 92 return memory_object_ != MACH_PORT_NULL;
89 } 93 }
90 } 94 }
91 95
92 mach_port_t SharedMemoryHandle::GetMemoryObject() const { 96 mach_port_t SharedMemoryHandle::GetMemoryObject() const {
93 DCHECK_EQ(type_, MACH); 97 DCHECK_EQ(type_, MACH);
94 return memory_object_; 98 return memory_object_;
95 } 99 }
96 100
97 bool SharedMemoryHandle::GetSize(size_t* size) const {
98 if (!IsValid()) {
99 *size = 0;
100 return true;
101 }
102
103 switch (type_) {
104 case SharedMemoryHandle::POSIX:
105 struct stat st;
106 if (fstat(file_descriptor_.fd, &st) != 0)
107 return false;
108 if (st.st_size < 0)
109 return false;
110 *size = st.st_size;
111 return true;
112 case SharedMemoryHandle::MACH:
113 *size = size_;
114 return true;
115 }
116 }
117
118 bool SharedMemoryHandle::MapAt(off_t offset, 101 bool SharedMemoryHandle::MapAt(off_t offset,
119 size_t bytes, 102 size_t bytes,
120 void** memory, 103 void** memory,
121 bool read_only) { 104 bool read_only) {
122 DCHECK(IsValid()); 105 DCHECK(IsValid());
123 switch (type_) { 106 switch (type_) {
124 case SharedMemoryHandle::POSIX: 107 case SharedMemoryHandle::POSIX:
125 *memory = mmap(nullptr, bytes, PROT_READ | (read_only ? 0 : PROT_WRITE), 108 *memory = mmap(nullptr, bytes, PROT_READ | (read_only ? 0 : PROT_WRITE),
126 MAP_SHARED, file_descriptor_.fd, offset); 109 MAP_SHARED, file_descriptor_.fd, offset);
127 return *memory != MAP_FAILED; 110 return *memory != MAP_FAILED;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 DCHECK_EQ(type_, MACH); 146 DCHECK_EQ(type_, MACH);
164 ownership_passes_to_ipc_ = ownership_passes; 147 ownership_passes_to_ipc_ = ownership_passes;
165 } 148 }
166 149
167 bool SharedMemoryHandle::OwnershipPassesToIPC() const { 150 bool SharedMemoryHandle::OwnershipPassesToIPC() const {
168 DCHECK_EQ(type_, MACH); 151 DCHECK_EQ(type_, MACH);
169 return ownership_passes_to_ipc_; 152 return ownership_passes_to_ipc_;
170 } 153 }
171 154
172 } // namespace base 155 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698