Avoid PQisBusy/PQconsumeInput busy loop in case of PQisBusy returning

tatsuo-ishii · tatsuo-ishii · commit 9a2e9c680447 · 2002-10-07T05:10:02.000Z
false. per Tom Lane's suggestion. See:

Subject: Suggested change to pgbench
From: Tom Lane &lt;tgl@sss.pgh.pa.us&gt;
To: Tatsuo Ishii &lt;t-ishii@sra.co.jp&gt;
Cc: pgsql-patches@postgreSQL.org
Date: Sun, 06 Oct 2002 12:37:27 -0400

for more details.
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.19 2002/09/04 20:31:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.20 2002/10/07 05:10:02 ishii Exp $
  *
  * pgbench: a simple TPC-B like benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -184,17 +184,16 @@ doOne(CState * state, int n, int debug, int ttype)
 	{							/* are we receiver? */
 		if (debug)
 			fprintf(stderr, "client %d receiving\n", n);
-		while (PQisBusy(st->con) == TRUE)
-		{
-			if (!PQconsumeInput(st->con))
-			{					/* there's something wrong */
-				fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", n, st->state);
-				remains--;		/* I've aborted */
-				PQfinish(st->con);
-				st->con = NULL;
-				return;
-			}
+		if (!PQconsumeInput(st->con))
+		{						/* there's something wrong */
+			fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", n, st->state);
+			remains--;			/* I've aborted */
+			PQfinish(st->con);
+			st->con = NULL;
+			return;
 		}
+		if (PQisBusy(st->con))
+			return;				/* don't have the whole result yet */
 
 		switch (st->state)
 		{
@@ -367,17 +366,16 @@ doSelectOnly(CState * state, int n, int debug)
 	{							/* are we receiver? */
 		if (debug)
 			fprintf(stderr, "client %d receiving\n", n);
-		while (PQisBusy(st->con) == TRUE)
-		{
-			if (!PQconsumeInput(st->con))
-			{					/* there's something wrong */
-				fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", n, st->state);
-				remains--;		/* I've aborted */
-				PQfinish(st->con);
-				st->con = NULL;
-				return;
-			}
+		if (!PQconsumeInput(st->con))
+		{						/* there's something wrong */
+			fprintf(stderr, "Client %d aborted in state %d. Probably the backend died while processing.\n", n, st->state);
+			remains--;			/* I've aborted */
+			PQfinish(st->con);
+			st->con = NULL;
+			return;
 		}
+		if (PQisBusy(st->con))
+			return;				/* don't have the whole result yet */
 
 		switch (st->state)
 		{
