Mojo: Armed Watchers

mojo/edk/embedder/entrypoints.cc

Index: mojo/edk/embedder/entrypoints.cc
diff --git a/mojo/edk/embedder/entrypoints.cc b/mojo/edk/embedder/entrypoints.cc
index f09c5e149f65062545f118f85af1e625c53c3f61..08c96eedf10283da913af0928c1e5584a2c8224a 100644
--- a/mojo/edk/embedder/entrypoints.cc
+++ b/mojo/edk/embedder/entrypoints.cc
@@ -45,15 +45,19 @@ MojoResult MojoWaitManyImpl(const MojoHandle* handles,
                           signals_states);
 }
 
-MojoResult MojoWatchImpl(MojoHandle handle,
-                         MojoHandleSignals signals,
-                         MojoWatchCallback callback,
-                         uintptr_t context) {
-  return g_core->Watch(handle, signals, callback, context);
+MojoResult MojoRegisterWatcherImpl(MojoHandle handle,
+                                   MojoHandleSignals signals,
+                                   MojoWatchCallback callback,
+                                   uintptr_t context) {
+  return g_core->RegisterWatcher(handle, signals, callback, context);
 }
 
-MojoResult MojoCancelWatchImpl(MojoHandle handle, uintptr_t context) {
-  return g_core->CancelWatch(handle, context);
+MojoResult MojoArmWatcherImpl(MojoHandle handle, uintptr_t context) {
+  return g_core->ArmWatcher(handle, context);
+}
+
+MojoResult MojoUnregisterWatcherImpl(MojoHandle handle, uintptr_t context) {
+  return g_core->UnregisterWatcher(handle, context);
 }
 
 MojoResult MojoAllocMessageImpl(uint32_t num_bytes,
@@ -287,8 +291,9 @@ MojoSystemThunks MakeSystemThunks() {
                                     MojoAddHandleImpl,
                                     MojoRemoveHandleImpl,
                                     MojoGetReadyHandlesImpl,
-                                    MojoWatchImpl,
-                                    MojoCancelWatchImpl,
+                                    MojoRegisterWatcherImpl,
+                                    MojoArmWatcherImpl,
+                                    MojoUnregisterWatcherImpl,
                                     MojoFuseMessagePipesImpl,
                                     MojoWriteMessageNewImpl,
                                     MojoReadMessageNewImpl,