|
@@ -66,6 +66,7 @@ enum {
|
|
|
|
|
|
/* pool flags */
|
|
/* pool flags */
|
|
POOL_MANAGE_WORKERS = 1 << 0, /* need to manage workers */
|
|
POOL_MANAGE_WORKERS = 1 << 0, /* need to manage workers */
|
|
|
|
+ POOL_MANAGING_WORKERS = 1 << 1, /* managing workers */
|
|
|
|
|
|
/* worker flags */
|
|
/* worker flags */
|
|
WORKER_STARTED = 1 << 0, /* started */
|
|
WORKER_STARTED = 1 << 0, /* started */
|
|
@@ -652,7 +653,7 @@ static bool need_to_manage_workers(struct worker_pool *pool)
|
|
/* Do we have too many workers and should some go away? */
|
|
/* Do we have too many workers and should some go away? */
|
|
static bool too_many_workers(struct worker_pool *pool)
|
|
static bool too_many_workers(struct worker_pool *pool)
|
|
{
|
|
{
|
|
- bool managing = mutex_is_locked(&pool->manager_mutex);
|
|
|
|
|
|
+ bool managing = pool->flags & POOL_MANAGING_WORKERS;
|
|
int nr_idle = pool->nr_idle + managing; /* manager is considered idle */
|
|
int nr_idle = pool->nr_idle + managing; /* manager is considered idle */
|
|
int nr_busy = pool->nr_workers - nr_idle;
|
|
int nr_busy = pool->nr_workers - nr_idle;
|
|
|
|
|
|
@@ -1827,6 +1828,7 @@ static bool manage_workers(struct worker *worker)
|
|
if (!mutex_trylock(&pool->manager_mutex))
|
|
if (!mutex_trylock(&pool->manager_mutex))
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
|
|
+ pool->flags |= POOL_MANAGING_WORKERS;
|
|
pool->flags &= ~POOL_MANAGE_WORKERS;
|
|
pool->flags &= ~POOL_MANAGE_WORKERS;
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -1836,6 +1838,7 @@ static bool manage_workers(struct worker *worker)
|
|
ret |= maybe_destroy_workers(pool);
|
|
ret |= maybe_destroy_workers(pool);
|
|
ret |= maybe_create_worker(pool);
|
|
ret |= maybe_create_worker(pool);
|
|
|
|
|
|
|
|
+ pool->flags &= ~POOL_MANAGING_WORKERS;
|
|
mutex_unlock(&pool->manager_mutex);
|
|
mutex_unlock(&pool->manager_mutex);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|