Mojo: Armed Watchers

mojo/edk/system/data_pipe_producer_dispatcher.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/data_pipe_producer_dispatcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 79 matching lines @@
 Dispatcher::Type DataPipeProducerDispatcher::GetType() const {
   return Type::DATA_PIPE_PRODUCER;
 }
 
 MojoResult DataPipeProducerDispatcher::Close() {
   base::AutoLock lock(lock_);
   DVLOG(1) << "Closing data pipe producer " << pipe_id_;
   return CloseNoLock();
 }
 
-MojoResult DataPipeProducerDispatcher::Watch(
+MojoResult DataPipeProducerDispatcher::RegisterWatcher(
     MojoHandleSignals signals,
     const Watcher::WatchCallback& callback,
     uintptr_t context) {
   base::AutoLock lock(lock_);
 
   if (is_closed_ || in_transit_)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
-  return awakable_list_.AddWatcher(
-      signals, callback, context, GetHandleSignalsStateNoLock());
+  return watchers_.Add(signals, callback, context,
+                       GetHandleSignalsStateNoLock());
 }
 
-MojoResult DataPipeProducerDispatcher::CancelWatch(uintptr_t context) {
+MojoResult DataPipeProducerDispatcher::ArmWatcher(uintptr_t context) {
   base::AutoLock lock(lock_);
 
   if (is_closed_ || in_transit_)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
-  return awakable_list_.RemoveWatcher(context);
+  return watchers_.Arm(context, GetHandleSignalsStateNoLock());
+}
+
+MojoResult DataPipeProducerDispatcher::UnregisterWatcher(uintptr_t context) {
+  base::AutoLock lock(lock_);
+
+  if (is_closed_ || in_transit_)
+    return MOJO_RESULT_INVALID_ARGUMENT;
+
+  return watchers_.Remove(context);
 }
 
 MojoResult DataPipeProducerDispatcher::WriteData(const void* elements,
                                                  uint32_t* num_bytes,
                                                  MojoWriteDataFlags flags) {
   base::AutoLock lock(lock_);
   if (!shared_ring_buffer_ || in_transit_)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   if (in_two_phase_write_)
@@ skipping 40 matching lines @@
   memcpy(data + write_offset_, source, tail_bytes_to_write);
   if (head_bytes_to_write > 0)
     memcpy(data, source + tail_bytes_to_write, head_bytes_to_write);
 
   DCHECK_LE(num_bytes_to_write, available_capacity_);
   available_capacity_ -= num_bytes_to_write;
   write_offset_ = (write_offset_ + num_bytes_to_write) %
       options_.capacity_num_bytes;
 
   HandleSignalsState new_state = GetHandleSignalsStateNoLock();
-  if (!new_state.equals(old_state))
+  if (!new_state.equals(old_state)) {
     awakable_list_.AwakeForStateChange(new_state);
+    watchers_.NotifyState(new_state);
+  }
 
   base::AutoUnlock unlock(lock_);
   NotifyWrite(num_bytes_to_write);
 
   return MOJO_RESULT_OK;
 }
 
 MojoResult DataPipeProducerDispatcher::BeginWriteData(
     void** buffer,
     uint32_t* buffer_num_bytes,
@@ skipping 50 matching lines @@
 
     base::AutoUnlock unlock(lock_);
     NotifyWrite(num_bytes_written);
   }
 
   in_two_phase_write_ = false;
 
   // If we're now writable, we *became* writable (since we weren't writable
   // during the two-phase write), so awake producer awakables.
   HandleSignalsState new_state = GetHandleSignalsStateNoLock();
-  if (new_state.satisfies(MOJO_HANDLE_SIGNAL_WRITABLE))
+  if (new_state.satisfies(MOJO_HANDLE_SIGNAL_WRITABLE)) {
     awakable_list_.AwakeForStateChange(new_state);
+    watchers_.NotifyState(new_state);
+  }
 
   return rv;
 }
 
 HandleSignalsState DataPipeProducerDispatcher::GetHandleSignalsState() const {
   base::AutoLock lock(lock_);
   return GetHandleSignalsStateNoLock();
 }
 
 MojoResult DataPipeProducerDispatcher::AddAwakable(
@@ skipping 85 matching lines @@
   in_transit_ = false;
   ignore_result(buffer_handle_for_transit_.release());
   CloseNoLock();
 }
 
 void DataPipeProducerDispatcher::CancelTransit() {
   base::AutoLock lock(lock_);
   DCHECK(in_transit_);
   in_transit_ = false;
   buffer_handle_for_transit_.reset();
-  awakable_list_.AwakeForStateChange(GetHandleSignalsStateNoLock());
+
+  HandleSignalsState state = GetHandleSignalsStateNoLock();
+  awakable_list_.AwakeForStateChange(state);
+  watchers_.NotifyState(state);
 }
 
 // static
 scoped_refptr<DataPipeProducerDispatcher>
 DataPipeProducerDispatcher::Deserialize(const void* data,
                                         size_t num_bytes,
                                         const ports::PortName* ports,
                                         size_t num_ports,
                                         PlatformHandle* handles,
                                         size_t num_handles) {
@@ skipping 63 matching lines @@
 
 MojoResult DataPipeProducerDispatcher::CloseNoLock() {
   lock_.AssertAcquired();
   if (is_closed_ || in_transit_)
     return MOJO_RESULT_INVALID_ARGUMENT;
   is_closed_ = true;
   ring_buffer_mapping_.reset();
   shared_ring_buffer_ = nullptr;
 
   awakable_list_.CancelAll();
+  watchers_.NotifyClosed();
   if (!transferred_) {
     base::AutoUnlock unlock(lock_);
     node_controller_->ClosePort(control_port_);
   }
 
   return MOJO_RESULT_OK;
 }
 
 HandleSignalsState DataPipeProducerDispatcher::GetHandleSignalsStateNoLock()
     const {
@@ skipping 81 matching lines @@
                  << m->num_bytes << " bytes were read. [control_port="
                  << control_port_.name() << "]";
 
         available_capacity_ += m->num_bytes;
       }
     } while (message);
   }
 
   if (peer_closed_ != was_peer_closed ||
       available_capacity_ != previous_capacity) {
-    awakable_list_.AwakeForStateChange(GetHandleSignalsStateNoLock());
+    HandleSignalsState state = GetHandleSignalsStateNoLock();
+    awakable_list_.AwakeForStateChange(state);
+    watchers_.NotifyState(state);
   }
 }
 
 }  // namespace edk
 }  // namespace mojo