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
e051b1d3
Commit
e051b1d3
authored
May 15, 2017
by
Philip Carns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adapt to variable name change in Mercury
parent
3e917564
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
examples/multiplex/svc1-client.c
examples/multiplex/svc1-client.c
+2
-2
examples/multiplex/svc1-server.c
examples/multiplex/svc1-server.c
+2
-2
examples/multiplex/svc2-server.c
examples/multiplex/svc2-server.c
+2
-2
include/margo.h
include/margo.h
+1
-1
No files found.
examples/multiplex/svc1-client.c
View file @
e051b1d3
...
...
@@ -57,7 +57,7 @@ void svc1_do_thing(margo_instance_id mid, hg_addr_t svr_addr, uint32_t mplex_id)
HG_BULK_READ_ONLY
,
&
in
.
bulk_handle
);
assert
(
ret
==
0
);
hgi
->
mplex
_id
=
mplex_id
;
hgi
->
target
_id
=
mplex_id
;
/* Send rpc. Note that we are also transmitting the bulk handle in the
* input struct. It was set above.
...
...
@@ -105,7 +105,7 @@ void svc1_do_other_thing(margo_instance_id mid, hg_addr_t svr_addr, uint32_t mpl
HG_BULK_READ_ONLY
,
&
in
.
bulk_handle
);
assert
(
ret
==
0
);
hgi
->
mplex
_id
=
mplex_id
;
hgi
->
target
_id
=
mplex_id
;
/* Send rpc. Note that we are also transmitting the bulk handle in the
* input struct. It was set above.
...
...
examples/multiplex/svc1-server.c
View file @
e051b1d3
...
...
@@ -33,7 +33,7 @@ static void svc1_do_thing_ult(hg_handle_t handle)
ABT_thread_self
(
&
my_ult
);
my_tid
=
pthread_self
();
printf
(
"svc1: do_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu
\n
"
,
hgi
->
mplex
_id
,
my_ult
,
my_xstream
,
my_tid
);
hgi
->
target
_id
,
my_ult
,
my_xstream
,
my_tid
);
out
.
ret
=
0
;
...
...
@@ -92,7 +92,7 @@ static void svc1_do_other_thing_ult(hg_handle_t handle)
ABT_thread_self
(
&
my_ult
);
my_tid
=
pthread_self
();
printf
(
"svc1: do_other_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu
\n
"
,
hgi
->
mplex
_id
,
my_ult
,
my_xstream
,
my_tid
);
hgi
->
target
_id
,
my_ult
,
my_xstream
,
my_tid
);
out
.
ret
=
0
;
...
...
examples/multiplex/svc2-server.c
View file @
e051b1d3
...
...
@@ -33,7 +33,7 @@ static void svc2_do_thing_ult(hg_handle_t handle)
ABT_thread_self
(
&
my_ult
);
my_tid
=
pthread_self
();
printf
(
"svc2: do_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu
\n
"
,
hgi
->
mplex
_id
,
my_ult
,
my_xstream
,
my_tid
);
hgi
->
target
_id
,
my_ult
,
my_xstream
,
my_tid
);
out
.
ret
=
0
;
...
...
@@ -92,7 +92,7 @@ static void svc2_do_other_thing_ult(hg_handle_t handle)
ABT_thread_self
(
&
my_ult
);
my_tid
=
pthread_self
();
printf
(
"svc2: do_other_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu
\n
"
,
hgi
->
mplex
_id
,
my_ult
,
my_xstream
,
my_tid
);
hgi
->
target
_id
,
my_ult
,
my_xstream
,
my_tid
);
out
.
ret
=
0
;
...
...
include/margo.h
View file @
e051b1d3
...
...
@@ -233,7 +233,7 @@ hg_return_t __name##_handler(hg_handle_t handle) { \
const struct hg_info *__hgi; \
__hgi = HG_Get_info(handle); \
__mid = margo_hg_class_to_instance(__hgi->hg_class); \
__ret = margo_lookup_mplex(__mid, __hgi->id, __hgi->
mplex
_id, (&__pool)); \
__ret = margo_lookup_mplex(__mid, __hgi->id, __hgi->
target
_id, (&__pool)); \
if(__ret != 0) { \
return(HG_INVALID_PARAM); \
}\
...
...
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