Mojo: MojoWaitFlags -> MojoHandleSignals.

mojo/system/core.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/core.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 100 matching lines @@
   }
 
   // The dispatcher doesn't have a say in being closed, but gets notified of it.
   // Note: This is done outside of |handle_table_lock_|. As a result, there's a
   // race condition that the dispatcher must handle; see the comment in
   // |Dispatcher| in dispatcher.h.
   return dispatcher->Close();
 }
 
 MojoResult Core::Wait(MojoHandle handle,
-                      MojoWaitFlags flags,
+                      MojoHandleSignals signals,
                       MojoDeadline deadline) {
-  return WaitManyInternal(&handle, &flags, 1, deadline);
+  return WaitManyInternal(&handle, &signals, 1, deadline);
 }
 
 MojoResult Core::WaitMany(const MojoHandle* handles,
-                          const MojoWaitFlags* flags,
+                          const MojoHandleSignals* signals,
                           uint32_t num_handles,
                           MojoDeadline deadline) {
   if (!VerifyUserPointerWithCount<MojoHandle>(handles, num_handles))
     return MOJO_RESULT_INVALID_ARGUMENT;
-  if (!VerifyUserPointerWithCount<MojoWaitFlags>(flags, num_handles))
+  if (!VerifyUserPointerWithCount<MojoHandleSignals>(signals, num_handles))
     return MOJO_RESULT_INVALID_ARGUMENT;
   if (num_handles < 1)
     return MOJO_RESULT_INVALID_ARGUMENT;
   if (num_handles > kMaxWaitManyNumHandles)
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
-  return WaitManyInternal(handles, flags, num_handles, deadline);
+  return WaitManyInternal(handles, signals, num_handles, deadline);
 }
 
 MojoResult Core::CreateMessagePipe(const MojoCreateMessagePipeOptions* options,
                                    MojoHandle* message_pipe_handle0,
                                    MojoHandle* message_pipe_handle1) {
   MojoCreateMessagePipeOptions validated_options = {};
   // This will verify the |options| pointer.
   MojoResult result = MessagePipeDispatcher::ValidateCreateOptions(
       options, &validated_options);
   if (result != MOJO_RESULT_OK)
@@ skipping 356 matching lines @@
 MojoResult Core::UnmapBuffer(void* buffer) {
   base::AutoLock locker(mapping_table_lock_);
   return mapping_table_.RemoveMapping(buffer);
 }
 
 // Note: We allow |handles| to repeat the same handle multiple times, since
 // different flags may be specified.
 // TODO(vtl): This incurs a performance cost in |RemoveWaiter()|. Analyze this
 // more carefully and address it if necessary.
 MojoResult Core::WaitManyInternal(const MojoHandle* handles,
-                                  const MojoWaitFlags* flags,
+                                  const MojoHandleSignals* signals,
                                   uint32_t num_handles,
                                   MojoDeadline deadline) {
   DCHECK_GT(num_handles, 0u);
 
   DispatcherVector dispatchers;
   dispatchers.reserve(num_handles);
   for (uint32_t i = 0; i < num_handles; i++) {
     scoped_refptr<Dispatcher> dispatcher = GetDispatcher(handles[i]);
     if (!dispatcher)
       return MOJO_RESULT_INVALID_ARGUMENT;
     dispatchers.push_back(dispatcher);
   }
 
   // TODO(vtl): Should make the waiter live (permanently) in TLS.
   Waiter waiter;
   waiter.Init();
 
   uint32_t i;
   MojoResult rv = MOJO_RESULT_OK;
   for (i = 0; i < num_handles; i++) {
-    rv = dispatchers[i]->AddWaiter(&waiter, flags[i], i);
+    rv = dispatchers[i]->AddWaiter(&waiter, signals[i], i);
     if (rv != MOJO_RESULT_OK)
       break;
   }
   uint32_t num_added = i;
 
   if (rv == MOJO_RESULT_ALREADY_EXISTS) {
     rv = static_cast<MojoResult>(i);  // The i-th one is already "triggered".
   } else if (rv == MOJO_RESULT_OK) {
     uint32_t context = static_cast<uint32_t>(-1);
     rv = waiter.Wait(deadline, &context);
     if (rv == MOJO_RESULT_OK)
       rv = static_cast<MojoResult>(context);
   }
 
   // Make sure no other dispatchers try to wake |waiter| for the current
   // |Wait()|/|WaitMany()| call. (Only after doing this can |waiter| be
   // destroyed, but this would still be required if the waiter were in TLS.)
   for (i = 0; i < num_added; i++)
     dispatchers[i]->RemoveWaiter(&waiter);
 
   return rv;
 }
 
 }  // namespace system
 }  // namespace mojo