librbd: add set_snap and I/O to the C API

diff --git a/src/include/rbd/librbd.h b/src/include/rbd/librbd.h
index 362aac0933967c5add3d39903864b64ad4dc8aa7..c038a2aa405f4c965a69e1a5394077054cf89b6a 100644 (file)
--- a/src/include/rbd/librbd.h
+++ b/src/include/rbd/librbd.h
@@ -83,6 +83,19 @@ int set_snap(rbd_image_t image, const char *snapname);
 /* lower level access */
 void get_rados_pools(rbd_pool_t pool, rados_pool_t *md_pool, rados_pool_t *data_pool);
 
+/* I/O */
+typedef void *rbd_completion_t;
+typedef void (*rbd_callback_t)(rbd_completion_t cb, void *arg);
+int rbd_read(rbd_image_t image, off_t ofs, size_t len, char *buf);
+int rbd_read_iterate(rbd_image_t image, off_t ofs, size_t len,
+                    int (*cb)(off_t, size_t, const char *, void *), void *arg);
+int rbd_write(rbd_image_t image, off_t ofs, size_t len, const char *buf);
+int rbd_aio_create_completion(void *cb_arg, rbd_callback_t complete_cb, rbd_completion_t *c);
+int rbd_aio_write(rbd_image_t image, off_t off, size_t len, const char *buf, rbd_completion_t c);
+int rbd_aio_wait_for_complete(rbd_completion_t c);
+int rbd_aio_get_return_value(rbd_completion_t c);
+void rbd_aio_release(rbd_completion_t c);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/librbd.cc b/src/librbd.cc
index cc891e2b41bf8eee5cb5aa3610b01eeb39002b98..544c4d37a2fde42c786ddd84aaa1d99451596b31 100644 (file)
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -1560,3 +1560,64 @@ extern "C" size_t rbd_list_snaps(rbd_image_t image, rbd_snap_info_t *snaps, size
   }
   return cpp_snaps.size();
 }
+
+extern "C" int set_snap(rbd_image_t image, const char *snapname)
+{
+  librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
+  return rbd_client->set_snap(ictx->pctx, ictx, snapname);
+}
+
+/* I/O */
+extern "C" int rbd_read(rbd_image_t image, off_t ofs, size_t len, char *buf)
+{
+  librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
+  return rbd_client->read(ictx->pctx, ictx, ofs, len, buf);
+}
+
+extern "C" int rbd_read_iterate(rbd_image_t image, off_t ofs, size_t len,
+                               int (*cb)(off_t, size_t, const char *, void *), void *arg)
+{
+  librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
+  return rbd_client->read_iterate(ictx->pctx, ictx, ofs, len, cb, arg);
+}
+
+extern "C" int rbd_write(rbd_image_t image, off_t ofs, size_t len, const char *buf)
+{
+  librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
+  return rbd_client->write(ictx->pctx, ictx, ofs, len, buf);
+}
+
+extern "C" int rbd_aio_create_completion(void *cb_arg, rbd_callback_t complete_cb, rbd_completion_t *c)
+{
+  librbd::RBDClient::AioCompletion *comp = rbd_client->aio_create_completion(cb_arg, complete_cb);
+  *c = (rbd_completion_t) comp;
+  return 0;
+}
+
+extern "C" int rbd_aio_write(rbd_image_t image, off_t off, size_t len, const char *buf, rbd_completion_t c)
+{
+  librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
+  librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c;
+  return rbd_client->aio_write(ictx->pctx, ictx, off, len, buf, (librbd::RBDClient::AioCompletion *)comp->pc);
+}
+
+extern "C" int rbd_aio_wait_for_complete(rbd_completion_t c)
+{
+  librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c;
+  librbd::RBDClient::AioCompletion *ac = (librbd::RBDClient::AioCompletion *)comp->pc;
+  return ac->wait_for_complete();
+}
+
+extern "C" int rbd_aio_get_return_value(rbd_completion_t c)
+{
+  librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c;
+  librbd::RBDClient::AioCompletion *ac = (librbd::RBDClient::AioCompletion *)comp->pc;
+  return ac->get_return_value();
+}
+
+extern "C" void rbd_aio_release(rbd_completion_t c)
+{
+  librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c;
+  librbd::RBDClient::AioCompletion *ac = (librbd::RBDClient::AioCompletion *)comp->pc;
+  ac->release();
+}