Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
sds
py-bake
Commits
bff74cca
Commit
bff74cca
authored
Apr 03, 2018
by
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
Changes
4
Hide whitespace changes
Inline
Side-by-side
pybake/client.py
View file @
bff74cca
...
...
@@ -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
):
...
...
pybake/server.py
View file @
bff74cca
...
...
@@ -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
)
...
...
pybake/src/client.cpp
View file @
bff74cca
...
...
@@ -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
;
}
...
...
pybake/src/server.cpp
View file @
bff74cca
...
...
@@ -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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment