aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/sgml/func.sgml4
-rw-r--r--src/tools/fsync/README3
-rw-r--r--src/tools/fsync/test_fsync.c34
3 files changed, 21 insertions, 20 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 9cc98b3f92e..e3806322ec6 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.291 2005/11/04 23:13:59 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.291.2.1 2005/11/16 03:56:33 momjian Exp $
PostgreSQL documentation
-->
@@ -1483,7 +1483,7 @@ PostgreSQL documentation
<row>
<entry><literal><function>strpos</function>(<parameter>string</parameter>, <parameter>substring</parameter>)</literal></entry>
- <entry><type>text</type></entry>
+ <entry><type>int</type></entry>
<entry>
Location of specified substring (same as
<literal>position(<parameter>substring</parameter> in
diff --git a/src/tools/fsync/README b/src/tools/fsync/README
index 570708ed510..f93f649b0ef 100644
--- a/src/tools/fsync/README
+++ b/src/tools/fsync/README
@@ -2,4 +2,5 @@ This program tests fsync. The tests are described as part of the program output
Usage: test_fsync [-f filename] [loops]
-Loops defaults to 1000.
+Loops defaults to 1000. The default output file is /var/tmp/test_fsync.out.
+Consider that /tmp or /var/tmp might be memory-based file systems.
diff --git a/src/tools/fsync/test_fsync.c b/src/tools/fsync/test_fsync.c
index 7d65b822c92..7ba648b29ff 100644
--- a/src/tools/fsync/test_fsync.c
+++ b/src/tools/fsync/test_fsync.c
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
strout[i] = 'a';
if ((tmpfile = open(filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
write(tmpfile, strout, WAL_FILE_SIZE);
fsync(tmpfile); /* fsync so later fsync's don't have to do it */
close(tmpfile);
@@ -70,7 +70,7 @@ main(int argc, char *argv[])
for (i = 0; i < loops; i++)
{
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
write(tmpfile, strout, 8192);
close(tmpfile);
}
@@ -87,12 +87,12 @@ main(int argc, char *argv[])
for (i = 0; i < loops; i++)
{
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
write(tmpfile, strout, 8192);
fsync(tmpfile);
close(tmpfile);
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
/* do nothing but the open/close the tests are consistent. */
close(tmpfile);
}
@@ -106,12 +106,12 @@ main(int argc, char *argv[])
for (i = 0; i < loops; i++)
{
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
write(tmpfile, strout, 8192);
close(tmpfile);
/* reopen file */
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
fsync(tmpfile);
close(tmpfile);
}
@@ -124,7 +124,7 @@ main(int argc, char *argv[])
/* 16k o_sync write */
if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
write(tmpfile, strout, 16384);
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
/* 2*8k o_sync writes */
if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
{
@@ -154,7 +154,7 @@ main(int argc, char *argv[])
#ifdef OPEN_DATASYNC_FLAG
/* open_dsync, write */
if ((tmpfile = open(filename, O_RDWR | O_DSYNC)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
write(tmpfile, strout, 8192);
@@ -169,7 +169,7 @@ main(int argc, char *argv[])
/* open_fsync, write */
if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
write(tmpfile, strout, 8192);
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
#ifdef HAVE_FDATASYNC
/* write, fdatasync */
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
{
@@ -200,7 +200,7 @@ main(int argc, char *argv[])
/* write, fsync, close */
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
{
@@ -218,7 +218,7 @@ main(int argc, char *argv[])
#ifdef OPEN_DATASYNC_FLAG
/* open_dsync, write */
if ((tmpfile = open(filename, O_RDWR | O_DSYNC)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
{
@@ -236,7 +236,7 @@ main(int argc, char *argv[])
/* open_fsync, write */
if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
{
@@ -252,7 +252,7 @@ main(int argc, char *argv[])
#ifdef HAVE_FDATASYNC
/* write, fdatasync */
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
{
@@ -271,7 +271,7 @@ main(int argc, char *argv[])
/* write, fsync, close */
if ((tmpfile = open(filename, O_RDWR)) == -1)
- die("can't open /var/tmp/test_fsync.out");
+ die("Cannot open output file.");
gettimeofday(&start_t, NULL);
for (i = 0; i < loops; i++)
{
@@ -306,6 +306,6 @@ print_elapse(struct timeval start_t, struct timeval elapse_t)
void
die(char *str)
{
- fprintf(stderr, "%s", str);
+ fprintf(stderr, "%s\n", str);
exit(1);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 11:28:46 +0000