MINOR: task: split the counts of local and global tasks picked
In process_runnable_tasks() we're still calling __task_unlink_rq() to
pick a task, and this function tries to guess where to pick the task
from and which counter to update while the caller's context already
has everything. Worse, the number of local tasks is decremented then
recredited, doubling the operations. In order to avoid this we first
need to keep separate counters for local and global tasks that were
picked. This is what this patch does.
diff --git a/src/task.c b/src/task.c
index dbc6701..dd3080f 100644
--- a/src/task.c
+++ b/src/task.c
@@ -617,7 +617,7 @@
struct mt_list *tmp_list;
unsigned int queue;
int max_processed;
- int picked;
+ int lpicked, gpicked;
int budget;
ti->flags &= ~TI_FL_STUCK; // this thread is still running
@@ -668,9 +668,9 @@
/* pick up to max[TL_NORMAL] regular tasks from prio-ordered run queues */
/* Note: the grq lock is always held when grq is not null */
- picked = 0;
+ lpicked = gpicked = 0;
budget = max[TL_NORMAL] - tt->tasks_in_list;
- while (picked < budget) {
+ while (lpicked + gpicked < budget) {
if ((global_tasks_mask & tid_bit) && !grq) {
#ifdef USE_THREAD
HA_SPIN_LOCK(TASK_RQ_LOCK, &rq_lock);
@@ -702,6 +702,7 @@
t = eb32sc_entry(lrq, struct task, rq);
lrq = eb32sc_next(lrq, tid_bit);
__task_unlink_rq(t);
+ lpicked++;
}
#ifdef USE_THREAD
else {
@@ -715,12 +716,12 @@
HA_SPIN_UNLOCK(TASK_RQ_LOCK, &rq_lock);
}
}
+ gpicked++;
}
#endif
/* Add it to the local task list */
LIST_ADDQ(&tt->tasklets[TL_NORMAL], &((struct tasklet *)t)->list);
- picked++;
}
/* release the rqueue lock */
@@ -729,11 +730,11 @@
grq = NULL;
}
- if (picked) {
+ if (lpicked + gpicked) {
tt->tl_class_mask |= 1 << TL_NORMAL;
- _HA_ATOMIC_ADD(&tt->tasks_in_list, picked);
- _HA_ATOMIC_ADD(&tt->rq_total, picked);
- activity[tid].tasksw += picked;
+ _HA_ATOMIC_ADD(&tt->tasks_in_list, lpicked + gpicked);
+ _HA_ATOMIC_ADD(&tt->rq_total, lpicked + gpicked);
+ activity[tid].tasksw += lpicked + gpicked;
}
/* Merge the list of tasklets waken up by other threads to the