Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
margo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
sds
margo
Commits
2bc1140f
Commit
2bc1140f
authored
May 20, 2017
by
Philip Carns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make register_mplex allow 0 mplex id
parent
97042076
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
include/margo.h
include/margo.h
+1
-0
src/margo.c
src/margo.c
+3
-3
No files found.
include/margo.h
View file @
2bc1140f
...
@@ -20,6 +20,7 @@ struct margo_instance;
...
@@ -20,6 +20,7 @@ struct margo_instance;
typedef
struct
margo_instance
*
margo_instance_id
;
typedef
struct
margo_instance
*
margo_instance_id
;
#define MARGO_INSTANCE_NULL ((margo_instance_id)NULL)
#define MARGO_INSTANCE_NULL ((margo_instance_id)NULL)
#define MARGO_DEFAULT_MPLEX_ID 0
/**
/**
...
...
src/margo.c
View file @
2bc1140f
...
@@ -833,9 +833,9 @@ int margo_register_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_id, A
...
@@ -833,9 +833,9 @@ int margo_register_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_id, A
struct
mplex_key
key
;
struct
mplex_key
key
;
struct
mplex_element
*
element
;
struct
mplex_element
*
element
;
/*
mplex_id can't be zero; that's the default handler pool
*/
/*
nothing to do, we'll let the handler pool take this directly
*/
if
(
!
mplex_id
)
if
(
mplex_id
==
MARGO_DEFAULT_MPLEX_ID
)
return
(
-
1
);
return
(
0
);
memset
(
&
key
,
0
,
sizeof
(
key
));
memset
(
&
key
,
0
,
sizeof
(
key
));
key
.
id
=
id
;
key
.
id
=
id
;
...
...
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