| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/edk/embedder/platform_shared_buffer.h" | 5 #include "mojo/edk/embedder/platform_shared_buffer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/shared_memory.h" | 12 #include "base/memory/shared_memory.h" |
| 13 #include "base/process/process_handle.h" | 13 #include "base/process/process_handle.h" |
| 14 #include "base/sys_info.h" | 14 #include "base/sys_info.h" |
| 15 #include "mojo/edk/embedder/platform_handle_utils.h" | 15 #include "mojo/edk/embedder/platform_handle_utils.h" |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 namespace edk { | 18 namespace edk { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 // Takes ownership of |memory_handle|. | 22 // Takes ownership of |memory_handle|. |
| 23 ScopedPlatformHandle SharedMemoryToPlatformHandle( | 23 ScopedPlatformHandle SharedMemoryToPlatformHandle( |
| 24 base::SharedMemoryHandle memory_handle) { | 24 base::SharedMemoryHandle memory_handle) { |
| 25 #if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) | 25 #if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) |
| 26 return ScopedPlatformHandle(PlatformHandle(memory_handle.fd)); | 26 return ScopedPlatformHandle(PlatformHandle(memory_handle.fd)); |
| 27 #elif defined(OS_WIN) | 27 #elif defined(OS_WIN) |
| 28 return ScopedPlatformHandle(PlatformHandle(memory_handle.GetHandle())); | 28 return ScopedPlatformHandle(PlatformHandle(memory_handle.GetHandle())); |
| 29 #else | 29 #else |
| 30 return ScopedPlatformHandle(PlatformHandle(memory_handle.GetMemoryObject())); | 30 if (memory_handle.GetType() == base::SharedMemoryHandle::MACH) { |
| 31 return ScopedPlatformHandle(PlatformHandle( |
| 32 memory_handle.GetMemoryObject())); |
| 33 } else { |
| 34 DCHECK(memory_handle.GetType() == base::SharedMemoryHandle::POSIX); |
| 35 return ScopedPlatformHandle(PlatformHandle( |
| 36 memory_handle.GetFileDescriptor().fd)); |
| 37 } |
| 31 #endif | 38 #endif |
| 32 } | 39 } |
| 33 | 40 |
| 34 } // namespace | 41 } // namespace |
| 35 | 42 |
| 36 // static | 43 // static |
| 37 PlatformSharedBuffer* PlatformSharedBuffer::Create(size_t num_bytes) { | 44 PlatformSharedBuffer* PlatformSharedBuffer::Create(size_t num_bytes) { |
| 38 DCHECK_GT(num_bytes, 0u); | 45 DCHECK_GT(num_bytes, 0u); |
| 39 | 46 |
| 40 PlatformSharedBuffer* rv = new PlatformSharedBuffer(num_bytes, false); | 47 PlatformSharedBuffer* rv = new PlatformSharedBuffer(num_bytes, false); |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 PlatformSharedBuffer::~PlatformSharedBuffer() {} | 189 PlatformSharedBuffer::~PlatformSharedBuffer() {} |
| 183 | 190 |
| 184 bool PlatformSharedBuffer::Init() { | 191 bool PlatformSharedBuffer::Init() { |
| 185 DCHECK(!shared_memory_); | 192 DCHECK(!shared_memory_); |
| 186 DCHECK(!read_only_); | 193 DCHECK(!read_only_); |
| 187 | 194 |
| 188 base::SharedMemoryCreateOptions options; | 195 base::SharedMemoryCreateOptions options; |
| 189 options.size = num_bytes_; | 196 options.size = num_bytes_; |
| 190 // By default, we can share as read-only. | 197 // By default, we can share as read-only. |
| 191 options.share_read_only = true; | 198 options.share_read_only = true; |
| 199 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 200 options.type = base::SharedMemoryHandle::MACH; |
| 201 #endif |
| 192 | 202 |
| 193 shared_memory_.reset(new base::SharedMemory); | 203 shared_memory_.reset(new base::SharedMemory); |
| 194 return shared_memory_->Create(options); | 204 return shared_memory_->Create(options); |
| 195 } | 205 } |
| 196 | 206 |
| 197 bool PlatformSharedBuffer::InitFromPlatformHandle( | 207 bool PlatformSharedBuffer::InitFromPlatformHandle( |
| 198 ScopedPlatformHandle platform_handle) { | 208 ScopedPlatformHandle platform_handle) { |
| 199 DCHECK(!shared_memory_); | 209 DCHECK(!shared_memory_); |
| 200 | 210 |
| 201 #if defined(OS_WIN) | 211 #if defined(OS_WIN) |
| 202 base::SharedMemoryHandle handle(platform_handle.release().handle, | 212 base::SharedMemoryHandle handle(platform_handle.release().handle, |
| 203 base::GetCurrentProcId()); | 213 base::GetCurrentProcId()); |
| 204 #elif defined(OS_MACOSX) && !defined(OS_IOS) | 214 #elif defined(OS_MACOSX) && !defined(OS_IOS) |
| 205 base::SharedMemoryHandle handle; | 215 base::SharedMemoryHandle handle; |
| 206 handle = base::SharedMemoryHandle(platform_handle.release().port, num_bytes_, | 216 if (platform_handle.get().type == PlatformHandle::Type::MACH) { |
| 207 base::GetCurrentProcId()); | 217 handle = base::SharedMemoryHandle( |
| 218 platform_handle.release().port, num_bytes_, base::GetCurrentProcId()); |
| 219 } else { |
| 220 handle = base::SharedMemoryHandle(platform_handle.release().handle, false); |
| 221 } |
| 208 #else | 222 #else |
| 209 base::SharedMemoryHandle handle(platform_handle.release().handle, false); | 223 base::SharedMemoryHandle handle(platform_handle.release().handle, false); |
| 210 #endif | 224 #endif |
| 211 | 225 |
| 212 shared_memory_.reset(new base::SharedMemory(handle, read_only_)); | 226 shared_memory_.reset(new base::SharedMemory(handle, read_only_)); |
| 213 return true; | 227 return true; |
| 214 } | 228 } |
| 215 | 229 |
| 216 void PlatformSharedBuffer::InitFromSharedMemoryHandle( | 230 void PlatformSharedBuffer::InitFromSharedMemoryHandle( |
| 217 base::SharedMemoryHandle handle) { | 231 base::SharedMemoryHandle handle) { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 246 base_ = static_cast<char*>(shared_memory_.memory()) + offset_rounding; | 260 base_ = static_cast<char*>(shared_memory_.memory()) + offset_rounding; |
| 247 return true; | 261 return true; |
| 248 } | 262 } |
| 249 | 263 |
| 250 void PlatformSharedBufferMapping::Unmap() { | 264 void PlatformSharedBufferMapping::Unmap() { |
| 251 shared_memory_.Unmap(); | 265 shared_memory_.Unmap(); |
| 252 } | 266 } |
| 253 | 267 |
| 254 } // namespace edk | 268 } // namespace edk |
| 255 } // namespace mojo | 269 } // namespace mojo |
| OLD | NEW |