EDK: Change Awakable::Awake()'s context, etc., to be a uint64_t.

mojo/edk/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/edk/system/core.h"
 
+#include <limits>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "mojo/edk/embedder/platform_support.h"
 #include "mojo/edk/platform/platform_shared_buffer.h"
 #include "mojo/edk/platform/time_ticks.h"
 #include "mojo/edk/system/async_waiter.h"
 #include "mojo/edk/system/configuration.h"
@@ skipping 216 matching lines @@
   }
 
   new_handle.Put(new_handle_value);
   return MOJO_RESULT_OK;
 }
 
 MojoResult Core::Wait(MojoHandle handle,
                       MojoHandleSignals signals,
                       MojoDeadline deadline,
                       UserPointer<MojoHandleSignalsState> signals_state) {
-  uint32_t unused = static_cast<uint32_t>(-1);
+  uint64_t unused = static_cast<uint64_t>(-1);
   HandleSignalsState hss;
   MojoResult result = WaitManyInternal(&handle, &signals, 1, deadline, &unused,
                                        signals_state.IsNull() ? nullptr : &hss);
   if (result != MOJO_RESULT_INVALID_ARGUMENT && !signals_state.IsNull())
     signals_state.Put(hss);
   return result;
 }
 
 MojoResult Core::WaitMany(UserPointer<const MojoHandle> handles,
                           UserPointer<const MojoHandleSignals> signals,
                           uint32_t num_handles,
                           MojoDeadline deadline,
                           UserPointer<uint32_t> result_index,
                           UserPointer<MojoHandleSignalsState> signals_states) {
   if (num_handles < 1)
     return MOJO_RESULT_INVALID_ARGUMENT;
   if (num_handles > GetConfiguration().max_wait_many_num_handles)
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
 
   UserPointer<const MojoHandle>::Reader handles_reader(handles, num_handles);
   UserPointer<const MojoHandleSignals>::Reader signals_reader(signals,
                                                               num_handles);
-  uint32_t index = static_cast<uint32_t>(-1);
+  uint64_t index = static_cast<uint64_t>(-1);
   MojoResult result;
   if (signals_states.IsNull()) {
     result = WaitManyInternal(handles_reader.GetPointer(),
                               signals_reader.GetPointer(), num_handles,
                               deadline, &index, nullptr);
   } else {
     UserPointer<MojoHandleSignalsState>::Writer signals_states_writer(
         signals_states, num_handles);
     // Note: The |reinterpret_cast| is safe, since |HandleSignalsState| is a
     // subclass of |MojoHandleSignalsState| that doesn't add any data members.
     result = WaitManyInternal(
         handles_reader.GetPointer(), signals_reader.GetPointer(), num_handles,
         deadline, &index, reinterpret_cast<HandleSignalsState*>(
                               signals_states_writer.GetPointer()));
     if (result != MOJO_RESULT_INVALID_ARGUMENT)
       signals_states_writer.Commit();
   }
-  if (index != static_cast<uint32_t>(-1) && !result_index.IsNull())
-    result_index.Put(index);
+  if (index != static_cast<uint64_t>(-1) && !result_index.IsNull()) {
+    DCHECK_LE(index, std::numeric_limits<uint32_t>::max());
+    result_index.Put(static_cast<uint32_t>(index));
+  }
   return result;
 }
 
 MojoResult Core::CreateMessagePipe(
     UserPointer<const MojoCreateMessagePipeOptions> options,
     UserPointer<MojoHandle> message_pipe_handle0,
     UserPointer<MojoHandle> message_pipe_handle1) {
   MojoCreateMessagePipeOptions validated_options = {};
   MojoResult result =
       MessagePipeDispatcher::ValidateCreateOptions(options, &validated_options);
@@ skipping 452 matching lines @@
 }
 
 // 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 |Remove()|. Analyze this
 // more carefully and address it if necessary.
 MojoResult Core::WaitManyInternal(const MojoHandle* handles,
                                   const MojoHandleSignals* signals,
                                   uint32_t num_handles,
                                   MojoDeadline deadline,
-                                  uint32_t* result_index,
+                                  uint64_t* result_index,
                                   HandleSignalsState* signals_states) {
   DCHECK_GT(num_handles, 0u);
-  DCHECK_EQ(*result_index, static_cast<uint32_t>(-1));
+  DCHECK_EQ(*result_index, static_cast<uint64_t>(-1));
 
   DispatcherVector dispatchers;
   dispatchers.reserve(num_handles);
 
   {
     MutexLocker locker(&handle_table_mutex_);
     for (uint32_t i = 0; i < num_handles; i++) {
       if (handles[i] == MOJO_HANDLE_INVALID) {
         *result_index = i;
         return MOJO_RESULT_INVALID_ARGUMENT;
@@ skipping 40 matching lines @@
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return result;
 }
 
 }  // namespace system
 }  // namespace mojo