diff --git a/src/aio/completion.c b/src/aio/completion.c index 70313a065b98116991d1db5998c44d4d306ceb54..f74906e02a5ff60e79026da9a776e48dfd57fc3a 100644 --- a/src/aio/completion.c +++ b/src/aio/completion.c @@ -35,7 +35,6 @@ int mobject_store_aio_create_completion(void *cb_arg, int mobject_store_aio_wait_for_complete(mobject_store_completion_t c) { - int r; if(c == MOBJECT_COMPLETION_NULL) { MOBJECT_LOG("Warning: passing NULL to mobject_store_aio_wait_for_complete"); return -1; @@ -48,6 +47,7 @@ int mobject_store_aio_wait_for_complete(mobject_store_completion_t c) c->state = COMPLETION_JOINED; } +// int r; // int* val_ptr = (int*)0; // r = ABT_eventual_wait(c->eventual, (void**)(&val_ptr)); // MOBJECT_ASSERT(r == ABT_SUCCESS, "ABT_eventual_wait failed"); @@ -104,7 +104,7 @@ void mobject_store_aio_release(mobject_store_completion_t c) int r; if(c == MOBJECT_COMPLETION_NULL) return; //r = ABT_eventual_free(c->eventual); - MOBJECT_ASSERT(r == ABT_SUCCESS, "ABT_eventual_free failed"); + //MOBJECT_ASSERT(r == ABT_SUCCESS, "ABT_eventual_free failed"); r = ABT_rwlock_free(c->lock); MOBJECT_ASSERT(r == ABT_SUCCESS, "ABT_rwlock_free failed"); free(c); diff --git a/src/client/io-context.c b/src/client/io-context.c index 07ec518e9140c973274f7f2aeecdcc081d8f9f62..da8f406c930f823786e235fc393567a8ebfc9554 100644 --- a/src/client/io-context.c +++ b/src/client/io-context.c @@ -14,6 +14,7 @@ int mobject_store_ioctx_create( // TODO take mid from cluster parameter *ioctx = (mobject_store_ioctx_t)calloc(1, sizeof(**ioctx)); (*ioctx)->pool_name = strdup(pool_name); + return 0; } void mobject_store_ioctx_destroy(mobject_store_ioctx_t ioctx) diff --git a/src/client/libmobject-store.c b/src/client/libmobject-store.c index 099aa44310df205e0c5b8023944b2588b6c5aa05..0e038a0659b5dab997c9a9c4b50ae2eb1097a0ca 100644 --- a/src/client/libmobject-store.c +++ b/src/client/libmobject-store.c @@ -200,6 +200,7 @@ int mobject_store_write_op_operate(mobject_store_write_op_t write_op, margo_free_output(h,&resp); margo_destroy(h); + return 0; } int mobject_store_read_op_operate(mobject_store_read_op_t read_op, diff --git a/src/client/read-op.c b/src/client/read-op.c index d2ab64b6f3c65aa6413346bb3b12597b7ccff902..b2ca7930e0f9734fc03a77a47f719e94e2770af7 100644 --- a/src/client/read-op.c +++ b/src/client/read-op.c @@ -230,4 +230,5 @@ int mobject_store_aio_read_op_operate(mobject_store_read_op_t read_op, ABT_thread_create(pool, aio_read_op_operate_ult, args, ABT_THREAD_ATTR_NULL, &ult); completion->ult = ult; */ + return 0; } diff --git a/src/io-chain/proc-read-actions.c b/src/io-chain/proc-read-actions.c index db15c4ef792f1264b991caf493109353f655e45e..46df0b48d527ebcbc164b4efe476f41a0e5af4b7 100644 --- a/src/io-chain/proc-read-actions.c +++ b/src/io-chain/proc-read-actions.c @@ -92,7 +92,7 @@ static decode_fn decode_read_action[_READ_OPCODE_END_ENUM_] = { */ hg_return_t hg_proc_mobject_store_read_op_t(hg_proc_t proc, mobject_store_read_op_t* read_op) { - rd_action_base_t elem, tmp; + rd_action_base_t elem; hg_return_t ret = HG_SUCCESS; uintptr_t position = 0; diff --git a/src/io-chain/proc-read-responses.c b/src/io-chain/proc-read-responses.c index 3832ab6f0fde090c2b1a64431ada48c7844afac5..b64bfdb1171915d7cf2e97509acc204c9cb8d625 100644 --- a/src/io-chain/proc-read-responses.c +++ b/src/io-chain/proc-read-responses.c @@ -146,16 +146,16 @@ hg_return_t encode_omap_response(hg_proc_t proc, rd_response_omap_t r) ret = hg_proc_memcpy(proc, &(r->prval), sizeof(r->prval)); if(ret != HG_SUCCESS) return ret; ret = hg_proc_mobject_store_omap_iter_t(proc, &(r->iter)); - if(ret != HG_SUCCESS) return ret; + return ret; } hg_return_t decode_omap_response(hg_proc_t proc, rd_response_omap_t* r) { *r = (rd_response_omap_t)calloc(1, sizeof(**r)); - hg_return_t ret; + hg_return_t ret = HG_SUCCESS; ret = hg_proc_memcpy(proc, &((*r)->prval), sizeof((*r)->prval)); if(ret != HG_SUCCESS) return ret; ret = hg_proc_mobject_store_omap_iter_t(proc, &((*r)->iter)); - if(ret != HG_SUCCESS) return ret; + return ret; } diff --git a/src/io-chain/proc-write-actions.c b/src/io-chain/proc-write-actions.c index d102cea49a1dadc997984235b84d539db3f5cd42..afb0629046d758460c7c21180cd42950cd2b5cf7 100644 --- a/src/io-chain/proc-write-actions.c +++ b/src/io-chain/proc-write-actions.c @@ -142,7 +142,7 @@ static decode_fn decode_write_action[_WRITE_OPCODE_END_ENUM_] = { */ hg_return_t hg_proc_mobject_store_write_op_t(hg_proc_t proc, mobject_store_write_op_t* write_op) { - wr_action_base_t elem, tmp; + wr_action_base_t elem; hg_return_t ret = HG_SUCCESS; uintptr_t position = 0; diff --git a/src/omap-iter/proc-omap-iter.c b/src/omap-iter/proc-omap-iter.c index e9c270a93a8ac6b9b761d22ea4b4ca8118128adf..834944c8245293f64651b5d74c77781d3fe32365 100644 --- a/src/omap-iter/proc-omap-iter.c +++ b/src/omap-iter/proc-omap-iter.c @@ -49,7 +49,7 @@ hg_return_t hg_proc_mobject_store_omap_iter_t(hg_proc_t proc, mobject_store_omap if(ret != HG_SUCCESS) return ret; ret = hg_proc_hg_size_t(proc, &val_size); if(ret != HG_SUCCESS) return ret; - val - (char*)malloc(val_size); + val = (char*)malloc(val_size); ret = hg_proc_memcpy(proc, val, val_size); omap_iter_append(*iter, key, val, val_size); } diff --git a/src/server/mobject-server.c b/src/server/mobject-server.c index a2b10d04bd34926ef5f6de6bf70bb6b12bf16aac..745df62d57cf924f349655a54597198180453f7f 100644 --- a/src/server/mobject-server.c +++ b/src/server/mobject-server.c @@ -197,8 +197,6 @@ static hg_return_t mobject_write_op_ult(hg_handle_t h) write_op_in_t in; write_op_out_t out; - margo_instance_id mid = margo_hg_handle_get_instance(h); - /* Deserialize the input from the received handle. */ ret = margo_get_input(h, &in); assert(ret == HG_SUCCESS); @@ -231,8 +229,6 @@ static hg_return_t mobject_read_op_ult(hg_handle_t h) read_op_in_t in; read_op_out_t out; - margo_instance_id mid = margo_hg_handle_get_instance(h); - /* Deserialize the input from the received handle. */ ret = margo_get_input(h, &in); assert(ret == HG_SUCCESS);