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

Side by Side Diff: mojo/edk/system/mapping_table.cc

Issue 728043002: Revert of Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « mojo/edk/system/local_data_pipe_unittest.cc ('k') | mojo/edk/system/memory.h » ('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 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/system/mapping_table.h" 5 #include "mojo/edk/system/mapping_table.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "mojo/edk/embedder/platform_shared_buffer.h" 8 #include "mojo/edk/embedder/platform_shared_buffer.h"
9 #include "mojo/edk/system/configuration.h" 9 #include "mojo/edk/system/constants.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 namespace system { 12 namespace system {
13 13
14 MappingTable::MappingTable() { 14 MappingTable::MappingTable() {
15 } 15 }
16 16
17 MappingTable::~MappingTable() { 17 MappingTable::~MappingTable() {
18 // This should usually not be reached (the only instance should be owned by 18 // This should usually not be reached (the only instance should be owned by
19 // the singleton |Core|, which lives forever), except in tests. 19 // the singleton |Core|, which lives forever), except in tests.
20 } 20 }
21 21
22 MojoResult MappingTable::AddMapping( 22 MojoResult MappingTable::AddMapping(
23 scoped_ptr<embedder::PlatformSharedBufferMapping> mapping) { 23 scoped_ptr<embedder::PlatformSharedBufferMapping> mapping) {
24 DCHECK(mapping); 24 DCHECK(mapping);
25 25
26 if (address_to_mapping_map_.size() >= 26 if (address_to_mapping_map_.size() >= kMaxMappingTableSize)
27 GetConfiguration().max_mapping_table_sze)
28 return MOJO_RESULT_RESOURCE_EXHAUSTED; 27 return MOJO_RESULT_RESOURCE_EXHAUSTED;
29 28
30 uintptr_t address = reinterpret_cast<uintptr_t>(mapping->GetBase()); 29 uintptr_t address = reinterpret_cast<uintptr_t>(mapping->GetBase());
31 DCHECK(address_to_mapping_map_.find(address) == 30 DCHECK(address_to_mapping_map_.find(address) ==
32 address_to_mapping_map_.end()); 31 address_to_mapping_map_.end());
33 address_to_mapping_map_[address] = mapping.release(); 32 address_to_mapping_map_[address] = mapping.release();
34 return MOJO_RESULT_OK; 33 return MOJO_RESULT_OK;
35 } 34 }
36 35
37 MojoResult MappingTable::RemoveMapping(uintptr_t address) { 36 MojoResult MappingTable::RemoveMapping(uintptr_t address) {
38 AddressToMappingMap::iterator it = address_to_mapping_map_.find(address); 37 AddressToMappingMap::iterator it = address_to_mapping_map_.find(address);
39 if (it == address_to_mapping_map_.end()) 38 if (it == address_to_mapping_map_.end())
40 return MOJO_RESULT_INVALID_ARGUMENT; 39 return MOJO_RESULT_INVALID_ARGUMENT;
41 embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second; 40 embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second;
42 address_to_mapping_map_.erase(it); 41 address_to_mapping_map_.erase(it);
43 delete mapping_to_delete; 42 delete mapping_to_delete;
44 return MOJO_RESULT_OK; 43 return MOJO_RESULT_OK;
45 } 44 }
46 45
47 } // namespace system 46 } // namespace system
48 } // namespace mojo 47 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/system/local_data_pipe_unittest.cc ('k') | mojo/edk/system/memory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698