mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-01-30 18:13:32 +00:00
MEDIUM: tasks/fd: replace sleeping_thread_mask with a TH_FL_SLEEPING flag
Every single place where sleeping_thread_mask was still used was to test or set a single thread. We can now add a per-thread flag to indicate a thread is sleeping, and remove this shared mask. The wake_thread() function now always performs an atomic fetch-and-or instead of a first load then an atomic OR. That's cleaner and more reliable. This is not easy to test, as broadcast FD events are rare. The good way to test for this is to run a very low rate-limited frontend with a listener that listens to the fewest possible threads (2), and to send it only 1 connection at a time. The listener will periodically pause and the wakeup task will sometimes wake up on a random thread and will call wake_thread(): frontend test bind :8888 maxconn 10 thread 1-2 rate-limit sessions 5 Alternately, disabling/enabling a frontend in loops via the CLI also broadcasts such events, but they're more difficult to observe since this is causing connection failures.
This commit is contained in:
parent
dce4ad755f
commit
e7475c8e79
@ -375,10 +375,8 @@ static inline void wake_thread(int thr)
|
||||
{
|
||||
struct thread_ctx *ctx = &ha_thread_ctx[thr];
|
||||
|
||||
if (sleeping_thread_mask & (1UL << thr) &&
|
||||
(_HA_ATOMIC_LOAD(&ctx->flags) & TH_FL_NOTIFIED) == 0) {
|
||||
if ((_HA_ATOMIC_FETCH_OR(&ctx->flags, TH_FL_NOTIFIED) & (TH_FL_SLEEPING|TH_FL_NOTIFIED)) == TH_FL_SLEEPING) {
|
||||
char c = 'c';
|
||||
_HA_ATOMIC_OR(&ctx->flags, TH_FL_NOTIFIED);
|
||||
DISGUISE(write(poller_wr_pipe[thr], &c, 1));
|
||||
}
|
||||
}
|
||||
|
@ -43,7 +43,6 @@ extern int killed; /* >0 means a hard-stop is triggered, >1 means hard-stop imme
|
||||
extern char hostname[MAX_HOSTNAME_LEN];
|
||||
extern char *localpeer;
|
||||
extern unsigned int warned; /* bitfield of a few warnings to emit just once */
|
||||
extern volatile unsigned long sleeping_thread_mask;
|
||||
extern struct list proc_list; /* list of process in mworker mode */
|
||||
extern int master; /* 1 if in master, 0 otherwise */
|
||||
extern unsigned int rlim_fd_cur_at_boot;
|
||||
|
@ -43,6 +43,7 @@ enum {
|
||||
#define TH_FL_STUCK 0x00000001
|
||||
#define TH_FL_TASK_PROFILING 0x00000002
|
||||
#define TH_FL_NOTIFIED 0x00000004 /* task was notified about the need to wake up */
|
||||
#define TH_FL_SLEEPING 0x00000008 /* thread won't check its task list before next wakeup */
|
||||
|
||||
|
||||
/* Thread group information. This defines a base and a count of global thread
|
||||
|
@ -1365,7 +1365,8 @@ void debug_handler(int sig, siginfo_t *si, void *arg)
|
||||
/* mark the current thread as stuck to detect it upon next invocation
|
||||
* if it didn't move.
|
||||
*/
|
||||
if (!((threads_harmless_mask|sleeping_thread_mask) & tid_bit))
|
||||
if (!(threads_harmless_mask & tid_bit) &&
|
||||
!(_HA_ATOMIC_LOAD(&th_ctx->flags) & TH_FL_SLEEPING))
|
||||
_HA_ATOMIC_OR(&th_ctx->flags, TH_FL_STUCK);
|
||||
}
|
||||
|
||||
|
3
src/fd.c
3
src/fd.c
@ -770,8 +770,7 @@ void fd_leaving_poll(int wait_time, int status)
|
||||
thread_harmless_end();
|
||||
thread_idle_end();
|
||||
|
||||
if (sleeping_thread_mask & tid_bit)
|
||||
_HA_ATOMIC_AND(&sleeping_thread_mask, ~tid_bit);
|
||||
_HA_ATOMIC_AND(&th_ctx->flags, ~TH_FL_SLEEPING);
|
||||
}
|
||||
|
||||
/* disable the specified poller */
|
||||
|
@ -165,7 +165,6 @@ const char *build_features = "";
|
||||
static struct list cfg_cfgfiles = LIST_HEAD_INIT(cfg_cfgfiles);
|
||||
int pid; /* current process id */
|
||||
|
||||
volatile unsigned long sleeping_thread_mask = 0; /* Threads that are about to sleep in poll() */
|
||||
volatile unsigned long stopping_thread_mask = 0; /* Threads acknowledged stopping */
|
||||
|
||||
/* global options */
|
||||
@ -2804,12 +2803,12 @@ void run_poll_loop()
|
||||
if (thread_has_tasks())
|
||||
activity[tid].wake_tasks++;
|
||||
else {
|
||||
_HA_ATOMIC_OR(&sleeping_thread_mask, tid_bit);
|
||||
_HA_ATOMIC_OR(&th_ctx->flags, TH_FL_SLEEPING);
|
||||
_HA_ATOMIC_AND(&th_ctx->flags, ~TH_FL_NOTIFIED);
|
||||
__ha_barrier_atomic_store();
|
||||
if (thread_has_tasks()) {
|
||||
activity[tid].wake_tasks++;
|
||||
_HA_ATOMIC_AND(&sleeping_thread_mask, ~tid_bit);
|
||||
_HA_ATOMIC_AND(&th_ctx->flags, ~TH_FL_SLEEPING);
|
||||
} else
|
||||
wake = 0;
|
||||
}
|
||||
|
@ -80,7 +80,8 @@ void wdt_handler(int sig, siginfo_t *si, void *arg)
|
||||
if (!p || n - p < 1000000000UL)
|
||||
goto update_and_leave;
|
||||
|
||||
if ((threads_harmless_mask|sleeping_thread_mask|threads_to_dump) & (1UL << thr)) {
|
||||
if ((_HA_ATOMIC_LOAD(&th_ctx->flags) & TH_FL_SLEEPING) &&
|
||||
((threads_harmless_mask|threads_to_dump) & (1UL << thr))) {
|
||||
/* This thread is currently doing exactly nothing
|
||||
* waiting in the poll loop (unlikely but possible),
|
||||
* waiting for all other threads to join the rendez-vous
|
||||
|
Loading…
Reference in New Issue
Block a user