Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f

mojo/public/cpp/system/handle.h

Index: mojo/public/cpp/system/handle.h
diff --git a/mojo/public/cpp/system/handle.h b/mojo/public/cpp/system/handle.h
index d1f287bded45ea7595a77e9c4efad5a35dde4b8a..3549854562ad072239c7213bc3a41b764ac3b23a 100644
--- a/mojo/public/cpp/system/handle.h
+++ b/mojo/public/cpp/system/handle.h
@@ -186,12 +186,21 @@ typedef ScopedHandleBase<Handle> ScopedHandle;
 static_assert(sizeof(ScopedHandle) == sizeof(Handle),
               "Bad size for C++ ScopedHandle");
 
+// TODO(jimbe): Remove this function
 inline MojoResult Wait(Handle handle,
                        MojoHandleSignals signals,
                        MojoDeadline deadline) {
   return MojoWait(handle.value(), signals, deadline);
 }
 
+inline MojoResult Wait(Handle handle,
+                       MojoHandleSignals signals,
+                       MojoDeadline deadline,
+                       MojoHandleSignalsState* signals_state) {
+  return MojoNewWait(handle.value(), signals, deadline, signals_state);
+}
+
+// TODO(jimbe): Remove this function
 // |HandleVectorType| and |FlagsVectorType| should be similar enough to
 // |std::vector<Handle>| and |std::vector<MojoHandleSignals>|, respectively:
 //  - They should have a (const) |size()| method that returns an unsigned type.
@@ -218,6 +227,96 @@ inline MojoResult WaitMany(const HandleVectorType& handles,
       deadline);
 }
 
+const uint32_t kInvalidWaitManyIndexValue = static_cast<uint32_t>(-1);
+
+// Simplify the interpretation of the output from |MojoWaitMany()|.
+class WaitManyResult {
+ public:
+  explicit WaitManyResult(MojoResult mojo_wait_many_result)
+      : result(mojo_wait_many_result), index(kInvalidWaitManyIndexValue) {}
+
+  WaitManyResult(MojoResult mojo_wait_many_result, uint32_t result_index)
+      : result(mojo_wait_many_result), index(result_index) {}
+
+  // A valid handle index is always returned if |WaitMany()| succeeds, but may
+  // or may not be returned if |WaitMany()| returns an error. Use this helper
+  // function to check if |index| is a valid index into the handle array.
+  bool IsIndexValid() const { return index != kInvalidWaitManyIndexValue; }
+
+  // The |signals_states| array is always returned by |WaitMany()| on success,
+  // but may or may not be returned if |WaitMany()| returns an error. Use this
+  // helper function to check if |signals_states| holds valid data.
+  bool AreSignalsStatesValid() const {
+    return result != MOJO_RESULT_INVALID_ARGUMENT &&
+           result != MOJO_RESULT_RESOURCE_EXHAUSTED;
+  }
+
+  MojoResult result;
+  uint32_t index;
+};
+
+// |HandleVectorType| and |FlagsVectorType| should be similar enough to
+// |std::vector<Handle>| and |std::vector<MojoHandleSignals>|, respectively:
+//  - They should have a (const) |size()| method that returns an unsigned type.
+//  - They must provide contiguous storage, with access via (const) reference to
+//    that storage provided by a (const) |operator[]()| (by reference).
+template <class HandleVectorType,
+          class FlagsVectorType,
+          class SignalsStateVectorType>
+inline WaitManyResult WaitMany(const HandleVectorType& handles,
+                               const FlagsVectorType& signals,
+                               MojoDeadline deadline,
+                               SignalsStateVectorType* signals_states) {
+  if (signals.size() != handles.size() ||
+      (signals_states && signals_states->size() != signals.size()))
+    return WaitManyResult(MOJO_RESULT_INVALID_ARGUMENT);
+  if (handles.size() >= kInvalidWaitManyIndexValue)
+    return WaitManyResult(MOJO_RESULT_RESOURCE_EXHAUSTED);
+
+  if (handles.size() == 0) {
+    return WaitManyResult(
+        MojoNewWaitMany(nullptr, nullptr, 0, deadline, nullptr, nullptr));
+  }
+
+  uint32_t result_index = kInvalidWaitManyIndexValue;
+  const Handle& first_handle = handles[0];
+  const MojoHandleSignals& first_signals = signals[0];
+  MojoHandleSignalsState* first_state =
+      signals_states ? &(*signals_states)[0] : nullptr;
+  MojoResult result =
+      MojoNewWaitMany(reinterpret_cast<const MojoHandle*>(&first_handle),
+                      &first_signals, static_cast<uint32_t>(handles.size()),
+                      deadline, &result_index, first_state);
+  return WaitManyResult(result, result_index);
+}
+
+// C++ 4.10, regarding pointer conversion, says that an integral null pointer
+// constant can be converted to |std::nullptr_t| (which is a typedef for
+// |decltype(nullptr)|). The opposite direction is not allowed.
+template <class HandleVectorType, class FlagsVectorType>
+inline WaitManyResult WaitMany(const HandleVectorType& handles,
+                               const FlagsVectorType& signals,
+                               MojoDeadline deadline,
+                               decltype(nullptr) signals_states) {
+  if (signals.size() != handles.size())
+    return WaitManyResult(MOJO_RESULT_INVALID_ARGUMENT);
+  if (handles.size() >= kInvalidWaitManyIndexValue)
+    return WaitManyResult(MOJO_RESULT_OUT_OF_RANGE);
+
+  if (handles.size() == 0) {
+    return WaitManyResult(
+        MojoNewWaitMany(nullptr, nullptr, 0, deadline, nullptr, nullptr));
+  }
+
+  uint32_t result_index = kInvalidWaitManyIndexValue;
+  const Handle& first_handle = handles[0];
+  const MojoHandleSignals& first_signals = signals[0];
+  MojoResult result = MojoNewWaitMany(
+      reinterpret_cast<const MojoHandle*>(&first_handle), &first_signals,
+      static_cast<uint32_t>(handles.size()), deadline, &result_index, nullptr);
+  return WaitManyResult(result, result_index);
+}
+
 // |Close()| takes ownership of the handle, since it'll invalidate it.
 // Note: There's nothing to do, since the argument will be destroyed when it
 // goes out of scope.