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

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

Issue 2875453002: Add a size parameter to SharedMemoryHandle. (Closed)
Patch Set: Remove extraneous period. 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
« no previous file with comments | « base/memory/shared_memory_handle_mac.cc ('k') | base/memory/shared_memory_handle_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 <unistd.h> 7 #include <unistd.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/posix/eintr_wrapper.h" 10 #include "base/posix/eintr_wrapper.h"
11 #include "base/unguessable_token.h" 11 #include "base/unguessable_token.h"
12 12
13 namespace base { 13 namespace base {
14 14
15 SharedMemoryHandle::SharedMemoryHandle() = default; 15 SharedMemoryHandle::SharedMemoryHandle() = default;
16 16
17 SharedMemoryHandle::SharedMemoryHandle( 17 SharedMemoryHandle::SharedMemoryHandle(
18 const base::FileDescriptor& file_descriptor, 18 const base::FileDescriptor& file_descriptor,
19 size_t size,
19 const base::UnguessableToken& guid) 20 const base::UnguessableToken& guid)
20 : file_descriptor_(file_descriptor), guid_(guid) {} 21 : file_descriptor_(file_descriptor), guid_(guid), size_(size) {}
21 22
22 // static 23 // static
23 SharedMemoryHandle SharedMemoryHandle::ImportHandle(int fd) { 24 SharedMemoryHandle SharedMemoryHandle::ImportHandle(int fd, size_t size) {
24 SharedMemoryHandle handle; 25 SharedMemoryHandle handle;
25 handle.file_descriptor_.fd = fd; 26 handle.file_descriptor_.fd = fd;
26 handle.file_descriptor_.auto_close = false; 27 handle.file_descriptor_.auto_close = false;
27 handle.guid_ = UnguessableToken::Create(); 28 handle.guid_ = UnguessableToken::Create();
29 handle.size_ = size;
28 return handle; 30 return handle;
29 } 31 }
30 32
31 int SharedMemoryHandle::GetHandle() const { 33 int SharedMemoryHandle::GetHandle() const {
32 return file_descriptor_.fd; 34 return file_descriptor_.fd;
33 } 35 }
34 36
35 void SharedMemoryHandle::SetHandle(int handle) {
36 file_descriptor_.fd = handle;
37 }
38
39 bool SharedMemoryHandle::IsValid() const { 37 bool SharedMemoryHandle::IsValid() const {
40 return file_descriptor_.fd >= 0; 38 return file_descriptor_.fd >= 0;
41 } 39 }
42 40
43 void SharedMemoryHandle::Close() const { 41 void SharedMemoryHandle::Close() const {
44 if (IGNORE_EINTR(close(file_descriptor_.fd)) < 0) 42 if (IGNORE_EINTR(close(file_descriptor_.fd)) < 0)
45 PLOG(ERROR) << "close"; 43 PLOG(ERROR) << "close";
46 } 44 }
47 45
48 int SharedMemoryHandle::Release() { 46 int SharedMemoryHandle::Release() {
49 int old_fd = file_descriptor_.fd; 47 int old_fd = file_descriptor_.fd;
50 file_descriptor_.fd = -1; 48 file_descriptor_.fd = -1;
51 return old_fd; 49 return old_fd;
52 } 50 }
53 51
54 SharedMemoryHandle SharedMemoryHandle::Duplicate() const { 52 SharedMemoryHandle SharedMemoryHandle::Duplicate() const {
55 if (!IsValid()) 53 if (!IsValid())
56 return SharedMemoryHandle(); 54 return SharedMemoryHandle();
57 55
58 int duped_handle = HANDLE_EINTR(dup(file_descriptor_.fd)); 56 int duped_handle = HANDLE_EINTR(dup(file_descriptor_.fd));
59 if (duped_handle < 0) 57 if (duped_handle < 0)
60 return SharedMemoryHandle(); 58 return SharedMemoryHandle();
61 return SharedMemoryHandle(FileDescriptor(duped_handle, true), GetGUID()); 59 return SharedMemoryHandle(FileDescriptor(duped_handle, true), GetSize(),
60 GetGUID());
62 } 61 }
63 62
64 void SharedMemoryHandle::SetOwnershipPassesToIPC(bool ownership_passes) { 63 void SharedMemoryHandle::SetOwnershipPassesToIPC(bool ownership_passes) {
65 file_descriptor_.auto_close = ownership_passes; 64 file_descriptor_.auto_close = ownership_passes;
66 } 65 }
67 66
68 bool SharedMemoryHandle::OwnershipPassesToIPC() const { 67 bool SharedMemoryHandle::OwnershipPassesToIPC() const {
69 return file_descriptor_.auto_close; 68 return file_descriptor_.auto_close;
70 } 69 }
71 70
72 } // namespace base 71 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/shared_memory_handle_mac.cc ('k') | base/memory/shared_memory_handle_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698