Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bake
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sds
bake
Commits
b920b6bc
Commit
b920b6bc
authored
Dec 12, 2017
by
Shane Snyder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get proxy test case to do a read phase too
parent
f8bf6f9f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
209 additions
and
59 deletions
+209
-59
tests/proxy/bb-proxy-rpc.h
tests/proxy/bb-proxy-rpc.h
+9
-1
tests/proxy/bb-proxy-server-daemon.c
tests/proxy/bb-proxy-server-daemon.c
+43
-17
tests/proxy/bb-proxy-test.c
tests/proxy/bb-proxy-test.c
+157
-41
No files found.
tests/proxy/bb-proxy-rpc.h
View file @
b920b6bc
...
...
@@ -14,8 +14,16 @@ MERCURY_GEN_PROC(proxy_bulk_write_in_t,
((
hg_bulk_t
)(
bulk_handle
))
\
((
uint64_t
)(
bulk_offset
))
\
((
uint64_t
)(
bulk_size
))
\
((
hg_string_t
)(
bulk_addr
)))
((
hg_
const_
string_t
)(
bulk_addr
)))
MERCURY_GEN_PROC
(
proxy_bulk_write_out_t
,
((
int32_t
)(
ret
)))
MERCURY_GEN_PROC
(
proxy_bulk_read_in_t
,
((
hg_bulk_t
)(
bulk_handle
))
\
((
uint64_t
)(
bulk_offset
))
\
((
uint64_t
)(
bulk_size
))
\
((
hg_const_string_t
)(
bulk_addr
)))
MERCURY_GEN_PROC
(
proxy_bulk_read_out_t
,
((
int32_t
)(
ret
)))
#endif
/* __BB_PROXY_RPC */
tests/proxy/bb-proxy-server-daemon.c
View file @
b920b6bc
...
...
@@ -15,6 +15,7 @@
#include "bb-proxy-rpc.h"
DECLARE_MARGO_RPC_HANDLER
(
proxy_bulk_write_ult
)
DECLARE_MARGO_RPC_HANDLER
(
proxy_bulk_read_ult
)
DECLARE_MARGO_RPC_HANDLER
(
proxy_shutdown_ult
)
struct
options
...
...
@@ -26,7 +27,8 @@ struct options
struct
bb_proxy_server_context
{
bake_target_id_t
bb_svr_bti
;
bake_target_id_t
svr_bti
;
bake_bulk_region_id_t
the_rid
;
};
static
struct
bb_proxy_server_context
*
g_proxy_svr_ctx
=
NULL
;
...
...
@@ -145,7 +147,7 @@ int main(int argc, char **argv)
}
/* probe the bake-bulk server for an instance */
ret
=
bake_probe_instance
(
mid
,
bake_svr_addr
,
&
g_proxy_svr_ctx
->
bb_
svr_bti
);
ret
=
bake_probe_instance
(
mid
,
bake_svr_addr
,
&
g_proxy_svr_ctx
->
svr_bti
);
if
(
ret
<
0
)
{
fprintf
(
stderr
,
"Error: bake_probe_instance()
\n
"
);
...
...
@@ -156,6 +158,8 @@ int main(int argc, char **argv)
/* register proxy service RPCs */
MARGO_REGISTER
(
mid
,
"proxy_bulk_write"
,
proxy_bulk_write_in_t
,
proxy_bulk_write_out_t
,
proxy_bulk_write_ult
);
MARGO_REGISTER
(
mid
,
"proxy_bulk_read"
,
proxy_bulk_read_in_t
,
proxy_bulk_read_out_t
,
proxy_bulk_read_ult
);
MARGO_REGISTER
(
mid
,
"proxy_shutdown"
,
void
,
void
,
proxy_shutdown_ult
);
/* wait for the shutdown signal */
...
...
@@ -168,7 +172,6 @@ static void proxy_bulk_write_ult(hg_handle_t handle)
{
proxy_bulk_write_in_t
in
;
proxy_bulk_write_out_t
out
;
bake_bulk_region_id_t
rid
;
hg_return_t
hret
;
int
ret
;
...
...
@@ -178,17 +181,20 @@ static void proxy_bulk_write_ult(hg_handle_t handle)
hret
=
margo_get_input
(
handle
,
&
in
);
assert
(
hret
==
HG_SUCCESS
);
/* XXX we need a create_write_persist call to save on RTTs */
/* create bake region to store this write in */
ret
=
bake_bulk_create
(
g_proxy_svr_ctx
->
bb_svr_bti
,
in
.
bulk_size
,
&
rid
);
ret
=
bake_bulk_create
(
g_proxy_svr_ctx
->
svr_bti
,
in
.
bulk_size
,
&
(
g_proxy_svr_ctx
->
the_rid
));
assert
(
ret
==
0
);
/* perform proxy write on behalf of client */
ret
=
bake_bulk_proxy_write
(
g_proxy_svr_ctx
->
bb_svr_bti
,
rid
,
0
,
in
.
bulk_handle
,
in
.
bulk_offset
,
in
.
bulk_addr
,
in
.
bulk_size
);
ret
=
bake_bulk_proxy_write
(
g_proxy_svr_ctx
->
svr_bti
,
g_proxy_svr_ctx
->
the_rid
,
0
,
in
.
bulk_handle
,
in
.
bulk_offset
,
in
.
bulk_addr
,
in
.
bulk_size
);
assert
(
ret
==
0
);
/* persist the bake region */
ret
=
bake_bulk_persist
(
g_proxy_svr_ctx
->
bb_svr_bti
,
rid
);
ret
=
bake_bulk_persist
(
g_proxy_svr_ctx
->
svr_bti
,
g_proxy_svr_ctx
->
the_
rid
);
assert
(
ret
==
0
);
/* set return value */
...
...
@@ -197,23 +203,43 @@ static void proxy_bulk_write_ult(hg_handle_t handle)
hret
=
margo_respond
(
handle
,
&
out
);
assert
(
hret
==
HG_SUCCESS
);
#if 1
char
*
buf
=
malloc
(
in
.
bulk_size
);
memset
(
buf
,
0
,
in
.
bulk_size
);
margo_free_input
(
handle
,
&
in
);
margo_destroy
(
handle
);
return
;
}
DEFINE_MARGO_RPC_HANDLER
(
proxy_bulk_write_ult
)
static
void
proxy_bulk_read_ult
(
hg_handle_t
handle
)
{
proxy_bulk_read_in_t
in
;
proxy_bulk_read_out_t
out
;
hg_return_t
hret
;
int
ret
;
assert
(
g_proxy_svr_ctx
);
/* get RPC input */
hret
=
margo_get_input
(
handle
,
&
in
);
assert
(
hret
==
HG_SUCCESS
);
ret
=
bake_bulk_read
(
g_proxy_svr_ctx
->
bb_svr_bti
,
rid
,
0
,
buf
,
in
.
bulk_size
);
/* perform proxy write on behalf of client */
ret
=
bake_bulk_proxy_read
(
g_proxy_svr_ctx
->
svr_bti
,
g_proxy_svr_ctx
->
the_rid
,
0
,
in
.
bulk_handle
,
in
.
bulk_offset
,
in
.
bulk_addr
,
in
.
bulk_size
);
assert
(
ret
==
0
);
printf
(
"bake got the buf %s
\n
"
,
buf
);
free
(
buf
);
#endif
/* set return value */
out
.
ret
=
0
;
hret
=
margo_respond
(
handle
,
&
out
);
assert
(
hret
==
HG_SUCCESS
);
margo_free_input
(
handle
,
&
in
);
margo_destroy
(
handle
);
return
;
}
DEFINE_MARGO_RPC_HANDLER
(
proxy_bulk_
write
_ult
)
DEFINE_MARGO_RPC_HANDLER
(
proxy_bulk_
read
_ult
)
static
void
proxy_shutdown_ult
(
hg_handle_t
handle
)
{
...
...
@@ -232,10 +258,10 @@ static void proxy_shutdown_ult(hg_handle_t handle)
margo_destroy
(
handle
);
/* forward shutdown to the bake-bulk server */
bake_shutdown_service
(
g_proxy_svr_ctx
->
bb_
svr_bti
);
bake_shutdown_service
(
g_proxy_svr_ctx
->
svr_bti
);
/* cleanup global state */
bake_release_instance
(
g_proxy_svr_ctx
->
bb_
svr_bti
);
bake_release_instance
(
g_proxy_svr_ctx
->
svr_bti
);
free
(
g_proxy_svr_ctx
);
margo_finalize
(
mid
);
...
...
tests/proxy/bb-proxy-test.c
View file @
b920b6bc
...
...
@@ -13,7 +13,23 @@
#include "bb-proxy-rpc.h"
#define ALLOC_BUF_SIZE 512
static
int
forward_proxy_write
(
margo_instance_id
mid
,
hg_addr_t
svr_addr
,
char
*
buf
,
uint64_t
buf_size
,
const
char
*
self_addr_str
);
static
int
forward_proxy_read
(
margo_instance_id
mid
,
hg_addr_t
svr_addr
,
char
*
buf
,
uint64_t
buf_size
,
const
char
*
self_addr_str
);
static
hg_id_t
proxy_bulk_write_id
;
static
hg_id_t
proxy_bulk_read_id
;
static
hg_id_t
proxy_shutdown_id
;
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -26,14 +42,11 @@ int main(int argc, char *argv[])
hg_addr_t
self_addr
;
char
self_addr_str
[
128
];
hg_size_t
self_addr_str_sz
=
128
;
proxy_bulk_write_in_t
in
;
proxy_bulk_write_out_t
out
;
const
char
*
test_str
=
"This is a test string for bake-proxy-test."
;
char
*
buf
;
hg_size
_t
buf_size
;
uint64
_t
buf_size
;
hg_handle_t
handle
;
hg_bulk_t
bulk_handle
;
hg_return_t
hret
;
const
char
*
test_str
=
"This is a test string for bake-proxy-test."
;
int
ret
;
if
(
argc
!=
2
)
...
...
@@ -60,6 +73,8 @@ int main(int argc, char *argv[])
proxy_bulk_write_id
=
MARGO_REGISTER
(
mid
,
"proxy_bulk_write"
,
proxy_bulk_write_in_t
,
proxy_bulk_write_out_t
,
NULL
);
proxy_bulk_read_id
=
MARGO_REGISTER
(
mid
,
"proxy_bulk_read"
,
proxy_bulk_read_in_t
,
proxy_bulk_read_out_t
,
NULL
);
proxy_shutdown_id
=
MARGO_REGISTER
(
mid
,
"proxy_shutdown"
,
void
,
void
,
NULL
);
...
...
@@ -92,7 +107,7 @@ int main(int argc, char *argv[])
}
margo_addr_free
(
mid
,
self_addr
);
buf
=
malloc
(
512
);
buf
=
malloc
(
ALLOC_BUF_SIZE
);
if
(
!
buf
)
{
margo_addr_free
(
mid
,
svr_addr
);
...
...
@@ -100,20 +115,93 @@ int main(int argc, char *argv[])
return
(
-
1
);
}
/*
****************
*/
/*
*** write phase ***
*/
/*
set up bulk handle and other proxy params to send in request
*/
/*
copy the test string into a buffer and forward to the proxy server
*/
strcpy
(
buf
,
test_str
);
buf_size
=
strlen
(
test_str
)
+
1
;
ret
=
forward_proxy_write
(
mid
,
svr_addr
,
buf
,
buf_size
,
self_addr_str
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"Error: unable to forward proxy write
\n
"
);
free
(
buf
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
return
(
-
1
);
}
/**** read-back phase ****/
/* reset the buffer and read it back via the proxy server */
memset
(
buf
,
0
,
ALLOC_BUF_SIZE
);
ret
=
forward_proxy_read
(
mid
,
svr_addr
,
buf
,
buf_size
,
self_addr_str
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"Error: unable to forward proxy read
\n
"
);
free
(
buf
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
return
(
-
1
);
}
/* check to make sure we get back the string we expect */
if
(
strcmp
(
buf
,
test_str
)
!=
0
)
{
fprintf
(
stderr
,
"Error: unexpected buffer contents returned from proxy server
\n
"
);
free
(
buf
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
return
(
-
1
);
}
/**** cleanup ****/
free
(
buf
);
/* send the shutdown signal to the proxy server */
hret
=
margo_create
(
mid
,
svr_addr
,
proxy_shutdown_id
,
&
handle
);
if
(
hret
!=
HG_SUCCESS
)
{
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
return
(
-
1
);
}
hret
=
margo_forward
(
handle
,
NULL
);
if
(
hret
!=
HG_SUCCESS
)
{
margo_destroy
(
handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
return
(
-
1
);
}
margo_destroy
(
handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
return
(
0
);
}
static
int
forward_proxy_write
(
margo_instance_id
mid
,
hg_addr_t
svr_addr
,
char
*
buf
,
uint64_t
buf_size
,
const
char
*
self_addr_str
)
{
proxy_bulk_write_in_t
in
;
proxy_bulk_write_out_t
out
;
hg_handle_t
handle
;
hg_return_t
hret
;
hret
=
margo_bulk_create
(
mid
,
1
,
(
void
**
)
&
buf
,
&
buf_size
,
HG_BULK_READ_ONLY
,
&
in
.
bulk_handle
);
if
(
hret
!=
HG_SUCCESS
)
{
fprintf
(
stderr
,
"Error: margo_bulk_create()
\n
"
);
free
(
buf
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
return
(
-
1
);
}
in
.
bulk_offset
=
0
;
...
...
@@ -124,10 +212,7 @@ int main(int argc, char *argv[])
if
(
hret
!=
HG_SUCCESS
)
{
fprintf
(
stderr
,
"Error: margo_create()
\n
"
);
free
(
buf
);
margo_bulk_free
(
bulk_handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
...
...
@@ -135,11 +220,8 @@ int main(int argc, char *argv[])
if
(
hret
!=
HG_SUCCESS
)
{
fprintf
(
stderr
,
"Error: margo_forward()
\n
"
);
free
(
buf
);
margo_destroy
(
handle
);
margo_bulk_free
(
bulk_handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
...
...
@@ -147,11 +229,8 @@ int main(int argc, char *argv[])
if
(
hret
!=
HG_SUCCESS
)
{
fprintf
(
stderr
,
"Error: margo_get_output()
\n
"
);
free
(
buf
);
margo_destroy
(
handle
);
margo_bulk_free
(
bulk_handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
...
...
@@ -159,45 +238,82 @@ int main(int argc, char *argv[])
if
(
out
.
ret
!=
0
)
{
fprintf
(
stderr
,
"Error: unexpected return from bake proxy write RPC
\n
"
);
free
(
buf
);
margo_free_output
(
handle
,
&
out
);
margo_destroy
(
handle
);
margo_bulk_free
(
bulk_handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
/* XXX check the buffer ? */
margo_free_output
(
handle
,
&
out
);
margo_destroy
(
handle
);
margo_bulk_free
(
bulk_handle
);
margo_bulk_free
(
in
.
bulk_handle
);
/* **************** */
return
(
0
);
}
free
(
buf
);
static
int
forward_proxy_read
(
margo_instance_id
mid
,
hg_addr_t
svr_addr
,
char
*
buf
,
uint64_t
buf_size
,
const
char
*
self_addr_str
)
{
proxy_bulk_read_in_t
in
;
proxy_bulk_read_out_t
out
;
hg_handle_t
handle
;
hg_return_t
hret
;
/* send the shutdown signal to the proxy server */
hret
=
margo_create
(
mid
,
svr_addr
,
proxy_shutdown_id
,
&
handle
);
hret
=
margo_bulk_create
(
mid
,
1
,
(
void
**
)
&
buf
,
&
buf_size
,
HG_BULK_WRITE_ONLY
,
&
in
.
bulk_
handle
);
if
(
hret
!=
HG_SUCCESS
)
{
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
fprintf
(
stderr
,
"Error: margo_bulk_create()
\n
"
);
return
(
-
1
);
}
in
.
bulk_offset
=
0
;
in
.
bulk_size
=
buf_size
;
in
.
bulk_addr
=
self_addr_str
;
hret
=
margo_create
(
mid
,
svr_addr
,
proxy_bulk_read_id
,
&
handle
);
if
(
hret
!=
HG_SUCCESS
)
{
fprintf
(
stderr
,
"Error: margo_create()
\n
"
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
hret
=
margo_forward
(
handle
,
NULL
);
hret
=
margo_forward
(
handle
,
&
in
);
if
(
hret
!=
HG_SUCCESS
)
{
fprintf
(
stderr
,
"Error: margo_forward()
\n
"
);
margo_destroy
(
handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
hret
=
margo_get_output
(
handle
,
&
out
);
if
(
hret
!=
HG_SUCCESS
)
{
fprintf
(
stderr
,
"Error: margo_get_output()
\n
"
);
margo_destroy
(
handle
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
/* check return code */
if
(
out
.
ret
!=
0
)
{
fprintf
(
stderr
,
"Error: unexpected return from bake proxy read RPC
\n
"
);
margo_free_output
(
handle
,
&
out
);
margo_destroy
(
handle
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
-
1
);
}
margo_free_output
(
handle
,
&
out
);
margo_destroy
(
handle
);
margo_addr_free
(
mid
,
svr_addr
);
margo_finalize
(
mid
);
margo_bulk_free
(
in
.
bulk_handle
);
return
(
0
);
}
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