From 48a714abd0eb35231000fb36415c9858182b592e Mon Sep 17 00:00:00 2001 From: Matthieu Dorier Date: Fri, 3 Nov 2017 11:30:59 +0100 Subject: [PATCH] put aio directory in client directory --- src/Makefile.subdir | 4 ++-- src/{ => client}/aio/completion.c | 2 +- src/{ => client}/aio/completion.h | 0 src/client/write-op.c | 2 +- src/io-chain/write-op-impl.c | 1 - tests/mobject-client-test.c | 8 ++------ 6 files changed, 6 insertions(+), 11 deletions(-) rename src/{ => client}/aio/completion.c (98%) rename src/{ => client}/aio/completion.h (100%) diff --git a/src/Makefile.subdir b/src/Makefile.subdir index 9dbb1c3..a4b3706 100644 --- a/src/Makefile.subdir +++ b/src/Makefile.subdir @@ -1,5 +1,5 @@ noinst_HEADERS += \ - src/aio/completion.h \ + src/client/aio/completion.h \ src/client/io-context.h \ src/client/cluster-handle.h \ src/io-chain/args-read-actions.h \ @@ -46,7 +46,7 @@ src_io_chain_libio_chain_la_SOURCES = src/io-chain/prepare-read-op.c \ src_client_libmobject_store_la_SOURCES = \ - src/aio/completion.c \ + src/client/aio/completion.c \ src/client/io-context.c \ src/client/read-op.c \ src/client/write-op.c \ diff --git a/src/aio/completion.c b/src/client/aio/completion.c similarity index 98% rename from src/aio/completion.c rename to src/client/aio/completion.c index f74906e..5e92655 100644 --- a/src/aio/completion.c +++ b/src/client/aio/completion.c @@ -7,7 +7,7 @@ #include #include "mobject-store-config.h" #include "libmobject-store.h" -#include "src/aio/completion.h" +#include "src/client/aio/completion.h" #include "src/util/log.h" int mobject_store_aio_create_completion(void *cb_arg, diff --git a/src/aio/completion.h b/src/client/aio/completion.h similarity index 100% rename from src/aio/completion.h rename to src/client/aio/completion.h diff --git a/src/client/write-op.c b/src/client/write-op.c index cafd5ef..044eb16 100644 --- a/src/client/write-op.c +++ b/src/client/write-op.c @@ -9,7 +9,7 @@ #include "mobject-store-config.h" #include "libmobject-store.h" #include "src/io-chain/write-op-impl.h" -#include "src/aio/completion.h" +#include "src/client/aio/completion.h" #include "src/util/utlist.h" #include "src/util/log.h" diff --git a/src/io-chain/write-op-impl.c b/src/io-chain/write-op-impl.c index 13dfddf..3270a60 100644 --- a/src/io-chain/write-op-impl.c +++ b/src/io-chain/write-op-impl.c @@ -9,7 +9,6 @@ #include "mobject-store-config.h" #include "libmobject-store.h" #include "src/io-chain/write-op-impl.h" -#include "src/aio/completion.h" #include "src/util/utlist.h" #include "src/util/log.h" diff --git a/tests/mobject-client-test.c b/tests/mobject-client-test.c index 22a1e25..5f0d104 100644 --- a/tests/mobject-client-test.c +++ b/tests/mobject-client-test.c @@ -8,13 +8,9 @@ int main(int argc, char** argv) { mobject_store_t cluster; mobject_store_create(&cluster, "admin"); - mobject_store_connect(cluster); - mobject_store_ioctx_t ioctx; - mobject_store_ioctx_create(cluster, "my-object-pool", &ioctx); - char buffer[256]; unsigned i; for(i=0; i<256; i++) buffer[i] = 'A'+(i % 26); @@ -46,9 +42,9 @@ int main(int argc, char** argv) mobject_store_write_op_omap_set(write_op, keys, values, val_sizes, 5); // Add a omap_rm_keys" operation mobject_store_write_op_omap_rm_keys(write_op, keys, 5); - + fprintf(stderr,"FFF\n"); mobject_store_write_op_operate(write_op, ioctx, "test-object", NULL, LIBMOBJECT_OPERATION_NOFLAG); - + fprintf(stderr,"GGG\n"); mobject_store_release_write_op(write_op); } -- 2.26.2