diff options
| author | sonmi%netscape.com <devnull@localhost> | 2001-01-17 02:26:27 +0000 |
|---|---|---|
| committer | sonmi%netscape.com <devnull@localhost> | 2001-01-17 02:26:27 +0000 |
| commit | b490502934b12ed3ebc2cd6ca1b5ecad4952626a (patch) | |
| tree | a9b9275fd49b9c70f2659585a61d7b4a8729ef4b /security | |
| parent | f0822c7c9b7d333c74f23fb4c5aafa2a4ad9c5b6 (diff) | |
| download | nss-hg-b490502934b12ed3ebc2cd6ca1b5ecad4952626a.tar.gz | |
changed the stopQ conditionvariable to theadQ
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/cmd/selfserv/selfserv.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c index fc2ed1597..c6d1246ac 100644 --- a/security/nss/cmd/selfserv/selfserv.c +++ b/security/nss/cmd/selfserv/selfserv.c @@ -308,9 +308,6 @@ typedef int startFn(PRFileDesc *a, PRFileDesc *b, int c); PZLock * threadLock; PZCondVar * threadQ; - -PZLock * stopLock; -PZCondVar * stopQ; static int threadCount = 0; typedef enum { rs_idle = 0, rs_running = 1, rs_zombie = 2 } runState; @@ -885,9 +882,6 @@ server_main( /* create the thread management serialization structs */ threadLock = PZ_NewLock(nssILockSelfServ); threadQ = PZ_NewCondVar(threadLock); - stopLock = PZ_NewLock(nssILockSelfServ); - stopQ = PZ_NewCondVar(stopLock); - addr.inet.family = PR_AF_INET; addr.inet.ip = PR_INADDR_ANY; @@ -1011,11 +1005,11 @@ server_main( PR_Close(listen_sock); } else { VLOG(("selfserv: server_thead: waiting on stopping")); - PZ_Lock( stopLock ); + PZ_Lock( threadLock ); while ( !stopping && threadCount > 0 ) { - PZ_WaitCondVar(stopQ, PR_INTERVAL_NO_TIMEOUT); + PZ_WaitCondVar(threadQ, PR_INTERVAL_NO_TIMEOUT); } - PZ_Unlock( stopLock ); + PZ_Unlock( threadLock ); destroy_thread_data(); VLOG(("selfserv: server_thread: exiting")); } |