Commit Diff

Commit:
4a6f0510731b99025c51ce4dc35eee08f697f91a
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
9pserve: fix a new race involving assert(c->nmsg == 0). Just like outputthread can have processed the message but not yet called msgput, the same is true of the connoutthread, so we cannot check c->nmsg until after the connoutthread has shut down gracefully.
Actions:
Patch | Tree
commit - ebda53e16b473c6ad8df070edd6f58e2e1e10994
commit + 4a6f0510731b99025c51ce4dc35eee08f697f91a
blob - f7b76bf9735ef7a2a66bf574ad524af540c73a38
blob + ab27e61a170ef67f327ba40d35bfe0c69da27f4c
--- src/cmd/9pserve.c
+++ src/cmd/9pserve.c
@@ -559,14 +559,14 @@ connthread(void *arg)
 	sync.c = c;
 	sendq(outq, &sync);
 	recvp(c->outqdead);
-
-	/* should be no messages left anywhere. */
-	assert(c->nmsg == 0);
 
 	/* everything is quiet; can close the local output queue. */
 	sendq(c->outq, nil);
 	recvp(c->outqdead);
 
+	/* should be no messages left anywhere. */
+	assert(c->nmsg == 0);
+
 	/* clunk all outstanding fids */
 	for(i=0; i<NHASH; i++){
 		for(h=c->fid[i]; h; h=hnext){