Here the fix for the first assertion failure I had which killed

scrappy · scrappy · commit 93c7dcffa2e0 · 1996-10-04T20:33:18.000Z
my postmaster 1.07.
It's really simple, the loop dealing with all sockets
can't handle more than one ready socket :-)
A simple logic error dealing with lists.
OR IS THERE ANY REASON FOR SETTING curr TO 0?

Submitted by:  Carsten Heyl &lt;Heyl@nads.de&gt;
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.3.2.2 1996/10/02 21:36:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.3.2.3 1996/10/04 20:33:18 scrappy Exp $
  *
  * NOTES
  *
@@ -403,7 +403,7 @@ ServerLoop()
     int		serverFd = ServerSock;
     fd_set	rmask, basemask;
     int		nSockets, nSelected, status, newFd;
-    Dlelem   *prev, *curr;
+    Dlelem   *next, *curr;
 /*    int orgsigmask = sigblock(0); */
     sigset_t oldsigmask, newsigmask;
     
@@ -541,10 +541,11 @@ ServerLoop()
 		}
 		FD_CLR(port->sock, &basemask);
 		StreamClose(port->sock);
-		prev = DLGetPred(curr);
+		next = DLGetPred(curr);
 		DLRemove(curr);
 		DLFreeElem(curr);
-		curr = 0;
+		curr = next;
+                continue;
 	    }
 	    curr = DLGetSucc(curr);
 	}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.3.2.2 1996/10/02 21:36:32 scrappy Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.3.2.3 1996/10/04 20:33:18 scrappy Exp $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`*`
`@@ -403,7 +403,7 @@ ServerLoop()`
`403`	`403`	`int serverFd = ServerSock;`
`404`	`404`	`fd_set rmask, basemask;`
`405`	`405`	`int nSockets, nSelected, status, newFd;`
`406`		`- Dlelem prev, curr;`
	`406`	`+ Dlelem next, curr;`
`407`	`407`	`/* int orgsigmask = sigblock(0); */`
`408`	`408`	`sigset_t oldsigmask, newsigmask;`
`409`	`409`
`@@ -541,10 +541,11 @@ ServerLoop()`
`541`	`541`	`}`
`542`	`542`	`FD_CLR(port->sock, &basemask);`
`543`	`543`	`StreamClose(port->sock);`
`544`		`- prev = DLGetPred(curr);`
	`544`	`+ next = DLGetPred(curr);`
`545`	`545`	`DLRemove(curr);`
`546`	`546`	`DLFreeElem(curr);`
`547`		`- curr = 0;`
	`547`	`+ curr = next;`
	`548`	`+ continue;`
`548`	`549`	`}`
`549`	`550`	`curr = DLGetSucc(curr);`
`550`	`551`	`}`