Changeset 732
- Timestamp:
- 04/30/07 20:06:01 (2 years ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/cherokee/thread.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r731 r732 1 1 2007-04-30 A.D.F <adefacc@tin.it> 2 2 3 * cherokee/thread.c: 4 - substitute 0 for FDPOLL_MODE_READ in remaining 5 cherokee_fdpoll_check() calls; 6 - spaces / indentation cleanup. 7 3 8 * cherokee/fdpoll.h: 4 9 - added new macros FDPOLL_MODE_*. cherokee/trunk/cherokee/thread.c
r731 r732 90 90 */ 91 91 memcpy (&thd->bogo_now_tm, &srv->bogo_now_tm, sizeof(struct tm)); 92 92 93 93 /* Update cherokee_buffer_t 94 94 */ 95 95 cherokee_buffer_clean (&thd->bogo_now_string); 96 96 cherokee_buffer_add_buffer (&thd->bogo_now_string, &srv->bogo_now_string); 97 97 98 98 } 99 99 … … 550 550 /* Check the "extra" file descriptor 551 551 */ 552 re = cherokee_fdpoll_check (thd->fdpoll, conn->polling_fd, 0);552 re = cherokee_fdpoll_check (thd->fdpoll, conn->polling_fd, FDPOLL_MODE_READ); 553 553 switch (re) { 554 554 case -1: … … 1317 1317 cherokee_sockaddr_t new_sa; 1318 1318 cherokee_connection_t *new_conn; 1319 1319 1320 1320 /* Return if there're no new connections 1321 1321 */ 1322 if (cherokee_fdpoll_check (thd->fdpoll, srv_socket, 0) == 0) {1322 if (cherokee_fdpoll_check (thd->fdpoll, srv_socket, FDPOLL_MODE_READ) == 0) { 1323 1323 return 0; 1324 1324 } 1325 1325 1326 1326 /* Try to get a new connection 1327 1327 */ … … 1350 1350 new_conn->phase = phase_tls_handshake; 1351 1351 } 1352 1352 1353 1353 /* It is about to add a new connection to the thread, 1354 1354 * so it MUST adquire the thread ownership now. … … 1767 1767 (thd->polling_list_num == 0) && (!dont_block)) { 1768 1768 step_MULTI_THREAD_TLS_block (thd, fdwatch_msecs, 1769 S_SOCKET_FD(srv->socket), &THREAD_SRV(thd)->accept_mutex,1770 S_SOCKET_FD(srv->socket_tls), &THREAD_SRV(thd)->accept_tls_mutex);1769 S_SOCKET_FD(srv->socket), &THREAD_SRV(thd)->accept_mutex, 1770 S_SOCKET_FD(srv->socket_tls), &THREAD_SRV(thd)->accept_tls_mutex); 1771 1771 } else { 1772 1772 step_MULTI_THREAD_TLS_nonblock (thd, fdwatch_msecs, 1773 S_SOCKET_FD(srv->socket), &THREAD_SRV(thd)->accept_mutex,1774 S_SOCKET_FD(srv->socket_tls), &THREAD_SRV(thd)->accept_tls_mutex);1773 S_SOCKET_FD(srv->socket), &THREAD_SRV(thd)->accept_mutex, 1774 S_SOCKET_FD(srv->socket_tls), &THREAD_SRV(thd)->accept_tls_mutex); 1775 1775 } 1776 1776