Commit 97843502 authored by David Rich's avatar David Rich Committed by Rob Latham
Browse files

Compiler complaints fixed.

parent 74ec5c68
......@@ -54,7 +54,7 @@ kv_context *kv_client_register(char *addr_str) {
return context;
}
int kv_open(kv_context *context, char * server, char *name,
hg_return_t kv_open(kv_context *context, char * server, char *name,
kv_type keytype, kv_type valtype) {
hg_return_t ret = HG_SUCCESS;
hg_handle_t handle;
......@@ -109,7 +109,7 @@ int kv_open(kv_context *context, char * server, char *name,
/* we gave types in the open call. Will need to maintain in 'context' the
* size. */
int kv_put(kv_context *context, void *key, void *value) {
hg_return_t kv_put(kv_context *context, void *key, void *value) {
hg_return_t ret;
put_in_t put_in;
put_out_t put_out;
......@@ -124,7 +124,7 @@ int kv_put(kv_context *context, void *key, void *value) {
return ret;
}
int kv_bulk_put(kv_context *context, void *key, void *data, hg_size_t data_size) {
hg_return_t kv_bulk_put(kv_context *context, void *key, void *data, hg_size_t data_size) {
hg_return_t ret;
bulk_put_in_t bpin;
bulk_put_out_t bpout;
......@@ -144,7 +144,7 @@ int kv_bulk_put(kv_context *context, void *key, void *data, hg_size_t data_size)
return HG_SUCCESS;
}
int kv_get(kv_context *context, void *key, void *value)
hg_return_t kv_get(kv_context *context, void *key, void *value)
{
hg_return_t ret;
get_in_t get_in;
......@@ -160,7 +160,7 @@ int kv_get(kv_context *context, void *key, void *value)
return ret;
}
int kv_bulk_get(kv_context *context, void *key, void *data, hg_size_t data_size)
hg_return_t kv_bulk_get(kv_context *context, void *key, void *data, hg_size_t data_size)
{
hg_return_t ret;
bulk_get_in_t bgin;
......@@ -181,7 +181,7 @@ int kv_bulk_get(kv_context *context, void *key, void *data, hg_size_t data_size)
return HG_SUCCESS;
}
int kv_close(kv_context *context)
hg_return_t kv_close(kv_context *context)
{
hg_return_t ret;
hg_handle_t handle;
......@@ -237,7 +237,7 @@ bench_result *kv_benchmark(kv_context *context, int count) {
return result;
}
int kv_client_deregister(kv_context *context) {
hg_return_t kv_client_deregister(kv_context *context) {
hg_return_t ret;
margo_destroy(context->put_handle);
......@@ -258,7 +258,7 @@ int kv_client_deregister(kv_context *context) {
return HG_SUCCESS;
}
int kv_client_shutdown_server(kv_context *context) {
hg_return_t kv_client_shutdown_server(kv_context *context) {
hg_return_t ret;
ret = margo_forward(context->shutdown_handle, NULL);
......
......@@ -611,13 +611,13 @@ kv_context *kv_server_register(margo_instance_id mid);
return context;
}
int kv_server_wait_for_shutdown(kv_context *context) {
hg_return_t kv_server_wait_for_shutdown(kv_context *context) {
margo_wait_for_finalize(context->mid);
return HG_SUCCESS;
}
/* this is the same as client. should be moved to common utility library */
int kv_server_deregister(kv_context *context) {
hg_return_t kv_server_deregister(kv_context *context) {
free(context);
//delete TREE; // there seems to be a bug somewhere in BwTree
//printf("SERVER: deregistered, cleaned up BwTree instance\n");
......
......@@ -58,7 +58,7 @@ MERCURY_GEN_PROC(put_in_t,
((int32_t)(key))\
((int32_t)(value)) )
MERCURY_GEN_PROC(put_out_t, ((hg_return_t)(ret)) )
MERCURY_GEN_PROC(put_out_t, ((int32_t)(ret)) )
DECLARE_MARGO_RPC_HANDLER(put_handler)
......@@ -66,7 +66,7 @@ MERCURY_GEN_PROC(get_in_t,
((int32_t)(key)) )
MERCURY_GEN_PROC(get_out_t,
((int32_t)(value)) ((hg_return_t)(ret)) )
((int32_t)(value)) ((int32_t)(ret)) )
DECLARE_MARGO_RPC_HANDLER(get_handler)
......@@ -75,7 +75,7 @@ MERCURY_GEN_PROC(open_in_t,
((int32_t) (keytype))\
((int32_t) (valtype)) )
MERCURY_GEN_PROC(open_out_t, ((hg_return_t)(ret)))
MERCURY_GEN_PROC(open_out_t, ((int32_t)(ret)))
DECLARE_MARGO_RPC_HANDLER(open_handler)
......@@ -83,7 +83,7 @@ MERCURY_GEN_PROC(close_in_t,
((int32_t)(x))\
((int32_t)(y)) )
MERCURY_GEN_PROC(close_out_t, ((hg_return_t)(ret)) )
MERCURY_GEN_PROC(close_out_t, ((int32_t)(ret)) )
DECLARE_MARGO_RPC_HANDLER(close_handler)
MERCURY_GEN_PROC(bench_in_t, ((int32_t)(count)) )
......@@ -109,7 +109,7 @@ MERCURY_GEN_PROC(bulk_put_in_t,
((uint64_t)(key)) \
((uint64_t)(size)) \
((hg_bulk_t)(bulk_handle)) )
MERCURY_GEN_PROC(bulk_put_out_t, ((hg_return_t)(ret)))
MERCURY_GEN_PROC(bulk_put_out_t, ((int32_t)(ret)))
DECLARE_MARGO_RPC_HANDLER(bulk_put_handler)
MERCURY_GEN_PROC(bulk_get_in_t,
......@@ -118,7 +118,7 @@ MERCURY_GEN_PROC(bulk_get_in_t,
((hg_bulk_t)(bulk_handle)) )
MERCURY_GEN_PROC(bulk_get_out_t,
((uint64_t)(size)) \
((hg_return_t)(ret)))
((int32_t)(ret)))
DECLARE_MARGO_RPC_HANDLER(bulk_get_handler)
kv_context *kv_client_register(char *addr_str=0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment