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

Side by Side Diff: mojo/system/handle_table.cc

Issue 603983003: Mojo: COMPILE_ASSERT -> static_assert in mojo/system and 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
« no previous file with comments | « mojo/system/handle_signals_state.h ('k') | mojo/system/local_data_pipe_unittest.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 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/system/handle_table.h" 5 #include "mojo/system/handle_table.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "mojo/system/constants.h" 9 #include "mojo/system/constants.h"
10 #include "mojo/system/dispatcher.h" 10 #include "mojo/system/dispatcher.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 return std::make_pair(AddDispatcherNoSizeCheck(dispatcher0), 72 return std::make_pair(AddDispatcherNoSizeCheck(dispatcher0),
73 AddDispatcherNoSizeCheck(dispatcher1)); 73 AddDispatcherNoSizeCheck(dispatcher1));
74 } 74 }
75 75
76 bool HandleTable::AddDispatcherVector(const DispatcherVector& dispatchers, 76 bool HandleTable::AddDispatcherVector(const DispatcherVector& dispatchers,
77 MojoHandle* handles) { 77 MojoHandle* handles) {
78 DCHECK_LE(dispatchers.size(), kMaxMessageNumHandles); 78 DCHECK_LE(dispatchers.size(), kMaxMessageNumHandles);
79 DCHECK(handles); 79 DCHECK(handles);
80 // TODO(vtl): |std::numeric_limits<size_t>::max()| isn't a compile-time 80 // TODO(vtl): |std::numeric_limits<size_t>::max()| isn't a compile-time
81 // expression in C++03. 81 // expression in C++03.
82 COMPILE_ASSERT( 82 static_assert(
83 static_cast<uint64_t>(kMaxHandleTableSize) + kMaxMessageNumHandles < 83 static_cast<uint64_t>(kMaxHandleTableSize) + kMaxMessageNumHandles <
84 (sizeof(size_t) == 8 ? kuint64max 84 (sizeof(size_t) == 8 ? kuint64max
85 : static_cast<uint64_t>(kuint32max)), 85 : static_cast<uint64_t>(kuint32max)),
86 addition_may_overflow); 86 "Addition may overflow");
87 87
88 if (handle_to_entry_map_.size() + dispatchers.size() > kMaxHandleTableSize) 88 if (handle_to_entry_map_.size() + dispatchers.size() > kMaxHandleTableSize)
89 return false; 89 return false;
90 90
91 for (size_t i = 0; i < dispatchers.size(); i++) { 91 for (size_t i = 0; i < dispatchers.size(); i++) {
92 if (dispatchers[i].get()) { 92 if (dispatchers[i].get()) {
93 handles[i] = AddDispatcherNoSizeCheck(dispatchers[i]); 93 handles[i] = AddDispatcherNoSizeCheck(dispatchers[i]);
94 } else { 94 } else {
95 LOG(WARNING) << "Invalid dispatcher at index " << i; 95 LOG(WARNING) << "Invalid dispatcher at index " << i;
96 handles[i] = MOJO_HANDLE_INVALID; 96 handles[i] = MOJO_HANDLE_INVALID;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 for (uint32_t i = 0; i < num_handles; i++) { 231 for (uint32_t i = 0; i < num_handles; i++) {
232 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handles[i]); 232 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handles[i]);
233 DCHECK(it != handle_to_entry_map_.end()); 233 DCHECK(it != handle_to_entry_map_.end());
234 DCHECK(it->second.busy); 234 DCHECK(it->second.busy);
235 it->second.busy = false; 235 it->second.busy = false;
236 } 236 }
237 } 237 }
238 238
239 } // namespace system 239 } // namespace system
240 } // namespace mojo 240 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/system/handle_signals_state.h ('k') | mojo/system/local_data_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698