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

Side by Side Diff: mojo/embedder/simple_platform_shared_buffer_posix.cc

Issue 612923002: Revert of Revert of Mojo: Convert scoped_ptr<...>() to nullptr in mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
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/embedder/simple_platform_shared_buffer.h" 5 #include "mojo/embedder/simple_platform_shared_buffer.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <stdio.h> // For |fileno()|. 8 #include <stdio.h> // For |fileno()|.
9 #include <sys/mman.h> // For |mmap()|/|munmap()|. 9 #include <sys/mman.h> // For |mmap()|/|munmap()|.
10 #include <sys/stat.h> 10 #include <sys/stat.h>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 void* real_base = mmap(nullptr, 130 void* real_base = mmap(nullptr,
131 real_length, 131 real_length,
132 PROT_READ | PROT_WRITE, 132 PROT_READ | PROT_WRITE,
133 MAP_SHARED, 133 MAP_SHARED,
134 handle_.get().fd, 134 handle_.get().fd,
135 static_cast<off_t>(real_offset)); 135 static_cast<off_t>(real_offset));
136 // |mmap()| should return |MAP_FAILED| (a.k.a. -1) on error. But it shouldn't 136 // |mmap()| should return |MAP_FAILED| (a.k.a. -1) on error. But it shouldn't
137 // return null either. 137 // return null either.
138 if (real_base == MAP_FAILED || !real_base) { 138 if (real_base == MAP_FAILED || !real_base) {
139 PLOG(ERROR) << "mmap"; 139 PLOG(ERROR) << "mmap";
140 return scoped_ptr<PlatformSharedBufferMapping>(); 140 return nullptr;
141 } 141 }
142 142
143 void* base = static_cast<char*>(real_base) + offset_rounding; 143 void* base = static_cast<char*>(real_base) + offset_rounding;
144 return scoped_ptr<PlatformSharedBufferMapping>( 144 return scoped_ptr<PlatformSharedBufferMapping>(
145 new SimplePlatformSharedBufferMapping( 145 new SimplePlatformSharedBufferMapping(
146 base, length, real_base, real_length)); 146 base, length, real_base, real_length));
147 } 147 }
148 148
149 // SimplePlatformSharedBufferMapping ------------------------------------------- 149 // SimplePlatformSharedBufferMapping -------------------------------------------
150 150
151 void SimplePlatformSharedBufferMapping::Unmap() { 151 void SimplePlatformSharedBufferMapping::Unmap() {
152 int result = munmap(real_base_, real_length_); 152 int result = munmap(real_base_, real_length_);
153 PLOG_IF(ERROR, result != 0) << "munmap"; 153 PLOG_IF(ERROR, result != 0) << "munmap";
154 } 154 }
155 155
156 } // namespace embedder 156 } // namespace embedder
157 } // namespace mojo 157 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/embedder/simple_platform_shared_buffer.cc ('k') | mojo/embedder/simple_platform_shared_buffer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698