Mojo: Optimize VerifyUserPointer().

mojo/system/message_pipe.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/system/message_pipe.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "mojo/system/limits.h"
 #include "mojo/system/memory.h"
@@ skipping 62 matching lines @@
 
 MojoResult MessagePipe::WriteMessage(
     unsigned port,
     const void* bytes, uint32_t num_bytes,
     const MojoHandle* handles, uint32_t num_handles,
     MojoWriteMessageFlags /*flags*/) {
   DCHECK(port == 0 || port == 1);
 
   unsigned destination_port = DestinationPortFromSourcePort(port);
 
-  if (!VerifyUserPointer(bytes, num_bytes, 1))
+  if (!VerifyUserPointer<void>(bytes, num_bytes))
     return MOJO_RESULT_INVALID_ARGUMENT;
   if (num_bytes > kMaxMessageNumBytes)
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
 
-  if (!VerifyUserPointer(handles, num_handles, sizeof(handles[0])))
+  if (!VerifyUserPointer<MojoHandle>(handles, num_handles))
     return MOJO_RESULT_INVALID_ARGUMENT;
   if (num_handles > kMaxMessageNumHandles)
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   if (num_handles > 0) {
     // TODO(vtl): Verify each handle.
     NOTIMPLEMENTED();
     return MOJO_RESULT_UNIMPLEMENTED;
   }
 
   // TODO(vtl): Handle flags.
@@ skipping 23 matching lines @@
   return MOJO_RESULT_OK;
 }
 
 MojoResult MessagePipe::ReadMessage(unsigned port,
                                     void* bytes, uint32_t* num_bytes,
                                     MojoHandle* handles, uint32_t* num_handles,
                                     MojoReadMessageFlags flags) {
   DCHECK(port == 0 || port == 1);
 
   const size_t max_bytes = num_bytes ? *num_bytes : 0;
-  if (!VerifyUserPointer(bytes, max_bytes, 1))
+  if (!VerifyUserPointer<void>(bytes, max_bytes))
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   const size_t max_handles = num_handles ? *num_handles : 0;
-  if (!VerifyUserPointer(handles, max_handles, sizeof(handles[0])))
+  if (!VerifyUserPointer<MojoHandle>(handles, max_handles))
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   base::AutoLock locker(lock_);
   DCHECK(is_open_[port]);
 
   if (message_queues_[port].empty())
     return MOJO_RESULT_NOT_FOUND;
 
   // TODO(vtl): If |flags & MOJO_READ_MESSAGE_FLAG_MAY_DISCARD|, we could pop
   // and release the lock immediately.
@@ skipping 92 matching lines @@
   if (!message_queues_[port].empty() || is_open_[destination_port])
     satisfiable_flags |= MOJO_WAIT_FLAG_READABLE;
   if (is_open_[destination_port])
     satisfiable_flags |= MOJO_WAIT_FLAG_WRITABLE;
 
   return satisfiable_flags;
 }
 
 }  // namespace system
 }  // namespace mojo