Changeset 1944

Timestamp:

09/04/08 14:44:47 (3 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/connection-protected.h (modified) (2 diffs)
• cherokee/trunk/cherokee/connection.c (modified) (10 diffs)
• cherokee/trunk/cherokee/handler_cgi_base.c (modified) (5 diffs)
• cherokee/trunk/cherokee/handler_cgi_base.h (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2008-09-04  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/connection-protected.h, cherokee/handler_cgi_base.c,
+        cherokee/handler_cgi_base.h, cherokee/connection.c: Fixes a
+        chunked encoding issue while speeds it up. Now Chunked encoded
+        connections are faster than with the first implementation.
+
-2008-09-03  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/connection-protected.h

@@ -169 +169 @@
-         */
-        cherokee_post_t               post;
+
-        uint32_t                      keepalive;
-        time_t                        timeout;
@@ -187 +188 @@
-        int                           regex_ovector[OVECTOR_LEN];
-        int                           regex_ovecsize;
-
+
+
+
-        cherokee_expiration_t         expiration;
-        time_t                        expiration_time;
+
+        /* Chunked encoding
+         */
+        cherokee_boolean_t            chunked_encoding;
+        cherokee_buffer_t             chunked_len;
-};
-

cherokee/trunk/cherokee/connection.c

@@ -148 +148 @@
-        n->regex_ovecsize = 0;
-
+        n->chunked_encoding = false;
+        cherokee_buffer_init (&n->chunked_len);
+
-        *conn = n;
-        return ret_ok;
@@ -188 +191 @@
-        cherokee_buffer_mrproper (&conn->host);
-        cherokee_buffer_mrproper (&conn->self_trace);
+        cherokee_buffer_mrproper (&conn->chunked_len);
-
-        if (conn->validator != NULL) {
@@ -252 +256 @@
-        conn->expiration           = cherokee_expiration_none;
-        conn->expiration_time      = 0;
+        conn->chunked_encoding     = false;
-
-        memset (conn->regex_ovector, OVECTOR_LEN * sizeof(int), 0);
@@ -286 +291 @@
-        cherokee_buffer_clean (&conn->query_string);
-        cherokee_buffer_clean (&conn->self_trace);
+        cherokee_buffer_clean (&conn->chunked_len);
-        
-        if (conn->validator != NULL) {
@@ -527 +533 @@
-                cherokee_buffer_add_str (buffer, "Connection: Keep-Alive"CRLF);
-                cherokee_buffer_add_buffer (buffer, &CONN_SRV(conn)->timeout_header);
-
-        } else if (conn->handler && 
-                   HANDLER_SUPPORTS (conn->handler, hsupport_chunked)) {
-                cherokee_buffer_add_str (buffer, "Transfer-Encoding: chunked" CRLF);
-
-        } else {
-                cherokee_buffer_add_str (buffer, "Connection: close"CRLF);
+        }
+
+        /* Chunked transfer
+         */
+        if (conn->chunked_encoding) {
+                cherokee_buffer_add_str (buffer, "Transfer-Encoding: chunked" CRLF);
-        }
-
@@ -614 +621 @@
-        }
-
-
+
+
-         */
-        if ((conn->keepalive != 0) &&
+            (conn->chunked_encoding == false) &&
-            (http_method_with_body (conn->error_code))) 
-        {
@@ -623 +632 @@
-                                conn->keepalive = 0;
-                        
-
-
-
+
-                        conn->keepalive = 0;
-                }
@@ -687 +694 @@
-        bufs[0].iov_base = conn->buffer.buf;
-        bufs[0].iov_len  = conn->buffer.len;
-( conn->mmaped_len > 0 
+ (conn->mmaped_len > 0
-                bufs[1].iov_base = conn->mmaped;
-                bufs[1].iov_len  = conn->mmaped_len;
@@ -851 +858 @@
-        ret_t  ret;
-        size_t sent = 0;
+
+        /* Use writev to send the chunk-begin mark
+         */
+        if ((conn->chunked_encoding) &&
+            (! cherokee_buffer_is_empty (&conn->chunked_len)))
+        {
+                struct iovec bufs[2];
+
+                bufs[0].iov_base = conn->chunked_len.buf;
+                bufs[0].iov_len  = conn->chunked_len.len;
+                bufs[1].iov_base = conn->buffer.buf;
+                bufs[1].iov_len  = conn->buffer.len;
+
+                ret = cherokee_socket_writev (&conn->socket, bufs, 2, &sent);
+                if (unlikely (ret != ret_ok)) {
+                        switch (ret) {
+                        case ret_eof:
+                        case ret_eagain: 
+                                return ret;
+                                
+                        case ret_error:
+                                conn->keepalive = 0;
+                                return ret_error;
+                                
+                        default:
+                                RET_UNKNOWN(ret);
+                                return ret_error;
+                        }
+                }
+
+                if (unlikely (sent <= conn->chunked_len.len)) {
+                        cherokee_buffer_move_to_begin (&conn->chunked_len, sent);
+
+                } else {
+                        cherokee_buffer_move_to_begin (&conn->buffer, (sent - conn->chunked_len.len));
+                        cherokee_buffer_clean (&conn->chunked_len);
+                }
+
+                return (conn->buffer.len > 0) ? ret_eagain : ret_ok;
+        }
-
-        /* Send the buffer content
@@ -1793 +1840 @@
-        ret = cherokee_header_get_known (&conn->header, header_connection, &ptr, &ptr_len);
-        if (ret == ret_ok) {
-
+
+
+
+
+
-                        conn->keepalive = 0;
-                } else if (conn->keepalive == 0) {
-                        conn->keepalive = CONN_SRV(conn)->keepalive_max;
-                }
-                return;

cherokee/trunk/cherokee/handler_cgi_base.c

@@ -72 +72 @@
-        cgi->content_length      = 0;
-        cgi->content_length_set  = false;
-        cgi->chunked             = false;
-        cgi->got_eof             = false;
-        cgi->file_handler        = NULL;
@@ -968 +967 @@
-        /* Chunked encoding
-         */
-
-
-
+
+
+
+
+
-        
-
+
+
-               (cgi->content_length_set == false),
+               (conn->header.version == http_version_11),
-               (HANDLER_CGI_BASE_PROPS(cgi)->allow_chunked),
-
-
-
-
-
-
+
-
-        return ret_ok;
@@ -987 +985 @@
-
-ret_t 
-
-
-
-
+
+
+
+
+
+
-
-        /* Is it replying a "X-Sendfile" request?
@@ -1004 +1004 @@
-                TRACE (ENTRIES, "sending stored data: %d bytes\n", cgi->data.len);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                cherokee_buffer_clean (&cgi->data);
-
-                if (cgi->got_eof) {
-gi->chunked
+onn->chunked_encoding
-                                cherokee_buffer_add_str (outbuf, LAST_CHUNK);
-                        }
@@ -1025 +1031 @@
-
-        if (inbuf->len > 0) {
-
-
-
-
+
-                cherokee_buffer_clean (inbuf);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        {
-                cherokee_buffer_add_str (outbuf, LAST_CHUNK);

cherokee/trunk/cherokee/handler_cgi_base.h

@@ -78 +78 @@
-        char                              *extra_param;
-
-        cherokee_boolean_t                 chunked;
-        cherokee_boolean_t                 content_length_set;
-        size_t                             content_length;