Pass canAcceptConnections to exec'ed backend, for Jan.

bmomjian · bmomjian · commit 995773be1ce2 · 2003-05-09T15:57:24.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.325 2003/05/08 20:43:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.326 2003/05/09 15:57:24 momjian Exp $
  *
  * NOTES
  *
@@ -2431,7 +2431,7 @@ BackendFinalize(Port *port)
 #ifdef EXEC_BACKEND
  	Assert(UsedShmemSegID != 0 && UsedShmemSegAddr != NULL);
 	/* database name at the end because it might contain commas */
-	snprintf(pbuf, NAMEDATALEN + 256, "%d,%d,%p,%s", port->sock,
+	snprintf(pbuf, NAMEDATALEN + 256, "%d,%d,%d,%p,%s", port->sock, canAcceptConnections(),
 					UsedShmemSegID, UsedShmemSegAddr, port->database_name);
 	av[ac++] = pbuf;
 #else
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.340 2003/05/08 18:16:36 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.341 2003/05/09 15:57:24 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2142,16 +2142,15 @@ PostgresMain(int argc, char *argv[], const char *username)
 				{
 #ifdef EXEC_BACKEND
 					char *p;
-
-					sscanf(optarg, "%d,%d,%p,", &MyProcPort->sock,
+					int	i;
+					int PMcanAcceptConnections;	/* will eventually be global or static, when fork */
+					
+					sscanf(optarg, "%d,%d,%d,%p,", &MyProcPort->sock, &PMcanAcceptConnections,
 									&UsedShmemSegID, &UsedShmemSegAddr);
 					/* Grab dbname as last param */
-					p = strchr(optarg, ',');
-					if (p)
-						p = strchr(p+1, ',');
-					if (p)					
+					for (i = 0, p = optarg-1; i < 4 && p; i++)
 						p = strchr(p+1, ',');
-					if (p)					
+					if (i == 4 && p)
 						dbname = strdup(p+1);
 #else
 					dbname = strdup(optarg);
@@ -2512,7 +2511,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.340 $ $Date: 2003/05/08 18:16:36 $\n");
+		puts("$Revision: 1.341 $ $Date: 2003/05/09 15:57:24 $\n");
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.325 2003/05/08 20:43:07 momjian Exp $`
	`40`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.326 2003/05/09 15:57:24 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -2431,7 +2431,7 @@ BackendFinalize(Port *port)`
`2431`	`2431`	`#ifdef EXEC_BACKEND`
`2432`	`2432`	`Assert(UsedShmemSegID != 0 && UsedShmemSegAddr != NULL);`
`2433`	`2433`	`/* database name at the end because it might contain commas */`
`2434`		`- snprintf(pbuf, NAMEDATALEN + 256, "%d,%d,%p,%s", port->sock,`
	`2434`	`+ snprintf(pbuf, NAMEDATALEN + 256, "%d,%d,%d,%p,%s", port->sock, canAcceptConnections(),`
`2435`	`2435`	`UsedShmemSegID, UsedShmemSegAddr, port->database_name);`
`2436`	`2436`	`av[ac++] = pbuf;`
`2437`	`2437`	`#else`