diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-15 13:27:42 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-15 13:27:42 +0100 |
commit | f9c239ec2a5d21a5ea4855fb002b65aeb10eb012 (patch) | |
tree | b6a675500875ba76018efdd204fd76aedaa3121a | |
parent | 2eb1573d56d2b44702c05650ee41fcbacf4b01ce (diff) | |
download | libmicrohttpd-f9c239ec2a5d21a5ea4855fb002b65aeb10eb012.tar.gz libmicrohttpd-f9c239ec2a5d21a5ea4855fb002b65aeb10eb012.zip |
convert listen_socket_in_epoll to 'bool'
-rw-r--r-- | src/microhttpd/daemon.c | 22 | ||||
-rw-r--r-- | src/microhttpd/internal.h | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index e7d8ebf7..11df3a38 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -3727,7 +3727,7 @@ MHD_epoll (struct MHD_Daemon *daemon, | |||
3727 | if ( (MHD_INVALID_SOCKET != (ls = daemon->listen_fd)) && | 3727 | if ( (MHD_INVALID_SOCKET != (ls = daemon->listen_fd)) && |
3728 | (! daemon->was_quiesced) && | 3728 | (! daemon->was_quiesced) && |
3729 | (daemon->connections < daemon->connection_limit) && | 3729 | (daemon->connections < daemon->connection_limit) && |
3730 | (MHD_NO == daemon->listen_socket_in_epoll) && | 3730 | (! daemon->listen_socket_in_epoll) && |
3731 | (! daemon->at_limit) ) | 3731 | (! daemon->at_limit) ) |
3732 | { | 3732 | { |
3733 | event.events = EPOLLIN; | 3733 | event.events = EPOLLIN; |
@@ -3744,17 +3744,17 @@ MHD_epoll (struct MHD_Daemon *daemon, | |||
3744 | #endif | 3744 | #endif |
3745 | return MHD_NO; | 3745 | return MHD_NO; |
3746 | } | 3746 | } |
3747 | daemon->listen_socket_in_epoll = MHD_YES; | 3747 | daemon->listen_socket_in_epoll = true; |
3748 | } | 3748 | } |
3749 | if ( (daemon->was_quiesced) && | 3749 | if ( (daemon->was_quiesced) && |
3750 | (MHD_YES == daemon->listen_socket_in_epoll) ) | 3750 | (daemon->listen_socket_in_epoll) ) |
3751 | { | 3751 | { |
3752 | if (0 != epoll_ctl (daemon->epoll_fd, | 3752 | if (0 != epoll_ctl (daemon->epoll_fd, |
3753 | EPOLL_CTL_DEL, | 3753 | EPOLL_CTL_DEL, |
3754 | ls, | 3754 | ls, |
3755 | NULL)) | 3755 | NULL)) |
3756 | MHD_PANIC ("Failed to remove listen FD from epoll set\n"); | 3756 | MHD_PANIC ("Failed to remove listen FD from epoll set\n"); |
3757 | daemon->listen_socket_in_epoll = MHD_NO; | 3757 | daemon->listen_socket_in_epoll = false; |
3758 | } | 3758 | } |
3759 | 3759 | ||
3760 | #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT) | 3760 | #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT) |
@@ -3778,7 +3778,7 @@ MHD_epoll (struct MHD_Daemon *daemon, | |||
3778 | daemon->upgrade_fd_in_epoll = MHD_YES; | 3778 | daemon->upgrade_fd_in_epoll = MHD_YES; |
3779 | } | 3779 | } |
3780 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ | 3780 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ |
3781 | if ( (MHD_YES == daemon->listen_socket_in_epoll) && | 3781 | if ( (daemon->listen_socket_in_epoll) && |
3782 | ( (daemon->connections == daemon->connection_limit) || | 3782 | ( (daemon->connections == daemon->connection_limit) || |
3783 | (daemon->at_limit) || | 3783 | (daemon->at_limit) || |
3784 | (daemon->was_quiesced) ) ) | 3784 | (daemon->was_quiesced) ) ) |
@@ -3790,7 +3790,7 @@ MHD_epoll (struct MHD_Daemon *daemon, | |||
3790 | ls, | 3790 | ls, |
3791 | NULL)) | 3791 | NULL)) |
3792 | MHD_PANIC (_("Failed to remove listen FD from epoll set\n")); | 3792 | MHD_PANIC (_("Failed to remove listen FD from epoll set\n")); |
3793 | daemon->listen_socket_in_epoll = MHD_NO; | 3793 | daemon->listen_socket_in_epoll = false; |
3794 | } | 3794 | } |
3795 | if (MHD_YES == may_block) | 3795 | if (MHD_YES == may_block) |
3796 | { | 3796 | { |
@@ -4207,14 +4207,14 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon) | |||
4207 | #ifdef EPOLL_SUPPORT | 4207 | #ifdef EPOLL_SUPPORT |
4208 | if ( (0 != (daemon->options & MHD_USE_EPOLL)) && | 4208 | if ( (0 != (daemon->options & MHD_USE_EPOLL)) && |
4209 | (-1 != daemon->worker_pool[i].epoll_fd) && | 4209 | (-1 != daemon->worker_pool[i].epoll_fd) && |
4210 | (MHD_YES == daemon->worker_pool[i].listen_socket_in_epoll) ) | 4210 | (daemon->worker_pool[i].listen_socket_in_epoll) ) |
4211 | { | 4211 | { |
4212 | if (0 != epoll_ctl (daemon->worker_pool[i].epoll_fd, | 4212 | if (0 != epoll_ctl (daemon->worker_pool[i].epoll_fd, |
4213 | EPOLL_CTL_DEL, | 4213 | EPOLL_CTL_DEL, |
4214 | ret, | 4214 | ret, |
4215 | NULL)) | 4215 | NULL)) |
4216 | MHD_PANIC (_("Failed to remove listen FD from epoll set\n")); | 4216 | MHD_PANIC (_("Failed to remove listen FD from epoll set\n")); |
4217 | daemon->worker_pool[i].listen_socket_in_epoll = MHD_NO; | 4217 | daemon->worker_pool[i].listen_socket_in_epoll = false; |
4218 | } | 4218 | } |
4219 | else | 4219 | else |
4220 | #endif | 4220 | #endif |
@@ -4228,14 +4228,14 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon) | |||
4228 | #ifdef EPOLL_SUPPORT | 4228 | #ifdef EPOLL_SUPPORT |
4229 | if ( (0 != (daemon->options & MHD_USE_EPOLL)) && | 4229 | if ( (0 != (daemon->options & MHD_USE_EPOLL)) && |
4230 | (-1 != daemon->epoll_fd) && | 4230 | (-1 != daemon->epoll_fd) && |
4231 | (MHD_YES == daemon->listen_socket_in_epoll) ) | 4231 | (daemon->listen_socket_in_epoll) ) |
4232 | { | 4232 | { |
4233 | if (0 != epoll_ctl (daemon->epoll_fd, | 4233 | if (0 != epoll_ctl (daemon->epoll_fd, |
4234 | EPOLL_CTL_DEL, | 4234 | EPOLL_CTL_DEL, |
4235 | ret, | 4235 | ret, |
4236 | NULL)) | 4236 | NULL)) |
4237 | MHD_PANIC ("Failed to remove listen FD from epoll set\n"); | 4237 | MHD_PANIC ("Failed to remove listen FD from epoll set\n"); |
4238 | daemon->listen_socket_in_epoll = MHD_NO; | 4238 | daemon->listen_socket_in_epoll = false; |
4239 | } | 4239 | } |
4240 | #endif | 4240 | #endif |
4241 | if ( (MHD_ITC_IS_VALID_(daemon->itc)) && | 4241 | if ( (MHD_ITC_IS_VALID_(daemon->itc)) && |
@@ -4752,6 +4752,7 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon) | |||
4752 | #endif | 4752 | #endif |
4753 | return MHD_NO; | 4753 | return MHD_NO; |
4754 | } | 4754 | } |
4755 | daemon->listen_socket_in_epoll = true; | ||
4755 | if (MHD_ITC_IS_VALID_(daemon->itc)) | 4756 | if (MHD_ITC_IS_VALID_(daemon->itc)) |
4756 | { | 4757 | { |
4757 | event.events = EPOLLIN; | 4758 | event.events = EPOLLIN; |
@@ -4770,7 +4771,6 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon) | |||
4770 | return MHD_NO; | 4771 | return MHD_NO; |
4771 | } | 4772 | } |
4772 | } | 4773 | } |
4773 | daemon->listen_socket_in_epoll = MHD_YES; | ||
4774 | return MHD_YES; | 4774 | return MHD_YES; |
4775 | } | 4775 | } |
4776 | #endif | 4776 | #endif |
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h index 111af62f..b9c30b5d 100644 --- a/src/microhttpd/internal.h +++ b/src/microhttpd/internal.h | |||
@@ -1394,10 +1394,10 @@ struct MHD_Daemon | |||
1394 | int epoll_fd; | 1394 | int epoll_fd; |
1395 | 1395 | ||
1396 | /** | 1396 | /** |
1397 | * #MHD_YES if the listen socket is in the 'epoll' set, | 1397 | * true if the listen socket is in the 'epoll' set, |
1398 | * #MHD_NO if not. | 1398 | * false if not. |
1399 | */ | 1399 | */ |
1400 | int listen_socket_in_epoll; | 1400 | bool listen_socket_in_epoll; |
1401 | 1401 | ||
1402 | #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT) | 1402 | #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT) |
1403 | /** | 1403 | /** |