[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: MHD_connection_epoll
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: MHD_connection_epoll_update_(): updated and simplified conditions required to move connection back to epoll monitoring. |
Date: |
Sun, 19 Mar 2017 10:10:02 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new d93a774b MHD_connection_epoll_update_(): updated and simplified
conditions required to move connection back to epoll monitoring.
d93a774b is described below
commit d93a774bd642a7d83f775099959f10d246a3f1ca
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Mar 19 12:08:13 2017 +0300
MHD_connection_epoll_update_(): updated and simplified conditions required
to move connection back to epoll monitoring.
---
src/microhttpd/connection.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 92194ac6..5c1a8611 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3261,11 +3261,10 @@ MHD_connection_epoll_update_ (struct MHD_Connection
*connection)
if ( (0 != (daemon->options & MHD_USE_EPOLL)) &&
(0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) &&
(0 == (connection->epoll_state & MHD_EPOLL_STATE_SUSPENDED)) &&
- ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_WRITE_READY)) ||
- ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) &&
- ( (MHD_EVENT_LOOP_INFO_READ == connection->event_loop_info) ||
- (connection->read_buffer_size > connection->read_buffer_offset) )
&&
- (! connection->read_closed) ) ) )
+ ( ( (MHD_EVENT_LOOP_INFO_WRITE == connection->event_loop_info) &&
+ (0 == (connection->epoll_state & MHD_EPOLL_STATE_WRITE_READY))) ||
+ ( (MHD_EVENT_LOOP_INFO_READ == connection->event_loop_info) &&
+ (0 == (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) ) ) )
{
/* add to epoll set */
struct epoll_event event;
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] branch master updated: MHD_connection_epoll_update_(): updated and simplified conditions required to move connection back to epoll monitoring.,
gnunet <=