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
c04e6c09
Commit
c04e6c09
authored
Jan 15, 2018
by
Matthieu Dorier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated copy-to program to take target id into account
parent
7835a534
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
21 deletions
+22
-21
src/bake-copy-from.c
src/bake-copy-from.c
+1
-13
src/bake-copy-to.c
src/bake-copy-to.c
+20
-7
tests/copy-to-and-from.sh
tests/copy-to-and-from.sh
+1
-1
No files found.
src/bake-copy-from.c
View file @
c04e6c09
...
...
@@ -28,8 +28,6 @@ int main(int argc, char **argv)
margo_instance_id
mid
;
bake_client_t
bcl
;
bake_provider_handle_t
bph
;
uint64_t
num_targets
;
bake_target_id_t
bti
;
uint8_t
mplex_id
;
hg_return_t
hret
;
int
ret
;
...
...
@@ -47,6 +45,7 @@ int main(int argc, char **argv)
}
svr_addr_str
=
argv
[
1
];
mplex_id
=
atoi
(
argv
[
2
]);
/* initialize Margo using the transport portion of the server
* address (i.e., the part before the first : character if present)
*/
...
...
@@ -87,17 +86,6 @@ int main(int argc, char **argv)
return
(
-
1
);
}
ret
=
bake_probe
(
bph
,
1
,
&
bti
,
&
num_targets
);
if
(
ret
<
0
)
{
fprintf
(
stderr
,
"Error: bake_probe()
\n
"
);
bake_provider_handle_release
(
bph
);
margo_addr_free
(
mid
,
svr_addr
);
bake_client_finalize
(
bcl
);
margo_finalize
(
mid
);
return
(
-
1
);
}
region_fd
=
open
(
argv
[
3
],
O_RDONLY
);
if
(
region_fd
<
0
)
{
...
...
src/bake-copy-to.c
View file @
c04e6c09
...
...
@@ -28,9 +28,8 @@ int main(int argc, char **argv)
margo_instance_id
mid
;
bake_client_t
bcl
;
bake_provider_handle_t
bph
;
uint64_t
num_targets
;
bake_target_id_t
bti
;
uint8_t
mplex_id
;
uint32_t
target_number
;
hg_return_t
hret
;
int
ret
;
bake_region_id_t
rid
;
...
...
@@ -41,14 +40,18 @@ int main(int argc, char **argv)
char
region_file
[
128
];
uint64_t
check_size
;
if
(
argc
!=
4
)
if
(
argc
!=
5
)
{
fprintf
(
stderr
,
"Usage: bake-copy-to <local file> <server addr> <mplex id>
\n
"
);
fprintf
(
stderr
,
" Example: ./bake-copy-to /tmp/foo.dat tcp://localhost:1234 1
\n
"
);
fprintf
(
stderr
,
"Usage: bake-copy-to <local file> <server addr> <mplex id>
<target number>
\n
"
);
fprintf
(
stderr
,
" Example: ./bake-copy-to /tmp/foo.dat tcp://localhost:1234 1
3
\n
"
);
return
(
-
1
);
}
svr_addr_str
=
argv
[
2
];
mplex_id
=
atoi
(
argv
[
3
]);
target_number
=
atoi
(
argv
[
4
]);
uint64_t
num_targets
;
bake_target_id_t
bti
[
target_number
];
fd
=
open
(
argv
[
1
],
O_RDONLY
);
if
(
fd
<
0
)
...
...
@@ -120,7 +123,7 @@ int main(int argc, char **argv)
return
(
-
1
);
}
ret
=
bake_probe
(
bph
,
1
,
&
bti
,
&
num_targets
);
ret
=
bake_probe
(
bph
,
target_number
,
bti
,
&
num_targets
);
if
(
ret
<
0
)
{
bake_provider_handle_release
(
bph
);
...
...
@@ -133,8 +136,18 @@ int main(int argc, char **argv)
return
(
-
1
);
}
if
(
num_targets
<
target_number
)
{
fprintf
(
stderr
,
"Error: provider has only %d storage targets
\n
"
,
num_targets
);
margo_addr_free
(
mid
,
svr_addr
);
bake_client_finalize
(
bcl
);
margo_finalize
(
mid
);
munmap
(
local_region
,
statbuf
.
st_size
);
close
(
fd
);
return
-
1
;
}
/* create region */
ret
=
bake_create
(
bph
,
bti
,
statbuf
.
st_size
,
&
rid
);
ret
=
bake_create
(
bph
,
bti
[
target_number
-
1
]
,
statbuf
.
st_size
,
&
rid
);
if
(
ret
!=
0
)
{
bake_provider_handle_release
(
bph
);
...
...
tests/copy-to-and-from.sh
View file @
c04e6c09
...
...
@@ -13,7 +13,7 @@ test_start_servers 1 2 20
#####################
echo
"Hello world."
>
$TMPBASE
/foo.dat
CPOUT
=
`
run_to 10 src/bake-copy-to
$TMPBASE
/foo.dat
$svr1
1
`
CPOUT
=
`
run_to 10 src/bake-copy-to
$TMPBASE
/foo.dat
$svr1
1
1
`
if
[
$?
-ne
0
]
;
then
run_to 10 src/bake-shutdown
$svr1
wait
...
...
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