Remove now redundant pgpipe code.

adunstan · adunstan · commit d2c1740dc275 · 2012-03-28T23:24:07.000-04:00
diff --git a/src/backend/port/pipe.c b/src/backend/port/pipe.c
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
@@ -391,9 +391,9 @@ SysLoggerMain(int argc, char *argv[])
 		}
 		else if (rc > 0 && FD_ISSET(syslogPipe[0], &rfds))
 		{
-			bytesRead = piperead(syslogPipe[0],
-								 logbuffer + bytes_in_logbuffer,
-								 sizeof(logbuffer) - bytes_in_logbuffer);
+			bytesRead = read(syslogPipe[0],
+							 logbuffer + bytes_in_logbuffer,
+							 sizeof(logbuffer) - bytes_in_logbuffer);
 			if (bytesRead < 0)
 			{
 				if (errno != EINTR)
@@ -487,7 +487,7 @@ SysLogger_Start(void)
 #ifndef WIN32
 	if (syslogPipe[0] < 0)
 	{
-		if (pgpipe(syslogPipe) < 0)
+		if (pipe(syslogPipe) < 0)
 			ereport(FATAL,
 					(errcode_for_socket_access(),
 					 (errmsg("could not create pipe for syslog: %m"))));
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -162,7 +162,7 @@ segment_callback(XLogRecPtr segendpos, uint32 timeline)
 			char		xlogend[64];
 
 			MemSet(xlogend, 0, sizeof(xlogend));
-			r = piperead(bgpipe[0], xlogend, sizeof(xlogend));
+			r = read(bgpipe[0], xlogend, sizeof(xlogend));
 			if (r < 0)
 			{
 				fprintf(stderr, _("%s: could not read from ready pipe: %s\n"),
@@ -270,7 +270,7 @@ StartLogStreamer(char *startpos, uint32 timeline, char *sysidentifier)
 
 #ifndef WIN32
 	/* Create our background pipe */
-	if (pgpipe(bgpipe) < 0)
+	if (pipe(bgpipe) < 0)
 	{
 		fprintf(stderr, _("%s: could not create pipe for background process: %s\n"),
 				progname, strerror(errno));
@@ -1094,7 +1094,7 @@ BaseBackup(void)
 			fprintf(stderr, _("%s: waiting for background process to finish streaming...\n"), progname);
 
 #ifndef WIN32
-		if (pipewrite(bgpipe[1], xlogend, strlen(xlogend)) != strlen(xlogend))
+		if (write(bgpipe[1], xlogend, strlen(xlogend)) != strlen(xlogend))
 		{
 			fprintf(stderr, _("%s: could not send command to background pipe: %s\n"),
 					progname, strerror(errno));
diff --git a/src/include/port.h b/src/include/port.h
@@ -250,26 +250,7 @@ extern char *pgwin32_setlocale(int category, const char *locale);
 /* Portable prompt handling */
 extern char *simple_prompt(const char *prompt, int maxlen, bool echo);
 
-/*
- *	WIN32 doesn't allow descriptors returned by pipe() to be used in select(),
- *	so for that platform we use socket() instead of pipe().
- *	There is some inconsistency here because sometimes we require pg*, like
- *	pgpipe, but in other cases we define rename to pgrename just on Win32.
- */
-#ifndef WIN32
-/*
- *	The function prototypes are not supplied because every C file
- *	includes this file.
- */
-#define pgpipe(a)			pipe(a)
-#define piperead(a,b,c)		read(a,b,c)
-#define pipewrite(a,b,c)	write(a,b,c)
-#else
-extern int	pgpipe(int handles[2]);
-extern int	piperead(int s, char *buf, int len);
-
-#define pipewrite(a,b,c)	send(a,b,c,0)
-
+#ifdef WIN32
 #define PG_SIGNAL_COUNT 32
 #define kill(pid,sig)	pgkill(pid,sig)
 extern int	pgkill(int pid, int sig);
diff --git a/src/port/exec.c b/src/port/exec.c
@@ -496,7 +496,8 @@ pipe_read_line(char *cmd, char *line, int maxsize)
 /*
  * pclose() plus useful error reporting
  * Is this necessary?  bjm 2004-05-11
- * It is better here because pipe.c has win32 backend linkage.
+ * Originaally this was stated to be here because pipe.c had backend linkage.
+ * Perhaps that's no longer so now we have got rid of pipe.c amd 2012-03-28
  */
 int
 pclose_check(FILE *stream)
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -73,7 +73,6 @@ sub mkvcbuild
     $postgres->ReplaceFile('src\backend\port\pg_shmem.c','src\backend\port\win32_shmem.c');
     $postgres->ReplaceFile('src\backend\port\pg_latch.c','src\backend\port\win32_latch.c');
     $postgres->AddFiles('src\port',@pgportfiles);
-    $postgres->AddFile('src\backend\port\pipe.c');
     $postgres->AddDir('src\timezone');
     $postgres->AddFiles('src\backend\parser','scan.l','gram.y');
     $postgres->AddFiles('src\backend\bootstrap','bootscanner.l','bootparse.y');

Original file line number	Diff line number	Diff line change
`@@ -391,9 +391,9 @@ SysLoggerMain(int argc, char *argv[])`
`391`	`391`	`}`
`392`	`392`	`else if (rc > 0 && FD_ISSET(syslogPipe[0], &rfds))`
`393`	`393`	`{`
`394`		`- bytesRead = piperead(syslogPipe[0],`
`395`		`- logbuffer + bytes_in_logbuffer,`
`396`		`- sizeof(logbuffer) - bytes_in_logbuffer);`
	`394`	`+ bytesRead = read(syslogPipe[0],`
	`395`	`+ logbuffer + bytes_in_logbuffer,`
	`396`	`+ sizeof(logbuffer) - bytes_in_logbuffer);`
`397`	`397`	`if (bytesRead < 0)`
`398`	`398`	`{`
`399`	`399`	`if (errno != EINTR)`
`@@ -487,7 +487,7 @@ SysLogger_Start(void)`
`487`	`487`	`#ifndef WIN32`
`488`	`488`	`if (syslogPipe[0] < 0)`
`489`	`489`	`{`
`490`		`- if (pgpipe(syslogPipe) < 0)`
	`490`	`+ if (pipe(syslogPipe) < 0)`
`491`	`491`	`ereport(FATAL,`
`492`	`492`	`(errcode_for_socket_access(),`
`493`	`493`	`(errmsg("could not create pipe for syslog: %m"))));`