Update testrados, rename functions in librados.cc

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 51fee91dd1a400cbf418129e70124623cdf4c2a6..27906f0cc30d0c9cbcf58d87452fb8ee5d7d3d7f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -248,13 +248,13 @@ rados_LDADD = librados.la -lpthread -lm $(CRYPTOPP_LIBS)
 bin_PROGRAMS += rados
 
 if WITH_DEBUG
-#testrados_SOURCES = testrados.c
-#testrados_LDADD = librados.la -lpthread -lm $(CRYPTOPP_LIBS)
-#testradospp_SOURCES = testradospp.cc
-#testradospp_LDADD = librados.la -lpthread -lm
-#radosacl_SOURCES = radosacl.cc
-#radosacl_LDADD = librados.la -lpthread -lm $(CRYPTOPP_LIBS)
-#bin_PROGRAMS += testrados testradospp radosacl
+testrados_SOURCES = testrados.c
+testrados_LDADD = librados.la -lpthread -lm $(CRYPTOPP_LIBS)
+testradospp_SOURCES = testradospp.cc
+testradospp_LDADD = librados.la -lpthread -lm
+radosacl_SOURCES = radosacl.cc
+radosacl_LDADD = librados.la -lpthread -lm $(CRYPTOPP_LIBS)
+bin_PROGRAMS += testrados testradospp radosacl
 endif
 
 rbd_SOURCES = rbd.cc common/fiemap.cc

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 3d01eca5e106cffe62b49249d5326b5af07cdb22..00c27470620e23fa9be2133a2008f16eadffa3ae 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -105,7 +105,7 @@ int rados_pool_set_auid(rados_pool_t pool, uint64_t auid);
 
 /* objects */
 int rados_objects_list_open(rados_pool_t pool, rados_list_ctx_t *ctx);
-int rados_object_list_next(rados_list_ctx_t ctx, const char **entry);
+int rados_objects_list_next(rados_list_ctx_t ctx, const char **entry);
 void rados_objects_list_close(rados_list_ctx_t ctx);
 
 

diff --git a/src/librados.cc b/src/librados.cc
index 0e9cd71c544bdfd6903f74015f33d21f5c6ce326..511268218e2f03fa4d2e97ac993dd993215f8f98 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2429,7 +2429,7 @@ extern "C" int rados_conf_get(rados_t cluster, const char *option, char **buf, i
   return g_conf.get_val(option, buf, len);
 }
 
-extern "C" int rados_lookup_pool(rados_t cluster, const char *name)
+extern "C" int rados_pool_lookup(rados_t cluster, const char *name)
 {
   RadosClient *radosp = (RadosClient *)cluster;
   return radosp->lookup_pool(name);
@@ -2569,7 +2569,8 @@ extern "C" int rados_pool_create(rados_t cluster, const char *name)
   return radosp->create_pool(sname);
 }
 
-extern "C" int rados_pool_create_with_auid(rados_t cluster, const char *name, uint64_t auid)
+extern "C" int rados_pool_create_with_auid(rados_t cluster, const char *name,
+                                          uint64_t auid)
 {
   RadosClient *radosp = (RadosClient *)cluster;
   string sname(name);
@@ -2584,8 +2585,8 @@ extern "C" int rados_pool_create_with_crush_rule(rados_t cluster, const char *na
   return radosp->create_pool(sname, 0, crush_rule);
 }
 
-extern "C" int rados_pool_create_with_all(rados_t cluster, const char *name, uint64_t auid,
-                                         __u8 crush_rule)
+extern "C" int rados_pool_create_with_all(rados_t cluster, const char *name,
+                                         uint64_t auid, __u8 crush_rule)
 {
   RadosClient *radosp = (RadosClient *)cluster;
   string sname(name);
@@ -2606,19 +2607,19 @@ extern "C" int rados_pool_change_auid(rados_pool_t pool, uint64_t auid)
 
 // snaps
 
-extern "C" int rados_snap_create(rados_pool_t pool, const char *snapname)
+extern "C" int rados_pool_snap_create(rados_pool_t pool, const char *snapname)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   return ctx->client->snap_create(ctx, snapname);
 }
 
-extern "C" int rados_snap_remove(rados_pool_t pool, const char *snapname)
+extern "C" int rados_pool_snap_remove(rados_pool_t pool, const char *snapname)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   return ctx->client->snap_remove(ctx, snapname);
 }
 
-extern "C" int rados_snap_rollback_object(rados_pool_t pool,
+extern "C" int rados_pool_snap_rollback_object(rados_pool_t pool,
                                          const char *oid,
                                          const char *snapname)
 {
@@ -2626,21 +2627,22 @@ extern "C" int rados_snap_rollback_object(rados_pool_t pool,
   return ctx->client->snap_rollback_object(ctx, oid, snapname);
 }
 
-extern "C" int rados_selfmanaged_snap_create(rados_pool_t pool,
+extern "C" int rados_pool_selfmanaged_snap_create(rados_pool_t pool,
                                             uint64_t *snapid)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   return ctx->client->selfmanaged_snap_create(ctx, snapid);
 }
 
-extern "C" int rados_selfmanaged_snap_remove(rados_pool_t pool,
+extern "C" int rados_pool_selfmanaged_snap_remove(rados_pool_t pool,
                                             uint64_t snapid)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   return ctx->client->selfmanaged_snap_remove(ctx, snapid);
 }
 
-extern "C" int rados_snap_list(rados_pool_t pool, rados_snap_t *snaps, int maxlen)
+extern "C" int rados_pool_snap_list(rados_pool_t pool, rados_snap_t *snaps,
+                                   int maxlen)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   vector<uint64_t> snapvec;
@@ -2655,13 +2657,15 @@ extern "C" int rados_snap_list(rados_pool_t pool, rados_snap_t *snaps, int maxle
   return -ERANGE;
 }
 
-extern "C" int rados_snap_lookup(rados_pool_t pool, const char *name, rados_snap_t *id)
+extern "C" int rados_pool_snap_lookup(rados_pool_t pool, const char *name,
+                                     rados_snap_t *id)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   return ctx->client->snap_lookup(ctx, name, (uint64_t *)id);
 }
 
-extern "C" int rados_snap_get_name(rados_pool_t pool, rados_snap_t id, char *name, int maxlen)
+extern "C" int rados_pool_snap_get_name(rados_pool_t pool, rados_snap_t id,
+                                       char *name, int maxlen)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   std::string sname;
@@ -2675,7 +2679,8 @@ extern "C" int rados_snap_get_name(rados_pool_t pool, rados_snap_t id, char *nam
 }
 
 
-extern "C" int rados_getxattr(rados_pool_t pool, const char *o, const char *name, char *buf, size_t len)
+extern "C" int rados_getxattr(rados_pool_t pool, const char *o, const char *name,
+                             char *buf, size_t len)
 {
   RadosClient::PoolCtx *ctx = (RadosClient::PoolCtx *)pool;
   int ret;

diff --git a/src/testrados.c b/src/testrados.c
index 1e7dfe3850e379aabff39346233da6f03af7703c..52a4b23803e9e4e9eb68800e2d0935e1076e8db2 100644 (file)
--- a/src/testrados.c
+++ b/src/testrados.c
@@ -23,7 +23,7 @@ int main(int argc, const char **argv)
   int i, r;
   rados_t cl;
 
-  if (rados_init(&cl) < 0) {
+  if (rados_create(&cl, NULL) < 0) {
     printf("error initializing\n");
     exit(1);
   }
@@ -34,33 +34,33 @@ int main(int argc, const char **argv)
   }
 
   /* create a pool */
-  r = rados_create_pool("foo");
-  printf("rados_create_pool = %d\n", r);
+  r = rados_pool_create(cl, "foo");
+  printf("rados_pool_create = %d\n", r);
 
   rados_pool_t pool;
-  r = rados_open_pool("foo", &pool);
-  printf("rados_open_pool = %d, pool = %p\n", r, pool);
+  r = rados_pool_open(cl, "foo", &pool);
+  printf("rados_pool_open = %d, pool = %p\n", r, pool);
 
   /* stat */
   struct rados_pool_stat_t st;
-  r = rados_stat_pool(pool, &st);
-  printf("rados_stat_pool = %d, %lld KB, %lld objects\n", r, (long long)st.num_kb, (long long)st.num_objects);
+  r = rados_pool_stat(pool, &st);
+  printf("rados_pool_stat = %d, %lld KB, %lld objects\n", r, (long long)st.num_kb, (long long)st.num_objects);
 
   /* snapshots */
-  r = rados_snap_create(pool, "snap1");
-  printf("rados_snap_create snap1 = %d\n", r);
+  r = rados_pool_snap_create(pool, "snap1");
+  printf("rados_pool_snap_create snap1 = %d\n", r);
   rados_snap_t snaps[10];
-  r = rados_snap_list(pool, snaps, 10);
+  r = rados_pool_snap_list(pool, snaps, 10);
   for (i=0; i<r; i++) {
     char name[100];
-    rados_snap_get_name(pool, snaps[i], name, sizeof(name));
-    printf("rados_snap_list got snap %lld %s\n", (long long)snaps[i], name);
+    rados_pool_snap_get_name(pool, snaps[i], name, sizeof(name));
+    printf("rados_pool_snap_list got snap %lld %s\n", (long long)snaps[i], name);
   }
   rados_snap_t snapid;
-  r = rados_snap_lookup(pool, "snap1", &snapid);
-  printf("rados_snap_lookup snap1 got %lld, result %d\n", (long long)snapid, r);
-  r = rados_snap_remove(pool, "snap1");
-  printf("rados_snap_remove snap1 = %d\n", r);
+  r = rados_pool_snap_lookup(pool, "snap1", &snapid);
+  printf("rados_pool_snap_lookup snap1 got %lld, result %d\n", (long long)snapid, r);
+  r = rados_pool_snap_remove(pool, "snap1");
+  printf("rados_pool_snap_remove snap1 = %d\n", r);
 
   /* sync io */
   time_t tm;
@@ -115,21 +115,21 @@ int main(int argc, const char **argv)
 
   /* list objects */
   rados_list_ctx_t h;
-  r = rados_list_objects_open(pool, &h);
+  r = rados_objects_list_open(pool, &h);
   printf("rados_list_objects_open = %d, h = %p\n", r, h);
   const char *poolname;
-  while (rados_list_objects_next(h, &poolname) == 0)
+  while (rados_objects_list_next(h, &poolname) == 0)
     printf("rados_list_objects_next got object '%s'\n", poolname);
-  rados_list_objects_close(h);
+  rados_objects_list_close(h);
 
   /* stat */
-  r = rados_stat_pool(pool, &st);
+  r = rados_pool_stat(pool, &st);
   printf("rados_stat_pool = %d, %lld KB, %lld objects\n", r, (long long)st.num_kb, (long long)st.num_objects);
 
   /* delete a pool */
-  r = rados_delete_pool(pool);
+  r = rados_pool_delete(pool);
   printf("rados_delete_pool = %d\n", r);  
-  r = rados_close_pool(pool);
+  r = rados_pool_close(pool);
 
   rados_destroy(cl);