mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 00:25:29 +00:00
Code Issues Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Witold Kręcicki
2018-10-23 08:20:17 +00:00
parent c80e25e482
commit 17d46fd48b
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/isc/task.c
View File

@@ -122,10 +122,11 @@ struct isc__task {
typedef ISC_LIST(isc__task_t) isc__tasklist_t; typedef ISC_LIST(isc__task_t) isc__tasklist_t;
struct isc__taskqueue { struct isc__taskqueue {
/* Everything locked by lock */
isc_mutex_t lock;
isc__tasklist_t ready_tasks; isc__tasklist_t ready_tasks;
isc__tasklist_t ready_priority_tasks; isc__tasklist_t ready_priority_tasks;
isc_condition_t work_available; isc_condition_t work_available;
isc_mutex_t lock;
isc_thread_t thread; isc_thread_t thread;
unsigned int threadid; unsigned int threadid;
isc__taskmgr_t *manager; isc__taskmgr_t *manager;
@@ -157,7 +158,6 @@ struct isc__taskmgr {
/* Locked by {pre/post}halt_lock combo */ /* Locked by {pre/post}halt_lock combo */
unsigned int halted; unsigned int halted;
/* /*
* Multiple threads can read/write 'excl' at the same time, so we need * Multiple threads can read/write 'excl' at the same time, so we need
* to protect the access. We can't use 'lock' since isc_task_detach() * to protect the access. We can't use 'lock' since isc_task_detach()
@@ -250,7 +250,9 @@ isc_task_create(isc_taskmgr_t *manager0, unsigned int quantum,
return (ISC_R_NOMEMORY); return (ISC_R_NOMEMORY);
XTRACE("isc_task_create"); XTRACE("isc_task_create");
task->manager = manager; task->manager = manager;
task->threadid = atomic_fetch_add_explicit(&manager->curq, 1, memory_order_relaxed) % manager->workers; task->threadid = atomic_fetch_add_explicit(&manager->curq, 1,
memory_order_relaxed)
% manager->workers;
result = isc_mutex_init(&task->lock); result = isc_mutex_init(&task->lock);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
isc_mem_put(manager->mctx, task, sizeof(*task)); isc_mem_put(manager->mctx, task, sizeof(*task));
@@ -1257,12 +1259,14 @@ run(void *queuep) {
static void static void
manager_free(isc__taskmgr_t *manager) { manager_free(isc__taskmgr_t *manager) {
/* TODO */ for (unsigned int i=0; i < manager->workers; i++) {
DESTROYLOCK(&manager->queues[i].lock);
}
DESTROYLOCK(&manager->lock); DESTROYLOCK(&manager->lock);
DESTROYLOCK(&manager->prehalt_lock); DESTROYLOCK(&manager->prehalt_lock);
DESTROYLOCK(&manager->posthalt_lock); DESTROYLOCK(&manager->posthalt_lock);
isc_mem_put(manager->mctx, manager->queues, manager->workers * sizeof(isc__taskqueue_t)); isc_mem_put(manager->mctx, manager->queues,
manager->workers * sizeof(isc__taskqueue_t));
manager->common.impmagic = 0; manager->common.impmagic = 0;
manager->common.magic = 0; manager->common.magic = 0;
isc_mem_putanddetach(&manager->mctx, manager, sizeof(*manager)); isc_mem_putanddetach(&manager->mctx, manager, sizeof(*manager));
@@ -1272,7 +1276,6 @@ isc_result_t
isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers, isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
unsigned int default_quantum, isc_taskmgr_t **managerp) unsigned int default_quantum, isc_taskmgr_t **managerp)
{ {
isc_result_t result;
unsigned int i; unsigned int i;
isc__taskmgr_t *manager; isc__taskmgr_t *manager;
@@ -1284,25 +1287,20 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
REQUIRE(managerp != NULL && *managerp == NULL); REQUIRE(managerp != NULL && *managerp == NULL);
manager = isc_mem_get(mctx, sizeof(*manager)); manager = isc_mem_get(mctx, sizeof(*manager));
if (manager == NULL) RUNTIME_CHECK(manager != NULL);
return (ISC_R_NOMEMORY);
manager->common.impmagic = TASK_MANAGER_MAGIC; manager->common.impmagic = TASK_MANAGER_MAGIC;
manager->common.magic = ISCAPI_TASKMGR_MAGIC; manager->common.magic = ISCAPI_TASKMGR_MAGIC;
manager->mode = isc_taskmgrmode_normal; manager->mode = isc_taskmgrmode_normal;
manager->mctx = NULL; manager->mctx = NULL;
result = isc_mutex_init(&manager->lock); RUNTIME_CHECK(isc_mutex_init(&manager->lock) == ISC_R_SUCCESS);
if (result != ISC_R_SUCCESS) RUNTIME_CHECK(isc_mutex_init(&manager->excl_lock) == ISC_R_SUCCESS);
goto cleanup_mgr;
result = isc_mutex_init(&manager->excl_lock);
if (result != ISC_R_SUCCESS) {
DESTROYLOCK(&manager->lock);
goto cleanup_mgr;
}
RUNTIME_CHECK(isc_mutex_init(&manager->prehalt_lock) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_mutex_init(&manager->prehalt_lock)
RUNTIME_CHECK(isc_mutex_init(&manager->posthalt_lock) == ISC_R_SUCCESS); == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_mutex_init(&manager->posthalt_lock)
RUNTIME_CHECK(isc_condition_init(&manager->halt_cond) == ISC_R_SUCCESS); == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_condition_init(&manager->halt_cond)
== ISC_R_SUCCESS);
manager->workers = workers; manager->workers = workers;
@@ -1310,7 +1308,10 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
default_quantum = DEFAULT_DEFAULT_QUANTUM; default_quantum = DEFAULT_DEFAULT_QUANTUM;
manager->default_quantum = default_quantum; manager->default_quantum = default_quantum;
INIT_LIST(manager->tasks); INIT_LIST(manager->tasks);
manager->queues = isc_mem_get(mctx, workers * sizeof(isc__taskqueue_t)); manager->queues = isc_mem_get(mctx, workers *
sizeof(isc__taskqueue_t));
RUNTIME_CHECK(manager->queues != NULL);
manager->tasks_running = 0; manager->tasks_running = 0;
manager->tasks_ready = 0; manager->tasks_ready = 0;
manager->curq = 0; manager->curq = 0;
@@ -1350,10 +1351,6 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
*managerp = (isc_taskmgr_t *)manager; *managerp = (isc_taskmgr_t *)manager;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup_mgr:
isc_mem_put(mctx, manager, sizeof(*manager));
return (result);
} }
void void