mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

Merge branch '3230-remove-task-exclusive-mode-from-ns_clientmgr' into 'main'

Browse Source 
Remove task exclusive mode from ns_clientmgr

Closes #3230

See merge request isc-projects/bind9!6024
This commit is contained in:
Ondřej Surý
2022-03-30 11:18:08 +00:00
parent 003e4b00c6 a243860562
commit 8594cd00bc
3 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
5842. [cleanup] Remove the task exclusive mode use in ns_clientmgr.
[GL #3230]
5841. [bug] Refactor the address database: 5841. [bug] Refactor the address database:
- Use self-resizing hash tables, eliminating the - Use self-resizing hash tables, eliminating the
need to go into task-exclusive mode when resizing. need to go into task-exclusive mode when resizing.

34
lib/ns/client.c
View File

@@ -2406,13 +2406,8 @@ clientmgr_destroy(ns_clientmgr_t *manager) {
dns_aclenv_detach(&manager->aclenv); dns_aclenv_detach(&manager->aclenv);
isc_mutex_destroy(&manager->lock);
isc_mutex_destroy(&manager->reclock); isc_mutex_destroy(&manager->reclock);
if (manager->excl != NULL) {
isc_task_detach(&manager->excl);
}
isc_task_detach(&manager->task); isc_task_detach(&manager->task);
ns_server_detach(&manager->sctx); ns_server_detach(&manager->sctx);
@@ -2433,13 +2428,6 @@ ns_clientmgr_create(ns_server_t *sctx, isc_taskmgr_t *taskmgr,
manager = isc_mem_get(mctx, sizeof(*manager)); manager = isc_mem_get(mctx, sizeof(*manager));
*manager = (ns_clientmgr_t){ .magic = 0, .mctx = mctx }; *manager = (ns_clientmgr_t){ .magic = 0, .mctx = mctx };
result = isc_taskmgr_excltask(taskmgr, &manager->excl);
if (result != ISC_R_SUCCESS) {
isc_mem_put(mctx, manager, sizeof(*manager));
return (result);
}
isc_mutex_init(&manager->lock);
isc_mutex_init(&manager->reclock); isc_mutex_init(&manager->reclock);
manager->taskmgr = taskmgr; manager->taskmgr = taskmgr;
@@ -2448,7 +2436,6 @@ ns_clientmgr_create(ns_server_t *sctx, isc_taskmgr_t *taskmgr,
dns_aclenv_attach(aclenv, &manager->aclenv); dns_aclenv_attach(aclenv, &manager->aclenv);
manager->exiting = false;
result = isc_task_create_bound(manager->taskmgr, 20, &manager->task, result = isc_task_create_bound(manager->taskmgr, 20, &manager->task,
manager->tid); manager->tid);
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
@@ -2471,33 +2458,16 @@ ns_clientmgr_create(ns_server_t *sctx, isc_taskmgr_t *taskmgr,
void void
ns_clientmgr_destroy(ns_clientmgr_t **managerp) { ns_clientmgr_destroy(ns_clientmgr_t **managerp) {
isc_result_t result;
ns_clientmgr_t *manager; ns_clientmgr_t *manager;
bool unlock = false;
REQUIRE(managerp != NULL); REQUIRE(managerp != NULL);
REQUIRE(VALID_MANAGER(*managerp));
manager = *managerp; manager = *managerp;
*managerp = NULL; *managerp = NULL;
REQUIRE(VALID_MANAGER(manager));
MTRACE("destroy"); MTRACE("destroy");
/*
* Check for success because we may already be task-exclusive
* at this point. Only if we succeed at obtaining an exclusive
* lock now will we need to relinquish it later.
*/
result = isc_task_beginexclusive(manager->excl);
if (result == ISC_R_SUCCESS) {
unlock = true;
}
manager->exiting = true;
if (unlock) {
isc_task_endexclusive(manager->excl);
}
if (isc_refcount_decrement(&manager->references) == 1) { if (isc_refcount_decrement(&manager->references) == 1) {
clientmgr_destroy(manager); clientmgr_destroy(manager);
} }

5
lib/ns/include/ns/client.h
View File

@@ -147,7 +147,6 @@ struct ns_clientmgr {
ns_server_t *sctx; ns_server_t *sctx;
isc_taskmgr_t *taskmgr; isc_taskmgr_t *taskmgr;
isc_timermgr_t *timermgr; isc_timermgr_t *timermgr;
isc_task_t *excl;
isc_refcount_t references; isc_refcount_t references;
int tid; int tid;
@@ -156,10 +155,6 @@ struct ns_clientmgr {
dns_aclenv_t *aclenv; dns_aclenv_t *aclenv;
/* Lock covers manager state. */
isc_mutex_t lock;
bool exiting;
/* Lock covers the recursing list */ /* Lock covers the recursing list */
isc_mutex_t reclock; isc_mutex_t reclock;
client_list_t recursing; /*%< Recursing clients */ client_list_t recursing; /*%< Recursing clients */