NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit933b17b

committed

Adjust test_fsync code to be more sane.

Backpatch to 8.4.X.

1 parentf3f6737 commit933b17bCopy full SHA for 933b17b

File tree

1 file changed

+29

-12

lines changed

src/tools/fsync
- test_fsync.c

1 file changed

+29

-12

lines changed

`‎src/tools/fsync/test_fsync.c`

Lines changed: 29 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/src/tools/fsync/test_fsync.c,v 1.23 2009/06/11 14:49:15 momjian Exp $`
	`2`	`+ * $PostgreSQL: pgsql/src/tools/fsync/test_fsync.c,v 1.24 2009/08/10 18:19:06 momjian Exp $`
`3`	`3`	`*`
`4`	`4`	`*`
`5`	`5`	`*test_fsync.c`
`@@ -30,7 +30,7 @@`
`30`	`30`	`#defineFSYNC_FILENAME"/var/tmp/test_fsync.out"`
`31`	`31`	`#endif`
`32`	`32`
`33`		`-#defineWRITE_SIZE(16 * 1024)`
	`33`	`+#defineWRITE_SIZE(16 * 1024)/* 16k */`
`34`	`34`
`35`	`35`	`voiddie(char*str);`
`36`	`36`	`voidprint_elapse(structtimevalstart_t,structtimevalelapse_t);`
`@@ -71,6 +71,9 @@ main(int argc, char *argv[])`
`71`	`71`
`72`	`72`	`buf= (char*)TYPEALIGN(ALIGNOF_XLOG_BUFFER,full_buf);`
`73`	`73`
	`74`	`+/*`
	`75`	`+ *Simple write`
	`76`	`+ */`
`74`	`77`	`printf("Simple write timing:\n");`
`75`	`78`	`/* write only */`
`76`	`79`	`gettimeofday(&start_t,NULL);`
`@@ -87,8 +90,11 @@ main(int argc, char *argv[])`
`87`	`90`	`print_elapse(start_t,elapse_t);`
`88`	`91`	`printf("\n");`
`89`	`92`
	`93`	`+/*`
	`94`	`+ *Fsync another file descriptor?`
	`95`	`+ */`
`90`	`96`	`printf("\nCompare fsync times on write() and non-write() descriptor:\n");`
`91`		`-printf("(If the times are similar, fsync() can sync data written\n ona different descriptor.)\n");`
	`97`	`+printf("If the times are similar, fsync() can sync data written\nona different descriptor.\n");`
`92`	`98`
`93`	`99`	`/* write, fsync, close */`
`94`	`100`	`gettimeofday(&start_t,NULL);`
`@@ -132,6 +138,9 @@ main(int argc, char *argv[])`
`132`	`138`	`print_elapse(start_t,elapse_t);`
`133`	`139`	`printf("\n");`
`134`	`140`
	`141`	`+/*`
	`142`	`+ *Compare 1 to 2 writes`
	`143`	`+ */`
`135`	`144`	`printf("\nCompare one o_sync write to two:\n");`
`136`	`145`
`137`	`146`	`#ifdefOPEN_SYNC_FLAG`
`@@ -148,7 +157,7 @@ main(int argc, char *argv[])`
`148`	`157`	`print_elapse(start_t,elapse_t);`
`149`	`158`	`printf("\n");`
`150`	`159`
`151`		`-/28k o_sync writes */`
	`160`	`+/Two8k o_sync writes /`
`152`	`161`	`if ((tmpfile=open(filename,O_RDWR \|OPEN_SYNC_FLAG,0))==-1)`
`153`	`162`	`die("Cannot open output file.");`
`154`	`163`	`gettimeofday(&start_t,NULL);`
`@@ -163,14 +172,16 @@ main(int argc, char *argv[])`
`163`	`172`	`close(tmpfile);`
`164`	`173`	`printf("\ttwo 8k o_sync writes ");`
`165`	`174`	`print_elapse(start_t,elapse_t);`
`166`		`-printf("\n");`
`167`		`-`
`168`		`-printf("\nCompare file sync methods with one 8k write:\n");`
`169`	`175`	`#else`
`170`	`176`	`printf("\t(o_sync unavailable) ");`
`171`	`177`	`#endif`
`172`	`178`	`printf("\n");`
`173`	`179`
	`180`	`+/*`
	`181`	`+ *Compare file sync methods with one 8k write`
	`182`	`+ */`
	`183`	`+printf("\nCompare file sync methods with one 8k write:\n");`
	`184`	`+`
`174`	`185`	`#ifdefOPEN_DATASYNC_FLAG`
`175`	`186`	`/* open_dsync, write */`
`176`	`187`	`if ((tmpfile=open(filename,O_RDWR \|O_DSYNC,0))==-1)`
`@@ -183,7 +194,11 @@ main(int argc, char *argv[])`
`183`	`194`	`close(tmpfile);`
`184`	`195`	`printf("\topen o_dsync, write ");`
`185`	`196`	`print_elapse(start_t,elapse_t);`
	`197`	`+#else`
	`198`	`+printf("\t(o_dsync unavailable) ");`
	`199`	`+#endif`
`186`	`200`	`printf("\n");`
	`201`	`+`
`187`	`202`	`#ifdefOPEN_SYNC_FLAG`
`188`	`203`	`/* open_fsync, write */`
`189`	`204`	`if ((tmpfile=open(filename,O_RDWR \|OPEN_SYNC_FLAG,0))==-1)`
`@@ -196,9 +211,8 @@ main(int argc, char *argv[])`
`196`	`211`	`close(tmpfile);`
`197`	`212`	`printf("\topen o_sync, write ");`
`198`	`213`	`print_elapse(start_t,elapse_t);`
`199`		`-#endif`
`200`	`214`	`#else`
`201`		`-printf("\t(o_dsync unavailable) ");`
	`215`	`+printf("\t(o_sync unavailable) ");`
`202`	`216`	`#endif`
`203`	`217`	`printf("\n");`
`204`	`218`
`@@ -235,11 +249,14 @@ main(int argc, char *argv[])`
`235`	`249`	`}`
`236`	`250`	`gettimeofday(&elapse_t,NULL);`
`237`	`251`	`close(tmpfile);`
`238`		`-printf("\twrite, fsync, ");`
	`252`	`+printf("\twrite, fsync ");`
`239`	`253`	`print_elapse(start_t,elapse_t);`
`240`	`254`	`printf("\n");`
`241`	`255`
`242`		`-printf("\nCompare file sync methods with 2 8k writes:\n");`
	`256`	`+/*`
	`257`	`+ *Compare file sync methods with two 8k write`
	`258`	`+ */`
	`259`	`+printf("\nCompare file sync methods with two 8k writes:\n");`
`243`	`260`
`244`	`261`	`#ifdefOPEN_DATASYNC_FLAG`
`245`	`262`	`/* open_dsync, write */`
`@@ -318,7 +335,7 @@ main(int argc, char *argv[])`
`318`	`335`	`}`
`319`	`336`	`gettimeofday(&elapse_t,NULL);`
`320`	`337`	`close(tmpfile);`
`321`		`-printf("\twrite, fsync, ");`
	`338`	`+printf("\twrite, fsync ");`
`322`	`339`	`print_elapse(start_t,elapse_t);`
`323`	`340`	`printf("\n");`
`324`	`341`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit933b17b

File tree

1 file changed

1 file changed

`‎src/tools/fsync/test_fsync.c`

0 commit comments