From 9634e86dc73218c4cdc2589a66d10a93bd8204b9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 30 Apr 2019 14:36:47 +0200 Subject: [PATCH] CLEANUP: task: move the task_per_thread definition to task.h It's the second time I look for it and can't find it because it's not in the right file. --- include/proto/task.h | 10 ---------- include/types/task.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/proto/task.h b/include/proto/task.h index badd13084..859aea385 100644 --- a/include/proto/task.h +++ b/include/proto/task.h @@ -98,16 +98,6 @@ extern struct eb_root rqueue; /* tree constituting the run queue */ extern int global_rqueue_size; /* Number of element sin the global runqueue */ #endif -/* force to split per-thread stuff into separate cache lines */ -struct task_per_thread { - struct eb_root timers; /* tree constituting the per-thread wait queue */ - struct eb_root rqueue; /* tree constituting the per-thread run queue */ - struct list task_list; /* List of tasks to be run, mixing tasks and tasklets */ - int task_list_size; /* Number of tasks in the task_list */ - int rqueue_size; /* Number of elements in the per-thread run queue */ - __attribute__((aligned(64))) char end[0]; -}; - extern struct task_per_thread task_per_thread[MAX_THREADS]; __decl_hathreads(extern HA_SPINLOCK_T rq_lock); /* spin lock related to run queue */ diff --git a/include/types/task.h b/include/types/task.h index 508667c7b..ab909d0f8 100644 --- a/include/types/task.h +++ b/include/types/task.h @@ -57,6 +57,16 @@ struct notification { __decl_hathreads(HA_SPINLOCK_T lock); }; +/* force to split per-thread stuff into separate cache lines */ +struct task_per_thread { + struct eb_root timers; /* tree constituting the per-thread wait queue */ + struct eb_root rqueue; /* tree constituting the per-thread run queue */ + struct list task_list; /* List of tasks to be run, mixing tasks and tasklets */ + int task_list_size; /* Number of tasks in the task_list */ + int rqueue_size; /* Number of elements in the per-thread run queue */ + __attribute__((aligned(64))) char end[0]; +}; + /* This part is common between struct task and struct tasklet so that tasks * can be used as-is as tasklets. */