Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

The new events management mechanism shouldn't need the "Pending

connections number" thread property either. This could introduce
regressions in the management of pipelined requests.
  • Loading branch information...
commit 594981ea51b39f52553054bcfaffcd9b9e250b7a 1 parent 7218c34
@alobbs alobbs authored
Showing with 2 additions and 25 deletions.
  1. +0 −7 cherokee/connection.c
  2. +2 −16 cherokee/thread.c
  3. +0 −2  cherokee/thread.h
View
7 cherokee/connection.c
@@ -382,13 +382,6 @@ cherokee_connection_clean (cherokee_connection_t *conn)
cherokee_buffer_move_to_begin (&conn->incoming_header, header_len);
- /* If the connection has incoming headers to be processed,
- * then increment the pending counter from the thread
- */
- if (! cherokee_buffer_is_empty (&conn->incoming_header)) {
- CONN_THREAD(conn)->pending_conns_num++;
- }
-
TRACE (ENTRIES, "conn %p, has headers %d\n", conn,
!cherokee_buffer_is_empty (&conn->incoming_header));
View
18 cherokee/thread.c
@@ -165,8 +165,6 @@ cherokee_thread_new (cherokee_thread_t **thd,
n->polling_list_num = 0;
n->reuse_list_num = 0;
- n->pending_conns_num = 0;
-
n->fastcgi_servers = NULL;
n->fastcgi_free_func = NULL;
@@ -1706,14 +1704,8 @@ cherokee_thread_step_SINGLE_THREAD (cherokee_thread_t *thd)
*/
cherokee_limiter_reactive (&thd->limiter, thd);
- /* Be quick when there are pending work:
- * - pending_conns_num: Pipelined requests
+ /* Quick polling if there are active connections
*/
- if (thd->pending_conns_num > 0) {
- fdwatch_msecs = 0;
- thd->pending_conns_num = 0;
- }
-
if (! cherokee_list_empty (&thd->active_list)) {
fdwatch_msecs = 0;
}
@@ -1891,14 +1883,8 @@ cherokee_thread_step_MULTI_THREAD (cherokee_thread_t *thd,
*/
cherokee_limiter_reactive (&thd->limiter, thd);
- /* Be quick when there are pending work:
- * - pending_conns_num: Pipelined requests
+ /* Quick polling if there are active connections
*/
- if (thd->pending_conns_num > 0) {
- fdwatch_msecs = 0;
- thd->pending_conns_num = 0;
- }
-
if (! cherokee_list_empty (&thd->active_list)) {
fdwatch_msecs = 0;
}
View
2  cherokee/thread.h
@@ -83,8 +83,6 @@ typedef struct {
cherokee_limiter_t limiter; /* Traffic shaping */
cherokee_boolean_t is_full;
- int pending_conns_num; /* Waiting pipelining connections */
-
cherokee_avl_t *fastcgi_servers;
cherokee_func_free_t fastcgi_free_func;
Please sign in to comment.
Something went wrong with that request. Please try again.