librados: rename cookie to handle in api

diff --git a/src/include/librados.h b/src/include/librados.h
index 9152437a85485f31a68f704d85c6b73dbeb3e3d2..1cb64fc1052877f0bbca735cbdfb3fe34e80fc5b 100644 (file)
--- a/src/include/librados.h
+++ b/src/include/librados.h
@@ -120,9 +120,9 @@ int rados_aio_read(rados_pool_t pool, const char *oid,
 
 /* watch/notify */
 typedef void (*rados_watchcb_t)(uint8_t opcode, uint64_t ver, void *arg);
-int rados_watch(rados_pool_t pool, const char *o, uint64_t ver, uint64_t *cookie,
+int rados_watch(rados_pool_t pool, const char *o, uint64_t ver, uint64_t *handle,
                 rados_watchcb_t watchcb, void *arg);
-int rados_unwatch(rados_pool_t pool, const char *o, uint64_t cookie);
+int rados_unwatch(rados_pool_t pool, const char *o, uint64_t handle);
 int rados_notify(rados_pool_t pool, const char *o, uint64_t ver);
 
 #ifdef __cplusplus

diff --git a/src/include/librados.hpp b/src/include/librados.hpp
index 0af7f72e371a3532d666eda15840439f93783dd5..00cc10aea323b5ded9e54bbaf1bcc64c20ba77a0 100644 (file)
--- a/src/include/librados.hpp
+++ b/src/include/librados.hpp
@@ -150,8 +150,8 @@ public:
   };
 
   // watch/notify
-  int watch(pool_t pool, const string& o, uint64_t ver, uint64_t *cookie, librados::Rados::WatchCtx *ctx);
-  int unwatch(pool_t pool, const string& o, uint64_t cookie);
+  int watch(pool_t pool, const string& o, uint64_t ver, uint64_t *handle, librados::Rados::WatchCtx *ctx);
+  int unwatch(pool_t pool, const string& o, uint64_t handle);
   int notify(pool_t pool, const string& o, uint64_t ver);
 };
 

diff --git a/src/librados.cc b/src/librados.cc
index ab2210be207841b3766b762d7167a1cc754b50e9..bce1e026df87c0790f2f590f394ea53f2fabe4a0 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2168,8 +2168,9 @@ int Rados::watch(pool_t pool, const string& o,
   return client->watch(*(RadosClient::PoolCtx *)pool, oid, ver, cookie, ctx);
 }
 
-int Rados::unwatch(pool_t pool, const string& o, uint64_t cookie)
+int Rados::unwatch(pool_t pool, const string& o, uint64_t handle)
 {
+  uint64_t cookie = handle;
   if (!client)
     return -EINVAL;
   object_t oid(o);
@@ -2671,17 +2672,19 @@ struct C_WatchCB : public librados::Rados::WatchCtx {
   }
 };
 
-int rados_watch(rados_pool_t pool, const char *o, uint64_t ver, uint64_t *cookie,
+int rados_watch(rados_pool_t pool, const char *o, uint64_t ver, uint64_t *handle,
                 rados_watchcb_t watchcb, void *arg)
 {
+  uint64_t *cookie = handle;
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   object_t oid(o);
   C_WatchCB *wc = new C_WatchCB(watchcb, arg);
   return radosp->watch(*ctx, oid, ver, cookie, wc);
 }
 
-int rados_unwatch(rados_pool_t pool, const char *o, uint64_t cookie)
+int rados_unwatch(rados_pool_t pool, const char *o, uint64_t handle)
 {
+  uint64_t cookie = handle;
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   object_t oid(o);
   return radosp->unwatch(*ctx, oid, cookie);