mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-01 23:25:38 +00:00
update
This commit is contained in:
@@ -37,7 +37,7 @@
|
|||||||
ISC_R_SUCCESS);
|
ISC_R_SUCCESS);
|
||||||
|
|
||||||
#ifdef ISC_TASK_TRACE
|
#ifdef ISC_TASK_TRACE
|
||||||
#define XTRACE(m) printf("%s task %p thread %p\n", (m), \
|
#define XTRACE(m) printf("%s task %p thread %lu\n", (m), \
|
||||||
task, isc_thread_self())
|
task, isc_thread_self())
|
||||||
#else
|
#else
|
||||||
#define XTRACE(m)
|
#define XTRACE(m)
|
||||||
@@ -434,8 +434,8 @@ isc_task_destroy(isc_task_t *taskp) {
|
|||||||
*** Task Manager.
|
*** Task Manager.
|
||||||
***/
|
***/
|
||||||
|
|
||||||
static
|
static isc_threadresult_t
|
||||||
void *run(void *uap) {
|
run(void *uap) {
|
||||||
isc_taskmgr_t manager = uap;
|
isc_taskmgr_t manager = uap;
|
||||||
isc_task_t task;
|
isc_task_t task;
|
||||||
isc_boolean_t no_workers = ISC_FALSE;
|
isc_boolean_t no_workers = ISC_FALSE;
|
||||||
@@ -676,7 +676,7 @@ void *run(void *uap) {
|
|||||||
|
|
||||||
XTRACE("exit");
|
XTRACE("exit");
|
||||||
|
|
||||||
return (NULL);
|
return ((isc_threadresult_t)0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@@ -488,7 +488,7 @@ dispatch(isc_timermgr_t manager, isc_time_t now) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static isc_threadresult_t
|
||||||
run(void *uap) {
|
run(void *uap) {
|
||||||
isc_timermgr_t manager = uap;
|
isc_timermgr_t manager = uap;
|
||||||
struct isc_time now;
|
struct isc_time now;
|
||||||
@@ -516,7 +516,7 @@ run(void *uap) {
|
|||||||
}
|
}
|
||||||
UNLOCK(&manager->lock);
|
UNLOCK(&manager->lock);
|
||||||
|
|
||||||
return (NULL);
|
return ((isc_threadresult_t)0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static isc_boolean_t
|
static isc_boolean_t
|
||||||
@@ -628,7 +628,7 @@ isc_timermgr_destroy(isc_timermgr_t *managerp) {
|
|||||||
/*
|
/*
|
||||||
* Wait for thread to exit.
|
* Wait for thread to exit.
|
||||||
*/
|
*/
|
||||||
if (isc_thread_join(manager->thread) != ISC_R_SUCCESS)
|
if (isc_thread_join(manager->thread, NULL) != ISC_R_SUCCESS)
|
||||||
UNEXPECTED_ERROR(__FILE__, __LINE__,
|
UNEXPECTED_ERROR(__FILE__, __LINE__,
|
||||||
"isc_thread_join() failed");
|
"isc_thread_join() failed");
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user