Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
py-bake
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sds
py-bake
Commits
2acbe4b5
Commit
2acbe4b5
authored
May 11, 2018
by
Matthieu Dorier
Browse files
Options
Browse Files
Download
Plain Diff
solved merge conflict
parents
8866767d
bff74cca
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
pybake/server.py
pybake/server.py
+3
-3
pybake/src/client.cpp
pybake/src/client.cpp
+2
-2
pybake/src/server.cpp
pybake/src/server.cpp
+2
-2
No files found.
pybake/server.py
View file @
2acbe4b5
...
...
@@ -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 @
2acbe4b5
...
...
@@ -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 @
2acbe4b5
...
...
@@ -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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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