NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5777dca

committed

Fix test_fsync compile on MinGW(win32)

Hiroshi Saito

1 parent47df6e7 commit5777dcaCopy full SHA for 5777dca

File tree

2 files changed

+37

-19

lines changed

src/tools/fsync
- Makefile
- test_fsync.c

2 files changed

+37

-19

lines changed

`‎src/tools/fsync/Makefile`

Lines changed: 18 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,25 @@`
	`1`	`+#-------------------------------------------------------------------------`
`1`	`2`	`#`
`2`		`-# Makefile`
	`3`	`+# Makefile for src/tools/fsync`
`3`	`4`	`#`
	`5`	`+# Copyright (c) 2003-2006, PostgreSQL Global Development Group`
`4`	`6`	`#`
`5`		`-TARGET = test_fsync`
`6`		`-XFLAGS =`
`7`		`-CFLAGS = -O`
`8`		`-LIBS =`
	`7`	`+# $PostgreSQL: pgsql/src/tools/fsync/Makefile,v 1.3 2006/10/13 14:19:29 momjian Exp $`
	`8`	`+#`
	`9`	`+#-------------------------------------------------------------------------`
	`10`	`+`
	`11`	`+subdir = src/tools/fsync`
	`12`	`+top_builddir = ../../..`
	`13`	`+include$(top_builddir)/src/Makefile.global`
	`14`	`+`
	`15`	`+overrideCPPFLAGS := -DFRONTEND -I$(libpq_srcdir)$(CPPFLAGS)`
`9`	`16`
`10`		`-$(TARGET) : test_fsync.o`
`11`		`-$(CC) -o$(TARGET)$(XFLAGS)$(CFLAGS) test_fsync.o$(LIBS)`
	`17`	`+OBJS= test_fsync.o`
`12`	`18`
`13`		`-test_fsync.o: test_fsync.c`
`14`		`-$(CC) -c$(XFLAGS)$(CFLAGS) test_fsync.c`
	`19`	`+all: submake-libpq submake-libpgport test_fsync`
`15`	`20`
`16`		`-clean:`
`17`		`-rm -f*.o$(TARGET) log core`
	`21`	`+test_fsync: test_fsync.o$(libpq_builddir)/libpq.a`
	`22`	`+$(CC)$(CFLAGS) test_fsync.o$(libpq_pgport)$(LDFLAGS)$(LIBS) -o$@$(X)`
`18`	`23`
`19`		`-install:`
`20`		`-make clean`
`21`		`-make CFLAGS=-O`
`22`		`-install -s -o bin -g bin$(TARGET) /usr/local/bin`
	`24`	`+cleandistcleanmaintainer-clean:`
	`25`	`+rm -f test_fsync$(X)$(OBJS)`

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

Lines changed: 19 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`*/`
`5`	`5`
`6`	`6`	`#include"../../include/pg_config.h"`
	`7`	`+#include"../../include/pg_config_os.h"`
`7`	`8`
`8`	`9`	`#include<sys/types.h>`
`9`	`10`	`#include<sys/stat.h>`
`@@ -14,13 +15,19 @@`
`14`	`15`	`#include<sys/time.h>`
`15`	`16`	`#include<unistd.h>`
`16`	`17`
	`18`	`+#ifdefWIN32`
	`19`	`+#defineFSYNC_FILENAME"./test_fsync.out"`
	`20`	`+#else`
`17`	`21`	`#defineFSYNC_FILENAME"/var/tmp/test_fsync.out"`
	`22`	`+#endif`
`18`	`23`
`19`	`24`	`/* O_SYNC and O_FSYNC are the same */`
`20`	`25`	`#if defined(O_SYNC)`
`21`	`26`	`#defineOPEN_SYNC_FLAGO_SYNC`
`22`	`27`	`#elif defined(O_FSYNC)`
`23`	`28`	`#defineOPEN_SYNC_FLAGO_FSYNC`
	`29`	`+#elif defined(O_DSYNC)`
	`30`	`+#defineOPEN_DATASYNC_FLAGO_DSYNC`
`24`	`31`	`#endif`
`25`	`32`
`26`	`33`	`#if defined(OPEN_SYNC_FLAG)`
`@@ -122,6 +129,7 @@ main(int argc, char *argv[])`
`122`	`129`
`123`	`130`	`printf("\nCompare one o_sync write to two:\n");`
`124`	`131`
	`132`	`+#ifdefOPEN_SYNC_FLAG`
`125`	`133`	`/* 16k o_sync write */`
`126`	`134`	`if ((tmpfile=open(filename,O_RDWR \|OPEN_SYNC_FLAG))==-1)`
`127`	`135`	`die("Cannot open output file.");`
`@@ -150,6 +158,10 @@ main(int argc, char *argv[])`
`150`	`158`	`printf("\n");`
`151`	`159`
`152`	`160`	`printf("\nCompare file sync methods with one 8k write:\n");`
	`161`	`+#else`
	`162`	`+printf("\t(o_sync unavailable) ");`
	`163`	`+#endif`
	`164`	`+printf("\n");`
`153`	`165`
`154`	`166`	`#ifdefOPEN_DATASYNC_FLAG`
`155`	`167`	`/* open_dsync, write */`
`@@ -162,11 +174,8 @@ main(int argc, char *argv[])`
`162`	`174`	`close(tmpfile);`
`163`	`175`	`printf("\topen o_dsync, write ");`
`164`	`176`	`print_elapse(start_t,elapse_t);`
`165`		`-#else`
`166`		`-printf("\t(o_dsync unavailable) ");`
`167`		`-#endif`
`168`	`177`	`printf("\n");`
`169`		`-`
	`178`	`+#ifdefOPEN_SYNC_FLAG`
`170`	`179`	`/* open_fsync, write */`
`171`	`180`	`if ((tmpfile=open(filename,O_RDWR \|OPEN_SYNC_FLAG))==-1)`
`172`	`181`	`die("Cannot open output file.");`
`@@ -177,6 +186,10 @@ main(int argc, char *argv[])`
`177`	`186`	`close(tmpfile);`
`178`	`187`	`printf("\topen o_sync, write ");`
`179`	`188`	`print_elapse(start_t,elapse_t);`
	`189`	`+#endif`
	`190`	`+#else`
	`191`	`+printf("\t(o_dsync unavailable) ");`
	`192`	`+#endif`
`180`	`193`	`printf("\n");`
`181`	`194`
`182`	`195`	`#ifdefHAVE_FDATASYNC`
`@@ -234,6 +247,7 @@ main(int argc, char *argv[])`
`234`	`247`	`#endif`
`235`	`248`	`printf("\n");`
`236`	`249`
	`250`	`+#ifdefOPEN_SYNC_FLAG`
`237`	`251`	`/* open_fsync, write */`
`238`	`252`	`if ((tmpfile=open(filename,O_RDWR \|OPEN_SYNC_FLAG))==-1)`
`239`	`253`	`die("Cannot open output file.");`
`@@ -248,6 +262,7 @@ main(int argc, char *argv[])`
`248`	`262`	`printf("\topen o_sync, write ");`
`249`	`263`	`print_elapse(start_t,elapse_t);`
`250`	`264`	`printf("\n");`
	`265`	`+#endif`
`251`	`266`
`252`	`267`	`#ifdefHAVE_FDATASYNC`
`253`	`268`	`/* write, fdatasync */`

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!

Commit5777dca

File tree

2 files changed

2 files changed

`‎src/tools/fsync/Makefile`

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

0 commit comments