RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-17 00:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: cli/threads: make "show fd" report thread_sync_io_handler instead of "unknown"

Browse Source 
The output was confusing when the sync point's dummy handler was shown.

This patch should be backported to 1.8 to help with troubleshooting.
This commit is contained in:
Willy Tarreau 2018-03-28 18:06:47 +02:00
parent a7394e1b72
commit 4037a3f904
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common/hathreads.h
View File

@ -866,4 +866,7 @@ static inline void __ha_compiler_barrier(void)
__asm __volatile("" ::: "memory");
}
/* Dummy I/O handler used by the sync pipe.*/
void thread_sync_io_handler(int fd);
#endif /* _COMMON_HATHREADS_H */

1
src/cli.c
View File

@ -817,6 +817,7 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
(fdt.iocb == conn_fd_handler) ? "conn_fd_handler" :
(fdt.iocb == dgram_fd_handler) ? "dgram_fd_handler" :
(fdt.iocb == listener_accept) ? "listener_accept" :
(fdt.iocb == thread_sync_io_handler) ? "thread_sync_io_handler" :
"unknown",
fdt.thread_mask, fdt.update_mask);

4
src/hathreads.c
View File

@ -33,7 +33,9 @@ struct lock_stat lock_stats[LOCK_LABELS];
#endif
/* Dummy I/O handler used by the sync pipe.*/
static void thread_sync_io_handler(int fd) { }
void thread_sync_io_handler(int fd)
{
}
/* Initializes the sync point. It creates a pipe used by threads to wakup all
* others when a sync is requested. It also initialize the mask of all create