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
9e21efe4
Commit
9e21efe4
authored
May 02, 2016
by
Jonathan Jenkins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unneeded arguments
parent
d74e817a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
20 deletions
+16
-20
examples/client-timeout.c
examples/client-timeout.c
+2
-2
examples/client.c
examples/client.c
+2
-2
examples/my-rpc.c
examples/my-rpc.c
+1
-1
examples/server-hang.c
examples/server-hang.c
+1
-1
examples/server.c
examples/server.c
+2
-2
examples/sleep.c
examples/sleep.c
+1
-1
include/margo.h
include/margo.h
+1
-3
src/margo.c
src/margo.c
+6
-8
No files found.
examples/client-timeout.c
View file @
9e21efe4
...
...
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
* because this is a pure client that will not be servicing rpc requests.
*/
/***************************************/
mid
=
margo_init
(
progress_pool
,
ABT_POOL_NULL
,
hg_context
,
hg_class
);
mid
=
margo_init
(
progress_pool
,
ABT_POOL_NULL
,
hg_context
);
/* register RPC */
my_rpc_id
=
MERCURY_REGISTER
(
hg_class
,
"my_rpc"
,
my_rpc_in_t
,
my_rpc_out_t
,
...
...
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
NULL
);
/* find addr for server */
ret
=
margo_addr_lookup
(
mid
,
hg_context
,
argv
[
1
],
&
svr_addr
);
ret
=
margo_addr_lookup
(
mid
,
argv
[
1
],
&
svr_addr
);
assert
(
ret
==
0
);
for
(
i
=
0
;
i
<
4
;
i
++
)
...
...
examples/client.c
View file @
9e21efe4
...
...
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
* because this is a pure client that will not be servicing rpc requests.
*/
/***************************************/
mid
=
margo_init
(
progress_pool
,
ABT_POOL_NULL
,
hg_context
,
hg_class
);
mid
=
margo_init
(
progress_pool
,
ABT_POOL_NULL
,
hg_context
);
/* register RPC */
my_rpc_id
=
MERCURY_REGISTER
(
hg_class
,
"my_rpc"
,
my_rpc_in_t
,
my_rpc_out_t
,
...
...
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
NULL
);
/* find addr for server */
ret
=
margo_addr_lookup
(
mid
,
hg_context
,
argv
[
1
],
&
svr_addr
);
ret
=
margo_addr_lookup
(
mid
,
argv
[
1
],
&
svr_addr
);
assert
(
ret
==
0
);
for
(
i
=
0
;
i
<
4
;
i
++
)
...
...
examples/my-rpc.c
View file @
9e21efe4
...
...
@@ -55,7 +55,7 @@ static void my_rpc_ult(hg_handle_t handle)
mid
=
margo_hg_class_to_instance
(
hgi
->
hg_class
);
/* do bulk transfer from client to server */
ret
=
margo_bulk_transfer
(
mid
,
hgi
->
context
,
HG_BULK_PULL
,
ret
=
margo_bulk_transfer
(
mid
,
HG_BULK_PULL
,
hgi
->
addr
,
in
.
bulk_handle
,
0
,
bulk_handle
,
0
,
size
);
assert
(
ret
==
0
);
...
...
examples/server-hang.c
View file @
9e21efe4
...
...
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
* communication.
*/
/***************************************/
mid
=
margo_init
(
handler_pool
,
handler_pool
,
hg_context
,
hg_class
);
mid
=
margo_init
(
handler_pool
,
handler_pool
,
hg_context
);
assert
(
mid
);
/* register RPC */
...
...
examples/server.c
View file @
9e21efe4
...
...
@@ -113,9 +113,9 @@ int main(int argc, char **argv)
*/
/***************************************/
if
(
single_pool_mode
)
mid
=
margo_init
(
handler_pool
,
handler_pool
,
hg_context
,
hg_class
);
mid
=
margo_init
(
handler_pool
,
handler_pool
,
hg_context
);
else
mid
=
margo_init
(
progress_pool
,
handler_pool
,
hg_context
,
hg_class
);
mid
=
margo_init
(
progress_pool
,
handler_pool
,
hg_context
);
assert
(
mid
);
/* register RPC */
...
...
examples/sleep.c
View file @
9e21efe4
...
...
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
/* use a single pool for progress and sleeper threads */
/* NOTE: we don't use RPC handlers, so no need for an RPC pool */
/***************************************/
mid
=
margo_init
(
pool
,
ABT_POOL_NULL
,
hg_context
,
hg_class
);
mid
=
margo_init
(
pool
,
ABT_POOL_NULL
,
hg_context
);
for
(
i
=
0
;
i
<
4
;
i
++
)
{
t_ids
[
i
]
=
i
;
...
...
include/margo.h
View file @
9e21efe4
...
...
@@ -31,7 +31,7 @@ typedef struct margo_instance* margo_instance_id;
* @returns margo instance id on success, NULL upon error
*/
margo_instance_id
margo_init
(
ABT_pool
progress_pool
,
ABT_pool
handler_pool
,
hg_context_t
*
hg_context
,
hg_class_t
*
hg_class
);
hg_context_t
*
hg_context
);
/**
* Shuts down margo library and its underlying evfibers and mercury resources
...
...
@@ -133,7 +133,6 @@ hg_return_t margo_respond(
*/
hg_return_t
margo_bulk_transfer
(
margo_instance_id
mid
,
hg_context_t
*
context
,
hg_bulk_op_t
op
,
hg_addr_t
origin_addr
,
hg_bulk_t
origin_handle
,
...
...
@@ -150,7 +149,6 @@ hg_return_t margo_bulk_transfer(
*/
hg_return_t
margo_addr_lookup
(
margo_instance_id
mid
,
hg_context_t
*
context
,
const
char
*
name
,
hg_addr_t
*
addr
);
...
...
src/margo.c
View file @
9e21efe4
...
...
@@ -61,7 +61,7 @@ struct handler_entry
};
margo_instance_id
margo_init
(
ABT_pool
progress_pool
,
ABT_pool
handler_pool
,
hg_context_t
*
hg_context
,
hg_class_t
*
hg_class
)
hg_context_t
*
hg_context
)
{
int
ret
;
struct
margo_instance
*
mid
;
...
...
@@ -79,7 +79,7 @@ margo_instance_id margo_init(ABT_pool progress_pool, ABT_pool handler_pool,
mid
->
progress_pool
=
progress_pool
;
mid
->
handler_pool
=
handler_pool
;
mid
->
hg_class
=
hg_class
;
mid
->
hg_class
=
HG_Context_get_class
(
hg_context
)
;
mid
->
hg_context
=
hg_context
;
ret
=
margo_timer_instance_init
(
mid
);
...
...
@@ -411,7 +411,6 @@ static hg_return_t margo_addr_lookup_cb(const struct hg_cb_info *info)
hg_return_t
margo_addr_lookup
(
margo_instance_id
mid
,
hg_context_t
*
context
,
const
char
*
name
,
hg_addr_t
*
addr
)
{
...
...
@@ -426,7 +425,7 @@ hg_return_t margo_addr_lookup(
return
(
HG_NOMEM_ERROR
);
}
nret
=
HG_Addr_lookup
(
context
,
margo_addr_lookup_cb
,
nret
=
HG_Addr_lookup
(
mid
->
hg_
context
,
margo_addr_lookup_cb
,
&
eventual
,
name
,
HG_OP_ID_IGNORE
);
if
(
nret
==
0
)
{
...
...
@@ -442,7 +441,6 @@ hg_return_t margo_addr_lookup(
hg_return_t
margo_bulk_transfer
(
margo_instance_id
mid
,
hg_context_t
*
context
,
hg_bulk_op_t
op
,
hg_addr_t
origin_addr
,
hg_bulk_t
origin_handle
,
...
...
@@ -462,9 +460,9 @@ hg_return_t margo_bulk_transfer(
return
(
HG_NOMEM_ERROR
);
}
hret
=
HG_Bulk_transfer
(
context
,
margo_bulk_transfer_cb
,
&
eventual
,
op
,
origin_addr
,
origin_handle
,
origin_offset
,
local_handle
,
local_offset
,
size
,
HG_OP_ID_IGNORE
);
hret
=
HG_Bulk_transfer
(
mid
->
hg_context
,
margo_bulk_transfer_cb
,
&
eventual
,
op
,
origin_addr
,
origin_handle
,
origin_offset
,
local_handle
,
local_offset
,
size
,
HG_OP_ID_IGNORE
);
if
(
hret
==
0
)
{
ABT_eventual_wait
(
eventual
,
(
void
**
)
&
waited_hret
);
...
...
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