mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-14 13:29:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: debug: no longer set nor use TH_FL_DUMPING_OTHERS

Browse Source 
TH_FL_DUMPING_OTHERS was being used to try to perform exclusion between
threads running "show threads" and those producing warnings. Now that it
is much more cleanly handled, we don't need that type of protection
anymore, which was adding to the complexity of the solution. Let's just
get rid of it.
This commit is contained in:
Willy Tarreau
2025-04-17 15:35:50 +02:00
parent 513397ac82
commit 874ba2afed
4 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/debug.c
View File

@@ -401,18 +401,6 @@ struct buffer *ha_thread_dump_fill(struct buffer *buf, int thr)
/* silence bogus warning in gcc 11 without threads */
ASSUME(0 <= thr && thr < MAX_THREADS);
/* A thread that's currently dumping other threads cannot be dumped, or
* it will very likely cause a deadlock.
*/
if (HA_ATOMIC_LOAD(&ha_thread_ctx[thr].flags) & TH_FL_DUMPING_OTHERS)
return NULL;
/* This will be undone in ha_thread_dump_done(). We're using an atomic
* OR to also block any possible re-entrance.
*/
if (HA_ATOMIC_FETCH_OR(&th_ctx->flags, TH_FL_DUMPING_OTHERS) & TH_FL_DUMPING_OTHERS)
return NULL;
if (thr != tid) {
struct buffer *old = NULL;
@@ -435,11 +423,8 @@ struct buffer *ha_thread_dump_fill(struct buffer *buf, int thr)
buf = HA_ATOMIC_LOAD(&ha_thread_ctx[thr].thread_dump_buffer);
if ((ulong)buf & 0x1)
break;
if (!buf) {
/* cancelled: no longer dumping */
HA_ATOMIC_AND(&th_ctx->flags, ~TH_FL_DUMPING_OTHERS);
if (!buf)
return buf;
}
ha_thread_relax();
}
}
@@ -486,8 +471,6 @@ void ha_thread_dump_done(int thr)
continue;
}
} while (!HA_ATOMIC_CAS(&ha_thread_ctx[thr].thread_dump_buffer, &old, NULL));
HA_ATOMIC_AND(&th_ctx->flags, ~TH_FL_DUMPING_OTHERS);
}
/* dumps into the buffer some information related to task <task> (which may