Commit 5cbe5727 authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

updated to use new REMI API

parent 3b5ce132
...@@ -110,7 +110,7 @@ extern "C" int sdskv_provider_register( ...@@ -110,7 +110,7 @@ extern "C" int sdskv_provider_register(
/* check if a REMI provider exists with the same provider id */ /* check if a REMI provider exists with the same provider id */
{ {
int flag; int flag;
remi_provider_registered(mid, provider_id, &flag, NULL, NULL); remi_provider_registered(mid, provider_id, &flag, NULL, NULL, NULL);
if(flag) { if(flag) {
fprintf(stderr, "sdskv_provider_register(): a REMI provider with the same (%d) already exists\n", provider_id); fprintf(stderr, "sdskv_provider_register(): a REMI provider with the same (%d) already exists\n", provider_id);
return SDSKV_ERR_REMI; return SDSKV_ERR_REMI;
...@@ -232,14 +232,16 @@ extern "C" int sdskv_provider_register( ...@@ -232,14 +232,16 @@ extern "C" int sdskv_provider_register(
margo_register_data(mid, rpc_id, (void*)tmp_svr_ctx, NULL); margo_register_data(mid, rpc_id, (void*)tmp_svr_ctx, NULL);
/* register a REMI client */ /* register a REMI client */
ret = remi_client_init(mid, &(tmp_svr_ctx->remi_client)); // TODO use an ABT-IO instance
ret = remi_client_init(mid, ABT_IO_INSTANCE_NULL, &(tmp_svr_ctx->remi_client));
if(ret != REMI_SUCCESS) { if(ret != REMI_SUCCESS) {
sdskv_server_finalize_cb(tmp_svr_ctx); sdskv_server_finalize_cb(tmp_svr_ctx);
return SDSKV_ERR_REMI; return SDSKV_ERR_REMI;
} }
/* register a REMI provider */ /* register a REMI provider */
ret = remi_provider_register(mid, provider_id, abt_pool, &(tmp_svr_ctx->remi_provider)); // TODO use an ABT-IO instance
ret = remi_provider_register(mid, ABT_IO_INSTANCE_NULL, provider_id, abt_pool, &(tmp_svr_ctx->remi_provider));
if(ret != REMI_SUCCESS) { if(ret != REMI_SUCCESS) {
sdskv_server_finalize_cb(tmp_svr_ctx); sdskv_server_finalize_cb(tmp_svr_ctx);
return SDSKV_ERR_REMI; return SDSKV_ERR_REMI;
...@@ -2124,7 +2126,7 @@ static void sdskv_migrate_database_ult(hg_handle_t handle) ...@@ -2124,7 +2126,7 @@ static void sdskv_migrate_database_ult(hg_handle_t handle)
} }
/* issue the migration */ /* issue the migration */
int status = 0; int status = 0;
ret = remi_fileset_migrate(remi_ph, local_fileset, in.dest_root, in.remove_src, &status); ret = remi_fileset_migrate(remi_ph, local_fileset, in.dest_root, in.remove_src, REMI_USE_ABTIO, &status);
if(ret != REMI_SUCCESS) { if(ret != REMI_SUCCESS) {
out.ret = status; out.ret = status;
break; break;
......
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