gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: fd/threads: remove the now unused fdtab_lock

Browse Source 
It was only used to protect maxfd computation and is not needed
anymore.
This commit is contained in:
Willy Tarreau 2018-01-29 15:24:37 +01:00
parent 173d9951e2
commit f2b5c99b4c
3 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/hathreads.h
View File

@ -203,7 +203,6 @@ int thread_need_sync(void);
enum lock_label {
THREAD_SYNC_LOCK = 0,
FDTAB_LOCK,
FDCACHE_LOCK,
FD_LOCK,
POLL_LOCK,

1
include/proto/fd.h
View File

@ -40,7 +40,6 @@ extern unsigned long fd_cache_mask; // Mask of threads with events in the cache
extern THREAD_LOCAL int *fd_updt; // FD updates list
extern THREAD_LOCAL int fd_nbupdt; // number of updates in the list
__decl_hathreads(extern HA_SPINLOCK_T __attribute__((aligned(64))) fdtab_lock); /* global lock to protect fdtab array */
__decl_hathreads(extern HA_RWLOCK_T __attribute__((aligned(64))) fdcache_lock); /* global lock to protect fd_cache array */
__decl_hathreads(extern HA_SPINLOCK_T __attribute__((aligned(64))) poll_lock); /* global lock to protect poll info */

3
src/fd.c
View File

@ -174,7 +174,6 @@ unsigned long fd_cache_mask = 0; // Mask of threads with events in the cache
THREAD_LOCAL int *fd_updt = NULL; // FD updates list
THREAD_LOCAL int fd_nbupdt = 0; // number of updates in the list
__decl_hathreads(HA_SPINLOCK_T fdtab_lock); /* global lock to protect fdtab array */
__decl_hathreads(HA_RWLOCK_T fdcache_lock); /* global lock to protect fd_cache array */
__decl_hathreads(HA_SPINLOCK_T poll_lock); /* global lock to protect poll info */
@ -332,7 +331,6 @@ int init_pollers()
for (p = 0; p < global.maxsock; p++)
HA_SPIN_INIT(&fdtab[p].lock);
HA_SPIN_INIT(&fdtab_lock);
HA_RWLOCK_INIT(&fdcache_lock);
HA_SPIN_INIT(&poll_lock);
do {
@ -381,7 +379,6 @@ void deinit_pollers() {
free(fdinfo); fdinfo = NULL;
free(fdtab); fdtab = NULL;
HA_SPIN_DESTROY(&fdtab_lock);
HA_RWLOCK_DESTROY(&fdcache_lock);
HA_SPIN_DESTROY(&poll_lock);
}