philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some minor changes.

Browse Source
This commit is contained in:
Songyu Lu
2021-03-15 10:49:43 -05:00
parent 11486e26a2
commit 923e15b749
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/vfd_swmr_group_writer.c
View File

@@ -12,7 +12,6 @@
*/ */
#include <err.h> #include <err.h>
#include <unistd.h> /* getopt(3) */
#define H5F_FRIEND /*suppress error about including H5Fpkg */ #define H5F_FRIEND /*suppress error about including H5Fpkg */
@@ -55,7 +54,7 @@ static void
usage(const char *progname) usage(const char *progname)
{ {
fprintf(stderr, "usage: %s [-S] [-W] [-a steps] [-b] [-c]\n" fprintf(stderr, "usage: %s [-S] [-W] [-a steps] [-b] [-c]\n"
" [-n iterations] [-u milliseconds]\n" " [-n iterations]\n"
"\n" "\n"
"-S: do not use VFD SWMR\n" "-S: do not use VFD SWMR\n"
"-W: do not wait for a signal before\n" "-W: do not wait for a signal before\n"
@@ -64,7 +63,6 @@ usage(const char *progname)
"-b: write data in big-endian byte order\n" "-b: write data in big-endian byte order\n"
"-c steps: `steps` between communication between the writer and reader\n" "-c steps: `steps` between communication between the writer and reader\n"
"-n iterations: how many times to expand each dataset\n" "-n iterations: how many times to expand each dataset\n"
"-u ms: milliseconds interval between updates\n"
" to %s.h5\n" " to %s.h5\n"
"\n", "\n",
progname, progname); progname, progname);
@@ -84,7 +82,7 @@ state_init(state_t *s, int argc, char **argv)
esnprintf(tfile, sizeof(tfile), "%s", argv[0]); esnprintf(tfile, sizeof(tfile), "%s", argv[0]);
esnprintf(s->progname, sizeof(s->progname), "%s", HDbasename(tfile)); esnprintf(s->progname, sizeof(s->progname), "%s", HDbasename(tfile));
while ((ch = getopt(argc, argv, "SWa:bc:n:qu:")) != -1) { while ((ch = getopt(argc, argv, "SWa:bc:n:q")) != -1) {
switch (ch) { switch (ch) {
case 'S': case 'S':
s->use_vfd_swmr = false; s->use_vfd_swmr = false;
@@ -315,8 +313,12 @@ main(int argc, char **argv)
if (s.file == badhid) if (s.file == badhid)
errx(EXIT_FAILURE, writer ? "H5Fcreate" : "H5Fopen"); errx(EXIT_FAILURE, writer ? "H5Fcreate" : "H5Fopen");
/* Writer creates two named pipes(FIFO) to coordinate two-way communication */ /* Use two named pipes(FIFO) to coordinate the writer and reader for
* two-way communication so that the two sides can move forward together.
* One is for the writer to write to the reader.
* The other one is for the reader to signal the writer. */
if (writer) { if (writer) {
/* Writer creates two named pipes(FIFO) */
if (HDmkfifo(fifo_writer_to_reader, 0600) < 0) if (HDmkfifo(fifo_writer_to_reader, 0600) < 0)
errx(EXIT_FAILURE, "HDmkfifo"); errx(EXIT_FAILURE, "HDmkfifo");
@@ -343,7 +345,7 @@ main(int argc, char **argv)
/* At communication interval, notifies the reader and waits for its response */ /* At communication interval, notifies the reader and waits for its response */
if (step % s.csteps == 0) { if (step % s.csteps == 0) {
/* Bump up the value and notify the reader */ /* Bump up the value of notify to notice the reader to start to read */
notify++; notify++;
if (HDwrite(fd_writer_to_reader, &notify, sizeof(int)) < 0) if (HDwrite(fd_writer_to_reader, &notify, sizeof(int)) < 0)
err(EXIT_FAILURE, "write failed"); err(EXIT_FAILURE, "write failed");
@@ -381,9 +383,10 @@ main(int argc, char **argv)
/* At communication interval, waits for the writer's notice and responds back */ /* At communication interval, waits for the writer's notice and responds back */
if (step % s.csteps == 0) { if (step % s.csteps == 0) {
/* The writer should have bumped up the value of notify.
* Do the same with verify and confirm it */
verify++; verify++;
/* Receive the notify that the writer bumped up the value */
if (HDread(fd_writer_to_reader, &notify, sizeof(int)) < 0) if (HDread(fd_writer_to_reader, &notify, sizeof(int)) < 0)
err(EXIT_FAILURE, "read failed"); err(EXIT_FAILURE, "read failed");
@@ -406,7 +409,7 @@ main(int argc, char **argv)
if (H5Fclose(s.file) < 0) if (H5Fclose(s.file) < 0)
errx(EXIT_FAILURE, "H5Fclose"); errx(EXIT_FAILURE, "H5Fclose");
/* Close the named pipes */ /* Both the writer and reader close the named pipes */
if (HDclose(fd_writer_to_reader) < 0) if (HDclose(fd_writer_to_reader) < 0)
errx(EXIT_FAILURE, "HDclose"); errx(EXIT_FAILURE, "HDclose");