mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: fd: remove the now unneeded fd_mig_lock

Browse Source 
This is not needed anymore since we don't use it when setting the running
mask anymore.
This commit is contained in:
Willy Tarreau 2021-08-03 09:24:41 +02:00
parent b201b1dab1
commit 7b2ac29a92
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/haproxy/fd.h
View File

@ -67,11 +67,6 @@ void _fd_delete_orphan(int fd);
*/ */
int fd_takeover(int fd, void *expected_owner); int fd_takeover(int fd, void *expected_owner);
/* lock used by FD migration */
#ifndef HA_HAVE_CAS_DW
__decl_thread(extern HA_RWLOCK_T fd_mig_lock);
#endif
ssize_t fd_write_frag_line(int fd, size_t maxlen, const struct ist pfx[], size_t npfx, const struct ist msg[], size_t nmsg, int nl); ssize_t fd_write_frag_line(int fd, size_t maxlen, const struct ist pfx[], size_t npfx, const struct ist msg[], size_t nmsg, int nl);
/* close all FDs starting from <start> */ /* close all FDs starting from <start> */

10
src/fd.c
View File

@ -328,10 +328,6 @@ void _fd_delete_orphan(int fd)
_HA_ATOMIC_DEC(&ha_used_fds); _HA_ATOMIC_DEC(&ha_used_fds);
} }
#ifndef HA_HAVE_CAS_DW
__decl_thread(__decl_rwlock(fd_mig_lock));
#endif
/* Deletes an FD from the fdsets. The file descriptor is also closed, possibly /* Deletes an FD from the fdsets. The file descriptor is also closed, possibly
* asynchronously. Only the owning thread may do this. * asynchronously. Only the owning thread may do this.
*/ */
@ -354,13 +350,7 @@ void fd_delete(int fd)
*/ */
HA_ATOMIC_OR(&fdtab[fd].running_mask, tid_bit); HA_ATOMIC_OR(&fdtab[fd].running_mask, tid_bit);
#ifndef HA_HAVE_CAS_DW
HA_RWLOCK_WRLOCK(OTHER_LOCK, &fd_mig_lock);
#endif
HA_ATOMIC_STORE(&fdtab[fd].thread_mask, 0); HA_ATOMIC_STORE(&fdtab[fd].thread_mask, 0);
#ifndef HA_HAVE_CAS_DW
HA_RWLOCK_WRUNLOCK(OTHER_LOCK, &fd_mig_lock);
#endif
if (fd_clr_running(fd) == 0) if (fd_clr_running(fd) == 0)
_fd_delete_orphan(fd); _fd_delete_orphan(fd);
} }