summaryrefslogtreecommitdiffstats
path: root/test/twriteorder.c
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-04-22 06:25:12 (GMT)
committerGitHub <noreply@github.com>2023-04-22 06:25:12 (GMT)
commit7707859279a60b32d2b6c915442a7c04d44445b4 (patch)
tree890d16aa2408b270368b36ea4f05ca20fe2f16f6 /test/twriteorder.c
parenta4371b6fce577852691dfdeac642dec1dd4b9453 (diff)
downloadhdf5-7707859279a60b32d2b6c915442a7c04d44445b4.zip
hdf5-7707859279a60b32d2b6c915442a7c04d44445b4.tar.gz
hdf5-7707859279a60b32d2b6c915442a7c04d44445b4.tar.bz2
Merge with develop (#2790)
Diffstat (limited to 'test/twriteorder.c')
-rw-r--r--test/twriteorder.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/test/twriteorder.c b/test/twriteorder.c
index c7984e7..165abcf 100644
--- a/test/twriteorder.c
+++ b/test/twriteorder.c
@@ -273,9 +273,6 @@ write_wo_file(void)
HDmemset(&buffer[4], i & 0xff, (size_t)(BLOCKSIZE_DFT - 4));
/* write the block */
-#ifdef DEBUG
- HDprintf("writing block at %d\n", blkaddr);
-#endif
HDlseek(write_fd_g, (HDoff_t)blkaddr, SEEK_SET);
if ((bytes_wrote = HDwrite(write_fd_g, buffer, (size_t)blocksize_g)) != blocksize_g) {
HDprintf("blkaddr write failed in partition %d\n", i);
@@ -295,9 +292,6 @@ write_wo_file(void)
}
/* all writes done. return success. */
-#ifdef DEBUG
- HDprintf("wrote %d blocks\n", nlinkedblock_g);
-#endif
return 0;
}
@@ -305,9 +299,8 @@ int
read_wo_file(void)
{
int read_fd;
- int blkaddr = 0;
- h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */
- int linkedblocks_read = 0;
+ int blkaddr = 0;
+ h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */
char buffer[BLOCKSIZE_DFT];
/* Open the data file */
@@ -324,30 +317,19 @@ read_wo_file(void)
return -1;
}
}
- linkedblocks_read++;
/* got a non-zero blkaddr. Proceed down the linked blocks. */
-#ifdef DEBUG
- HDprintf("got initial block address=%d\n", blkaddr);
-#endif
while (blkaddr != 0) {
HDlseek(read_fd, (HDoff_t)blkaddr, SEEK_SET);
if ((bytes_read = HDread(read_fd, buffer, (size_t)blocksize_g)) != blocksize_g) {
HDprintf("blkaddr read failed in partition %d\n", 0);
return -1;
}
- linkedblocks_read++;
/* retrieve the block address in byte 0-3 */
HDmemcpy(&blkaddr, &buffer[0], sizeof(blkaddr));
-#ifdef DEBUG
- HDprintf("got next block address=%d\n", blkaddr);
-#endif
}
-#ifdef DEBUG
- HDprintf("read %d blocks\n", linkedblocks_read);
-#endif
return 0;
}
@@ -426,9 +408,6 @@ main(int argc, char *argv[])
/* launch writer */
/* ============= */
/* this process continues to launch the writer */
-#ifdef DEBUG
- HDprintf("%d: continue as the writer process\n", mypid);
-#endif
if (write_wo_file() < 0) {
HDfprintf(stderr, "write_wo_file encountered error\n");
Hgoto_error(1);