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

CLEANUP: fd: remove fd_remove() and rename fd_dodelete() to fd_delete()

Browse Source 
This essentially undoes what we did in fd.c in 1.8 to support seamless
reload. Since we don't need to remove an fd anymore we can turn
fd_delete() to the simple function it used to be.
This commit is contained in:
Willy Tarreau 2020-08-26 11:54:06 +02:00
parent 67672459c7
commit 63d8b6009b
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/haproxy/fd.h
View File

@ -60,11 +60,6 @@ extern volatile int ha_used_fds; // Number of FDs we're currently using
*/
void fd_delete(int fd);
/* Deletes an FD from the fdsets.
* The file descriptor is kept open.
*/
void fd_remove(int fd);
/*
* Take over a FD belonging to another thread.
* Returns 0 on success, and -1 on failure.

24
src/fd.c
View File

@ -297,7 +297,7 @@ done:
/* Deletes an FD from the fdsets.
* The file descriptor is also closed.
*/
static void fd_dodelete(int fd, int do_close)
void fd_delete(int fd)
{
int locked = fdtab[fd].running_mask != tid_bit;
@ -329,10 +329,8 @@ static void fd_dodelete(int fd, int do_close)
fdinfo[fd].port_range = NULL;
fdtab[fd].owner = NULL;
fdtab[fd].thread_mask = 0;
if (do_close) {
close(fd);
_HA_ATOMIC_SUB(&ha_used_fds, 1);
}
close(fd);
_HA_ATOMIC_SUB(&ha_used_fds, 1);
if (locked)
fd_clr_running(fd);
}
@ -393,22 +391,6 @@ int fd_takeover(int fd, void *expected_owner)
return ret;
}
/* Deletes an FD from the fdsets.
* The file descriptor is also closed.
*/
void fd_delete(int fd)
{
fd_dodelete(fd, 1);
}
/* Deletes an FD from the fdsets.
* The file descriptor is kept open.
*/
void fd_remove(int fd)
{
fd_dodelete(fd, 0);
}
void updt_fd_polling(const int fd)
{
if ((fdtab[fd].thread_mask & all_threads_mask) == tid_bit) {