[v9_10] isc__taskmgr_pause() could deadlock

4271.	[test]		Unit tests could deadlock in isc__taskmgr_pause().
			[RT #41235]
This commit is contained in:
Evan Hunt 2015-12-03 20:48:46 -08:00
parent 2a5f7d6087
commit e7d8959e1b
2 changed files with 4 additions and 3 deletions

View file

@ -1,3 +1,6 @@
4271. [test] Unit tests could deadlock in isc__taskmgr_pause().
[RT #41235]
4270. [security] Update allowed OpenSSL versions as named is
potentially vulnerable to CVE-2015-3193.

View file

@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id$ */
/*! \file
* \author Principal Author: Bob Halley
*/
@ -1645,11 +1643,11 @@ isc__taskmgr_dispatch(isc_taskmgr_t *manager0) {
void
isc__taskmgr_pause(isc_taskmgr_t *manager0) {
isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0;
manager->pause_requested = ISC_TRUE;
LOCK(&manager->lock);
while (manager->tasks_running > 0) {
WAIT(&manager->paused, &manager->lock);
}
manager->pause_requested = ISC_TRUE;
UNLOCK(&manager->lock);
}