Commit bff74cca authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

Merge branch 'dev-provider-id' into 'master'

support for new margo provider id API

See merge request !1
parents cb20a717 1649e719
......@@ -8,8 +8,8 @@ class BakeClient():
def __init__(self, mid):
self._client = _pybakeclient.client_init(mid._mid)
def create_provider_handle(self, addr, mplex_id):
ph = _pybakeclient.provider_handle_create(self._client, addr.get_hg_addr(), mplex_id)
def create_provider_handle(self, addr, provider_id):
ph = _pybakeclient.provider_handle_create(self._client, addr.get_hg_addr(), provider_id)
return BakeProviderHandle(ph)
def shutdown_service(self, addr):
......@@ -9,9 +9,9 @@ def make_pool(name, size, mode):
class BakeProvider(pymargo.Provider):
def __init__(self, mid, mplex_id):
super(BakeProvider, self).__init__(mid, mplex_id)
self._provider = _pybakeserver.register(mid._mid, mplex_id)
def __init__(self, mid, provider_id):
super(BakeProvider, self).__init__(mid, provider_id)
self._provider = _pybakeserver.register(mid._mid, provider_id)
def add_storage_target(self, name):
tid = _pybakeserver.add_storage_target(self._provider, name)
......@@ -35,10 +35,10 @@ static bake_client_t pybake_client_init(margo_instance_id mid) {
static bake_provider_handle_t pybake_provider_handle_create(
bake_client_t client,
hg_addr_t addr,
uint8_t mplex_id) {
uint8_t provider_id) {
bake_provider_handle_t providerHandle = BAKE_PROVIDER_HANDLE_NULL;
bake_provider_handle_create(client, addr, mplex_id, &providerHandle);
bake_provider_handle_create(client, addr, provider_id, &providerHandle);
return providerHandle;
......@@ -24,9 +24,9 @@ BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(bake_server_context_t)
namespace bpl = boost::python;
static bake_provider_t pybake_provider_register(margo_instance_id mid, uint8_t mplex_id) {
static bake_provider_t pybake_provider_register(margo_instance_id mid, uint8_t provider_id) {
bake_provider_t provider;
int ret = bake_provider_register(mid, mplex_id, BAKE_ABT_POOL_DEFAULT, &provider);
int ret = bake_provider_register(mid, provider_id, BAKE_ABT_POOL_DEFAULT, &provider);
if(ret != 0) return NULL;
else return provider;
Supports Markdown
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