Make stdout unbuffered

alvherre · alvherre · commit 73bcb76b77c2 · 2013-12-19T17:26:27.000-03:00
This ensures that all stdout output is flushed immediately, to match
stderr.  This eliminates the need for fflush(stdout) calls sprinkled all
over the place.

Per Daniel Wood in message 519A79C6.90308@salesforce.com
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
@@ -70,8 +70,6 @@ exit_nicely(void)
 
 	for (i = 0; i < nconns; i++)
 		PQfinish(conns[i]);
-	fflush(stderr);
-	fflush(stdout);
 	exit(1);
 }
 
@@ -101,6 +99,9 @@ main(int argc, char **argv)
 		}
 	}
 
+	/* make stdout unbuffered to match stderr */
+	setbuf(stdout, NULL);
+
 	/*
 	 * If the user supplies a non-option parameter on the command line, use it
 	 * as the conninfo string; otherwise default to setting dbname=postgres
@@ -288,8 +289,6 @@ main(int argc, char **argv)
 	/* Clean up and exit */
 	for (i = 0; i < nconns; i++)
 		PQfinish(conns[i]);
-	fflush(stderr);
-	fflush(stdout);
 	return 0;
 }
 
@@ -574,9 +573,7 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
 			 * but it can only be unblocked by running steps from other
 			 * sessions.
 			 */
-			fflush(stdout);
 			fprintf(stderr, "invalid permutation detected\n");
-			fflush(stderr);
 
 			/* Cancel the waiting statement from this session. */
 			cancel = PQgetCancel(conn);
@@ -664,7 +661,6 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
 						testspec->sessions[i]->name,
 						PQerrorMessage(conns[i + 1]));
 				/* don't exit on teardown failure */
-				fflush(stderr);
 			}
 			PQclear(res);
 		}
@@ -683,7 +679,6 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
 			fprintf(stderr, "teardown failed: %s",
 					PQerrorMessage(conns[0]));
 			/* don't exit on teardown failure */
-			fflush(stderr);
 		}
 		PQclear(res);
 	}

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,6 @@ exit_nicely(void)`
`70`	`70`
`71`	`71`	`for (i = 0; i < nconns; i++)`
`72`	`72`	`PQfinish(conns[i]);`
`73`		`- fflush(stderr);`
`74`		`- fflush(stdout);`
`75`	`73`	`exit(1);`
`76`	`74`	`}`
`77`	`75`
`@@ -101,6 +99,9 @@ main(int argc, char **argv)`
`101`	`99`	`}`
`102`	`100`	`}`
`103`	`101`
	`102`	`+ /* make stdout unbuffered to match stderr */`
	`103`	`+ setbuf(stdout, NULL);`
	`104`	`+`
`104`	`105`	`/*`
`105`	`106`	`* If the user supplies a non-option parameter on the command line, use it`
`106`	`107`	`* as the conninfo string; otherwise default to setting dbname=postgres`
`@@ -288,8 +289,6 @@ main(int argc, char **argv)`
`288`	`289`	`/* Clean up and exit */`
`289`	`290`	`for (i = 0; i < nconns; i++)`
`290`	`291`	`PQfinish(conns[i]);`
`291`		`- fflush(stderr);`
`292`		`- fflush(stdout);`
`293`	`292`	`return 0;`
`294`	`293`	`}`
`295`	`294`
`@@ -574,9 +573,7 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)`
`574`	`573`	`* but it can only be unblocked by running steps from other`
`575`	`574`	`* sessions.`
`576`	`575`	`*/`
`577`		`- fflush(stdout);`
`578`	`576`	`fprintf(stderr, "invalid permutation detected\n");`
`579`		`- fflush(stderr);`
`580`	`577`
`581`	`578`	`/* Cancel the waiting statement from this session. */`
`582`	`579`	`cancel = PQgetCancel(conn);`
`@@ -664,7 +661,6 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)`
`664`	`661`	`testspec->sessions[i]->name,`
`665`	`662`	`PQerrorMessage(conns[i + 1]));`
`666`	`663`	`/* don't exit on teardown failure */`
`667`		`- fflush(stderr);`
`668`	`664`	`}`
`669`	`665`	`PQclear(res);`
`670`	`666`	`}`
`@@ -683,7 +679,6 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)`
`683`	`679`	`fprintf(stderr, "teardown failed: %s",`
`684`	`680`	`PQerrorMessage(conns[0]));`
`685`	`681`	`/* don't exit on teardown failure */`
`686`		`- fflush(stderr);`
`687`	`682`	`}`
`688`	`683`	`PQclear(res);`
`689`	`684`	`}`