diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-14 15:54:34 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-14 15:54:34 +0100 |
commit | 205a3c20a299a821d51ec2e37dfdf2edb97f138c (patch) | |
tree | 48287429c2b744075e3481d0c3ecd5d254003d55 | |
parent | 648b65aa6c62e040e13976a8a2323829339a1572 (diff) | |
download | libmicrohttpd-205a3c20a299a821d51ec2e37dfdf2edb97f138c.tar.gz libmicrohttpd-205a3c20a299a821d51ec2e37dfdf2edb97f138c.zip |
mark 'shutdown' as volatile, and convert to bool
-rw-r--r-- | src/microhttpd/daemon.c | 38 | ||||
-rw-r--r-- | src/microhttpd/internal.h | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 6f010ec7..5e0b87f6 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -779,7 +779,7 @@ MHD_get_fdset2 (struct MHD_Daemon *daemon, | |||
779 | if ( (NULL == daemon) || | 779 | if ( (NULL == daemon) || |
780 | (NULL == read_fd_set) || | 780 | (NULL == read_fd_set) || |
781 | (NULL == write_fd_set) || | 781 | (NULL == write_fd_set) || |
782 | (MHD_YES == daemon->shutdown) || | 782 | (daemon->shutdown) || |
783 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || | 783 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || |
784 | (0 != (daemon->options & MHD_USE_POLL))) | 784 | (0 != (daemon->options & MHD_USE_POLL))) |
785 | return MHD_NO; | 785 | return MHD_NO; |
@@ -981,7 +981,7 @@ MHD_cleanup_upgraded_connection_ (struct MHD_Connection *connection) | |||
981 | static void | 981 | static void |
982 | process_urh (struct MHD_UpgradeResponseHandle *urh) | 982 | process_urh (struct MHD_UpgradeResponseHandle *urh) |
983 | { | 983 | { |
984 | if (MHD_NO != urh->connection->daemon->shutdown) | 984 | if (urh->connection->daemon->shutdown) |
985 | { | 985 | { |
986 | /* Daemon shutting down, application will not receive any more data. */ | 986 | /* Daemon shutting down, application will not receive any more data. */ |
987 | #ifdef HAVE_MESSAGES | 987 | #ifdef HAVE_MESSAGES |
@@ -1219,9 +1219,9 @@ process_urh (struct MHD_UpgradeResponseHandle *urh) | |||
1219 | } | 1219 | } |
1220 | } | 1220 | } |
1221 | 1221 | ||
1222 | if ( (MHD_NO != urh->connection->daemon->shutdown) && | 1222 | if ( (urh->connection->daemon->shutdown) && |
1223 | ((0 != urh->out_buffer_size) || | 1223 | ( (0 != urh->out_buffer_size) || |
1224 | (0 != urh->out_buffer_used)) ) | 1224 | (0 != urh->out_buffer_used) ) ) |
1225 | { | 1225 | { |
1226 | /* Daemon shutting down, discard any remaining forward data. */ | 1226 | /* Daemon shutting down, discard any remaining forward data. */ |
1227 | #ifdef HAVE_MESSAGES | 1227 | #ifdef HAVE_MESSAGES |
@@ -1446,7 +1446,7 @@ thread_main_handle_connection (void *data) | |||
1446 | const int use_poll = MHD_NO; | 1446 | const int use_poll = MHD_NO; |
1447 | #endif /* ! HAVE_POLL */ | 1447 | #endif /* ! HAVE_POLL */ |
1448 | 1448 | ||
1449 | while ( (MHD_YES != daemon->shutdown) && | 1449 | while ( (! daemon->shutdown) && |
1450 | (MHD_CONNECTION_CLOSED != con->state) ) | 1450 | (MHD_CONNECTION_CLOSED != con->state) ) |
1451 | { | 1451 | { |
1452 | const unsigned int timeout = daemon->connection_timeout; | 1452 | const unsigned int timeout = daemon->connection_timeout; |
@@ -1772,9 +1772,9 @@ thread_main_handle_connection (void *data) | |||
1772 | #endif | 1772 | #endif |
1773 | if (MHD_CONNECTION_CLOSED != con->state) | 1773 | if (MHD_CONNECTION_CLOSED != con->state) |
1774 | MHD_connection_close_ (con, | 1774 | MHD_connection_close_ (con, |
1775 | (MHD_NO == daemon->shutdown) ? | 1775 | (daemon->shutdown) ? |
1776 | MHD_REQUEST_TERMINATED_WITH_ERROR : | 1776 | MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN: |
1777 | MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN); | 1777 | MHD_REQUEST_TERMINATED_WITH_ERROR); |
1778 | con->idle_handler (con); | 1778 | con->idle_handler (con); |
1779 | } | 1779 | } |
1780 | exit: | 1780 | exit: |
@@ -3108,7 +3108,7 @@ MHD_select (struct MHD_Daemon *daemon, | |||
3108 | 3108 | ||
3109 | timeout.tv_sec = 0; | 3109 | timeout.tv_sec = 0; |
3110 | timeout.tv_usec = 0; | 3110 | timeout.tv_usec = 0; |
3111 | if (MHD_YES == daemon->shutdown) | 3111 | if (daemon->shutdown) |
3112 | return MHD_NO; | 3112 | return MHD_NO; |
3113 | FD_ZERO (&rs); | 3113 | FD_ZERO (&rs); |
3114 | FD_ZERO (&ws); | 3114 | FD_ZERO (&ws); |
@@ -3223,7 +3223,7 @@ MHD_select (struct MHD_Daemon *daemon, | |||
3223 | &ws, | 3223 | &ws, |
3224 | &es, | 3224 | &es, |
3225 | tv); | 3225 | tv); |
3226 | if (MHD_YES == daemon->shutdown) | 3226 | if (daemon->shutdown) |
3227 | return MHD_NO; | 3227 | return MHD_NO; |
3228 | if (num_ready < 0) | 3228 | if (num_ready < 0) |
3229 | { | 3229 | { |
@@ -3409,7 +3409,7 @@ MHD_poll_all (struct MHD_Daemon *daemon, | |||
3409 | #endif /* HTTPS_SUPPORT */ | 3409 | #endif /* HTTPS_SUPPORT */ |
3410 | 3410 | ||
3411 | /* handle shutdown */ | 3411 | /* handle shutdown */ |
3412 | if (MHD_YES == daemon->shutdown) | 3412 | if (daemon->shutdown) |
3413 | { | 3413 | { |
3414 | free(p); | 3414 | free(p); |
3415 | return MHD_NO; | 3415 | return MHD_NO; |
@@ -3552,7 +3552,7 @@ MHD_poll_listen_socket (struct MHD_Daemon *daemon, | |||
3552 | MHD_itc_clear_ (daemon->itc); | 3552 | MHD_itc_clear_ (daemon->itc); |
3553 | 3553 | ||
3554 | /* handle shutdown */ | 3554 | /* handle shutdown */ |
3555 | if (MHD_YES == daemon->shutdown) | 3555 | if (daemon->shutdown) |
3556 | return MHD_NO; | 3556 | return MHD_NO; |
3557 | if ( (-1 != poll_listen) && | 3557 | if ( (-1 != poll_listen) && |
3558 | (0 != (p[poll_listen].revents & POLLIN)) ) | 3558 | (0 != (p[poll_listen].revents & POLLIN)) ) |
@@ -3574,7 +3574,7 @@ MHD_poll (struct MHD_Daemon *daemon, | |||
3574 | int may_block) | 3574 | int may_block) |
3575 | { | 3575 | { |
3576 | #ifdef HAVE_POLL | 3576 | #ifdef HAVE_POLL |
3577 | if (MHD_YES == daemon->shutdown) | 3577 | if (daemon->shutdown) |
3578 | return MHD_NO; | 3578 | return MHD_NO; |
3579 | if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) | 3579 | if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) |
3580 | return MHD_poll_all (daemon, | 3580 | return MHD_poll_all (daemon, |
@@ -3707,7 +3707,7 @@ MHD_epoll (struct MHD_Daemon *daemon, | |||
3707 | 3707 | ||
3708 | if (-1 == daemon->epoll_fd) | 3708 | if (-1 == daemon->epoll_fd) |
3709 | return MHD_NO; /* we're down! */ | 3709 | return MHD_NO; /* we're down! */ |
3710 | if (MHD_YES == daemon->shutdown) | 3710 | if (daemon->shutdown) |
3711 | return MHD_NO; | 3711 | return MHD_NO; |
3712 | if ( (MHD_INVALID_SOCKET != daemon->socket_fd) && | 3712 | if ( (MHD_INVALID_SOCKET != daemon->socket_fd) && |
3713 | (daemon->connections < daemon->connection_limit) && | 3713 | (daemon->connections < daemon->connection_limit) && |
@@ -3977,7 +3977,7 @@ MHD_epoll (struct MHD_Daemon *daemon, | |||
3977 | int | 3977 | int |
3978 | MHD_run (struct MHD_Daemon *daemon) | 3978 | MHD_run (struct MHD_Daemon *daemon) |
3979 | { | 3979 | { |
3980 | if ( (MHD_YES == daemon->shutdown) || | 3980 | if ( (daemon->shutdown) || |
3981 | (0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) ) | 3981 | (0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) ) |
3982 | return MHD_NO; | 3982 | return MHD_NO; |
3983 | if (0 != (daemon->options & MHD_USE_POLL)) | 3983 | if (0 != (daemon->options & MHD_USE_POLL)) |
@@ -4050,7 +4050,7 @@ MHD_select_thread (void *cls) | |||
4050 | { | 4050 | { |
4051 | struct MHD_Daemon *daemon = cls; | 4051 | struct MHD_Daemon *daemon = cls; |
4052 | 4052 | ||
4053 | while (MHD_YES != daemon->shutdown) | 4053 | while (! daemon->shutdown) |
4054 | { | 4054 | { |
4055 | if (0 != (daemon->options & MHD_USE_POLL)) | 4055 | if (0 != (daemon->options & MHD_USE_POLL)) |
4056 | MHD_poll (daemon, MHD_YES); | 4056 | MHD_poll (daemon, MHD_YES); |
@@ -5741,7 +5741,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon) | |||
5741 | if (0 != (MHD_ALLOW_SUSPEND_RESUME & daemon->options)) | 5741 | if (0 != (MHD_ALLOW_SUSPEND_RESUME & daemon->options)) |
5742 | resume_suspended_connections (daemon); | 5742 | resume_suspended_connections (daemon); |
5743 | 5743 | ||
5744 | daemon->shutdown = MHD_YES; | 5744 | daemon->shutdown = true; |
5745 | fd = daemon->socket_fd; | 5745 | fd = daemon->socket_fd; |
5746 | daemon->socket_fd = MHD_INVALID_SOCKET; | 5746 | daemon->socket_fd = MHD_INVALID_SOCKET; |
5747 | 5747 | ||
@@ -5754,7 +5754,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon) | |||
5754 | /* Initiate shutdown process in wokers. */ | 5754 | /* Initiate shutdown process in wokers. */ |
5755 | for (i = 0; i < daemon->worker_pool_size; ++i) | 5755 | for (i = 0; i < daemon->worker_pool_size; ++i) |
5756 | { | 5756 | { |
5757 | daemon->worker_pool[i].shutdown = MHD_YES; | 5757 | daemon->worker_pool[i].shutdown = true; |
5758 | daemon->worker_pool[i].socket_fd = MHD_INVALID_SOCKET; | 5758 | daemon->worker_pool[i].socket_fd = MHD_INVALID_SOCKET; |
5759 | if (MHD_ITC_IS_VALID_(daemon->worker_pool[i].itc)) | 5759 | if (MHD_ITC_IS_VALID_(daemon->worker_pool[i].itc)) |
5760 | { | 5760 | { |
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h index abe0f291..fd2a44bb 100644 --- a/src/microhttpd/internal.h +++ b/src/microhttpd/internal.h | |||
@@ -1432,7 +1432,7 @@ struct MHD_Daemon | |||
1432 | /** | 1432 | /** |
1433 | * Are we shutting down? | 1433 | * Are we shutting down? |
1434 | */ | 1434 | */ |
1435 | int shutdown; | 1435 | volatile bool shutdown; |
1436 | 1436 | ||
1437 | /** | 1437 | /** |
1438 | * Did we hit some system or process-wide resource limit while | 1438 | * Did we hit some system or process-wide resource limit while |