RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-07 03:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: task: re-merge __task_unlink_rq() with task_unlink_rq()

Browse Source 
There's no point keeping the two separate anymore, some tests are
duplicated for no reason.
This commit is contained in:
Willy Tarreau 2021-02-25 07:47:03 +01:00
parent c9afbb10f5
commit c03fbeb358
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
include/haproxy/task.h
View File

@ -309,44 +309,37 @@ static inline void task_set_affinity(struct task *t, unsigned long thread_mask)
}
/*
* Unlink the task from the run queue. The run queue size and number of niced
* tasks are updated too. A pointer to the task itself is returned. The task
* *must* already be in the run queue before calling this function. If the task
* is in the global run queue, the global run queue's lock must already be held.
* If unsure, use the safer task_unlink_rq() function. Note that the pointer to
* the next run queue entry is neither checked nor updated.
*/
static inline struct task *__task_unlink_rq(struct task *t)
{
#ifdef USE_THREAD
if (t->state & TASK_GLOBAL) {
grq_total--;
_HA_ATOMIC_AND(&t->state, ~TASK_GLOBAL);
}
else
#endif
{
_HA_ATOMIC_SUB(&sched->rq_total, 1);
}
eb32sc_delete(&t->rq);
if (likely(t->nice))
_HA_ATOMIC_SUB(&niced_tasks, 1);
return t;
}
/* This function unlinks task <t> from the run queue if it is in it. It also
* takes care of updating the next run queue task if it was this task.
* Unlink the task <t> from the run queue if it's in it. The run queue size and
* number of niced tasks are updated too. A pointer to the task itself is
* returned. If the task is in the global run queue, the global run queue's
* lock will be used during the operation.
*/
static inline struct task *task_unlink_rq(struct task *t)
{
int is_global = t->state & TASK_GLOBAL;
int done = 0;
if (is_global)
HA_SPIN_LOCK(TASK_RQ_LOCK, &rq_lock);
if (likely(task_in_rq(t)))
__task_unlink_rq(t);
if (likely(task_in_rq(t))) {
eb32sc_delete(&t->rq);
if (is_global) {
grq_total--;
done = 1;
}
if (is_global)
HA_SPIN_UNLOCK(TASK_RQ_LOCK, &rq_lock);
if (done) {
if (is_global)
_HA_ATOMIC_AND(&t->state, ~TASK_GLOBAL);
else
_HA_ATOMIC_SUB(&sched->rq_total, 1);
if (t->nice)
_HA_ATOMIC_SUB(&niced_tasks, 1);
}
return t;
}