Avoid useless snprintf() call when update_process_title is turned off.

tglsfdc · tglsfdc · commit 36614006e15e · 2010-06-07T15:49:30.000Z
Fujii Masao
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -29,7 +29,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.11 2010/06/03 22:17:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.12 2010/06/07 15:49:30 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -524,7 +524,6 @@ XLogWalRcvFlush(void)
 	{
 		/* use volatile pointer to prevent code rearrangement */
 		volatile WalRcvData *walrcv = WalRcv;
-		char		activitymsg[50];
 
 		issue_xlog_fsync(recvFile, recvId, recvSeg);
 
@@ -536,8 +535,14 @@ XLogWalRcvFlush(void)
 		SpinLockRelease(&walrcv->mutex);
 
 		/* Report XLOG streaming progress in PS display */
-		snprintf(activitymsg, sizeof(activitymsg), "streaming %X/%X",
-				 LogstreamResult.Write.xlogid, LogstreamResult.Write.xrecoff);
-		set_ps_display(activitymsg, false);
+		if (update_process_title)
+		{
+			char		activitymsg[50];
+
+			snprintf(activitymsg, sizeof(activitymsg), "streaming %X/%X",
+					 LogstreamResult.Write.xlogid,
+					 LogstreamResult.Write.xrecoff);
+			set_ps_display(activitymsg, false);
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`*`
`30`	`30`	`*`
`31`	`31`	`* IDENTIFICATION`
`32`		`- * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.11 2010/06/03 22:17:32 tgl Exp $`
	`32`	`+ * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.12 2010/06/07 15:49:30 tgl Exp $`
`33`	`33`	`*`
`34`	`34`	`*-------------------------------------------------------------------------`
`35`	`35`	`*/`
`@@ -524,7 +524,6 @@ XLogWalRcvFlush(void)`
`524`	`524`	`{`
`525`	`525`	`/* use volatile pointer to prevent code rearrangement */`
`526`	`526`	`volatile WalRcvData *walrcv = WalRcv;`
`527`		`- char activitymsg[50];`
`528`	`527`
`529`	`528`	`issue_xlog_fsync(recvFile, recvId, recvSeg);`
`530`	`529`
`@@ -536,8 +535,14 @@ XLogWalRcvFlush(void)`
`536`	`535`	`SpinLockRelease(&walrcv->mutex);`
`537`	`536`
`538`	`537`	`/* Report XLOG streaming progress in PS display */`
`539`		`- snprintf(activitymsg, sizeof(activitymsg), "streaming %X/%X",`
`540`		`- LogstreamResult.Write.xlogid, LogstreamResult.Write.xrecoff);`
`541`		`- set_ps_display(activitymsg, false);`
	`538`	`+ if (update_process_title)`
	`539`	`+ {`
	`540`	`+ char activitymsg[50];`
	`541`	`+`
	`542`	`+ snprintf(activitymsg, sizeof(activitymsg), "streaming %X/%X",`
	`543`	`+ LogstreamResult.Write.xlogid,`
	`544`	`+ LogstreamResult.Write.xrecoff);`
	`545`	`+ set_ps_display(activitymsg, false);`
	`546`	`+ }`
`542`	`547`	`}`
`543`	`548`	`}`