Commit 9dd79339 authored by Bruce Momjian's avatar Bruce Momjian

Use XLOG_BLCKSZ in pg_test_fsync, rather than our own define, but verify

it is 8k as expected.
parent 9fc01922
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
*/ */
#define FSYNC_FILENAME "./pg_test_fsync.out" #define FSYNC_FILENAME "./pg_test_fsync.out"
#define WRITE_SIZE (8 * 1024) /* 8k */ #if XLOG_BLCKSZ != 8 * 1024 /* 8k */
#error Unknown block size for test.
#endif
#define LABEL_FORMAT " %-32s" #define LABEL_FORMAT " %-32s"
#define NA_FORMAT LABEL_FORMAT "%18s" #define NA_FORMAT LABEL_FORMAT "%18s"
...@@ -198,7 +200,7 @@ test_sync(int writes_per_op) ...@@ -198,7 +200,7 @@ test_sync(int writes_per_op)
for (ops = 0; ops < ops_per_test; ops++) for (ops = 0; ops < ops_per_test; ops++)
{ {
for (writes = 0; writes < writes_per_op; writes++) for (writes = 0; writes < writes_per_op; writes++)
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
if (lseek(tmpfile, 0, SEEK_SET) == -1) if (lseek(tmpfile, 0, SEEK_SET) == -1)
die("seek failed"); die("seek failed");
...@@ -225,7 +227,7 @@ test_sync(int writes_per_op) ...@@ -225,7 +227,7 @@ test_sync(int writes_per_op)
for (ops = 0; ops < ops_per_test; ops++) for (ops = 0; ops < ops_per_test; ops++)
{ {
for (writes = 0; writes < writes_per_op; writes++) for (writes = 0; writes < writes_per_op; writes++)
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
if (lseek(tmpfile, 0, SEEK_SET) == -1) if (lseek(tmpfile, 0, SEEK_SET) == -1)
die("seek failed"); die("seek failed");
...@@ -253,7 +255,7 @@ test_sync(int writes_per_op) ...@@ -253,7 +255,7 @@ test_sync(int writes_per_op)
for (ops = 0; ops < ops_per_test; ops++) for (ops = 0; ops < ops_per_test; ops++)
{ {
for (writes = 0; writes < writes_per_op; writes++) for (writes = 0; writes < writes_per_op; writes++)
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
fdatasync(tmpfile); fdatasync(tmpfile);
if (lseek(tmpfile, 0, SEEK_SET) == -1) if (lseek(tmpfile, 0, SEEK_SET) == -1)
...@@ -278,7 +280,7 @@ test_sync(int writes_per_op) ...@@ -278,7 +280,7 @@ test_sync(int writes_per_op)
for (ops = 0; ops < ops_per_test; ops++) for (ops = 0; ops < ops_per_test; ops++)
{ {
for (writes = 0; writes < writes_per_op; writes++) for (writes = 0; writes < writes_per_op; writes++)
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
if (fsync(tmpfile) != 0) if (fsync(tmpfile) != 0)
die("fsync failed"); die("fsync failed");
...@@ -302,7 +304,7 @@ test_sync(int writes_per_op) ...@@ -302,7 +304,7 @@ test_sync(int writes_per_op)
for (ops = 0; ops < ops_per_test; ops++) for (ops = 0; ops < ops_per_test; ops++)
{ {
for (writes = 0; writes < writes_per_op; writes++) for (writes = 0; writes < writes_per_op; writes++)
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
if (pg_fsync_writethrough(tmpfile) != 0) if (pg_fsync_writethrough(tmpfile) != 0)
die("fsync failed"); die("fsync failed");
...@@ -333,7 +335,7 @@ test_sync(int writes_per_op) ...@@ -333,7 +335,7 @@ test_sync(int writes_per_op)
for (ops = 0; ops < ops_per_test; ops++) for (ops = 0; ops < ops_per_test; ops++)
{ {
for (writes = 0; writes < writes_per_op; writes++) for (writes = 0; writes < writes_per_op; writes++)
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
if (lseek(tmpfile, 0, SEEK_SET) == -1) if (lseek(tmpfile, 0, SEEK_SET) == -1)
die("seek failed"); die("seek failed");
...@@ -360,7 +362,7 @@ test_sync(int writes_per_op) ...@@ -360,7 +362,7 @@ test_sync(int writes_per_op)
for (ops = 0; ops < ops_per_test; ops++) for (ops = 0; ops < ops_per_test; ops++)
{ {
for (writes = 0; writes < writes_per_op; writes++) for (writes = 0; writes < writes_per_op; writes++)
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
if (lseek(tmpfile, 0, SEEK_SET) == -1) if (lseek(tmpfile, 0, SEEK_SET) == -1)
die("seek failed"); die("seek failed");
...@@ -465,7 +467,7 @@ test_file_descriptor_sync(void) ...@@ -465,7 +467,7 @@ test_file_descriptor_sync(void)
{ {
if ((tmpfile = open(filename, O_RDWR, 0)) == -1) if ((tmpfile = open(filename, O_RDWR, 0)) == -1)
die("could not open output file"); die("could not open output file");
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
if (fsync(tmpfile) != 0) if (fsync(tmpfile) != 0)
die("fsync failed"); die("fsync failed");
...@@ -494,7 +496,7 @@ test_file_descriptor_sync(void) ...@@ -494,7 +496,7 @@ test_file_descriptor_sync(void)
{ {
if ((tmpfile = open(filename, O_RDWR, 0)) == -1) if ((tmpfile = open(filename, O_RDWR, 0)) == -1)
die("could not open output file"); die("could not open output file");
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
close(tmpfile); close(tmpfile);
/* reopen file */ /* reopen file */
...@@ -526,7 +528,7 @@ test_non_sync(void) ...@@ -526,7 +528,7 @@ test_non_sync(void)
{ {
if ((tmpfile = open(filename, O_RDWR, 0)) == -1) if ((tmpfile = open(filename, O_RDWR, 0)) == -1)
die("could not open output file"); die("could not open output file");
if (write(tmpfile, buf, WRITE_SIZE) != WRITE_SIZE) if (write(tmpfile, buf, XLOG_BLCKSZ) != XLOG_BLCKSZ)
die("write failed"); die("write failed");
close(tmpfile); close(tmpfile);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment