Better document win32_open and its ability to allow concurrent

bmomjian · bmomjian · commit edb1ba113d76 · 2004-10-17T23:53:30.000Z
unlink/rename().
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
@@ -10,7 +10,7 @@
  *	Win32 (NT, Win2k, XP).	replace() doesn't work on Win95/98/Me.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.29 2004/10/17 23:39:22 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.30 2004/10/17 23:53:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -68,7 +68,7 @@ pgrename(const char *from, const char *to)
 {
 	int			loops = 0;
 
-	/* Is this loop even necessary?  */
+	/* Is this loop even necessary now that we have win32_open()?  */
 #if defined(WIN32) && !defined(__CYGWIN__)
 	while (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING))
 #endif
@@ -114,7 +114,7 @@ pgunlink(const char *path)
 {
 	int			loops = 0;
 
-	/* Is this loop even necessary?  */
+	/* Is this loop even necessary now that we have win32_open()?  */
 	while (unlink(path))
 	{
 		if (errno != EACCES)
diff --git a/src/port/open.c b/src/port/open.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/port/open.c,v 1.4 2004/08/29 05:07:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/open.c,v 1.5 2004/10/17 23:53:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -71,6 +71,7 @@ win32_open(const char *fileName, int fileFlags,...)
 	/* cannot use O_RDONLY, as it == 0 */
 				  (fileFlags & O_RDWR) ? (GENERIC_WRITE | GENERIC_READ) :
 				 ((fileFlags & O_WRONLY) ? GENERIC_WRITE : GENERIC_READ),
+				/* These flags allow concurrent rename/unlink */
 				(FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
 						&sa,
 						openFlagsToCreateFileFlags(fileFlags),

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.29 2004/10/17 23:39:22 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.30 2004/10/17 23:53:30 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -68,7 +68,7 @@ pgrename(const char from, const char to)`
`68`	`68`	`{`
`69`	`69`	`int loops = 0;`
`70`	`70`
`71`		`- /* Is this loop even necessary? */`
	`71`	`+ /* Is this loop even necessary now that we have win32_open()? */`
`72`	`72`	`#if defined(WIN32) && !defined(__CYGWIN__)`
`73`	`73`	`while (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING))`
`74`	`74`	`#endif`
`@@ -114,7 +114,7 @@ pgunlink(const char *path)`
`114`	`114`	`{`
`115`	`115`	`int loops = 0;`
`116`	`116`
`117`		`- /* Is this loop even necessary? */`
	`117`	`+ /* Is this loop even necessary now that we have win32_open()? */`
`118`	`118`	`while (unlink(path))`
`119`	`119`	`{`
`120`	`120`	`if (errno != EACCES)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/port/open.c,v 1.4 2004/08/29 05:07:02 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/port/open.c,v 1.5 2004/10/17 23:53:30 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -71,6 +71,7 @@ win32_open(const char *fileName, int fileFlags,...)`
`71`	`71`	`/* cannot use O_RDONLY, as it == 0 */`
`72`	`72`	`(fileFlags & O_RDWR) ? (GENERIC_WRITE \| GENERIC_READ) :`
`73`	`73`	`((fileFlags & O_WRONLY) ? GENERIC_WRITE : GENERIC_READ),`
	`74`	`+ /* These flags allow concurrent rename/unlink */`
`74`	`75`	`(FILE_SHARE_READ \| FILE_SHARE_WRITE \| FILE_SHARE_DELETE),`
`75`	`76`	`&sa,`
`76`	`77`	`openFlagsToCreateFileFlags(fileFlags),`