Make setproctitle update for every query.

bmomjian · bmomjian · commit a267c88d3b6f · 2000-05-24T00:14:26.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.141 2000/05/23 22:16:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.142 2000/05/24 00:14:25 momjian Exp $
  *
  * NOTES
  *
@@ -380,6 +380,7 @@ PostmasterMain(int argc, char *argv[])
 
 	*original_extraoptions = '\0';
 
+#ifndef HAVE_SETPROCTITLE
 	/*
 	 * We need four params so we can display status.  If we don't get
 	 * them from the user, let's make them ourselves.
@@ -410,6 +411,7 @@ PostmasterMain(int argc, char *argv[])
 		fprintf(stderr, "PostmasterMain execv failed on %s\n", argv[0]);
 		exit(1);
 	}
+#endif
 
 	progname = argv[0];
 	real_argv = argv;
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
@@ -19,15 +19,14 @@ extern char Ps_status_buffer[];
 
 #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
         do { \
-                Assert(argc >= 5); \
-                setproctitle("%s %s %s %s %s", execname, hostname, username, dbname, Ps_status_buffer); \
+                sprintf(Ps_status_buffer, "%s %s %s %s", execname, hostname, username, dbname); \
         } while (0)
 
 #define PS_CLEAR_STATUS() \
-        do { /*Ps_status_buffer[0] = '\0';*/ } while (0)
+        do { setproctitle("%s", Ps_status_buffer); } while (0)
 
 #define PS_SET_STATUS(status) \
-        do { /*strcpy(Ps_status_buffer, (status));*/ } while (0)
+        do { setproctitle("%s %s", Ps_status_buffer, (status)); } while (0)
 
 #define PS_STATUS (Ps_status_buffer)
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.141 2000/05/23 22:16:27 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.142 2000/05/24 00:14:25 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -380,6 +380,7 @@ PostmasterMain(int argc, char *argv[])`
`380`	`380`
`381`	`381`	`*original_extraoptions = '\0';`
`382`	`382`
	`383`	`+#ifndef HAVE_SETPROCTITLE`
`383`	`384`	`/*`
`384`	`385`	`* We need four params so we can display status. If we don't get`
`385`	`386`	`* them from the user, let's make them ourselves.`
`@@ -410,6 +411,7 @@ PostmasterMain(int argc, char *argv[])`
`410`	`411`	`fprintf(stderr, "PostmasterMain execv failed on %s\n", argv[0]);`
`411`	`412`	`exit(1);`
`412`	`413`	`}`
	`414`	`+#endif`
`413`	`415`
`414`	`416`	`progname = argv[0];`
`415`	`417`	`real_argv = argv;`