Changeset d1eed0a31060e85817e7ca2188361aafcf6f115e

Timestamp:

04/06/10 21:47:59 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1270590479 +0000

git-parent:

[fddf7172a39575dd9460f878ba73e3b42e8f8154]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1270590479 +0000

Message:

loggers for http and critical but if pipelined payload, we weren't shortening the input buffer once we dissected out the payload post-headers

Files:

• src/noit_http.c (modified) (16 diffs)
• src/noit_http.h (modified) (1 diff)
• src/noit_rest.c (modified) (1 diff)

src/noit_http.c

@@ -46 +46 @@
-#define HEADER_EXPECT "expect"
-
+static noit_log_stream_t http_debug = NULL;
+static noit_log_stream_t http_io = NULL;
+static noit_log_stream_t http_access = NULL;
+
-#define CTX_ADD_HEADER(a,b) \
-    noit_hash_replace(&ctx->res.headers, \
@@ -238 +242 @@
-    return -1;
-  }
+  noitL(http_io, " http_write(%d) => %d [\n%.*s\n]\n", ctx->conn.e->fd,
+        len, len, b->buff + b->start + ctx->res.output_raw_offset);
-  ctx->res.output_raw_offset += len;
-  tlen += len;
@@ -284 +290 @@
- match:
-  req->current_request_chain = req->first_input;
-noit
+http
-        (int)(req->current_offset - req->current_input->start),
-        (int)req->current_input->size);
@@ -291 +297 @@
-    /* There are left-overs */
-    int lsize = req->current_input->size - req->current_offset;
-noit
+http
-    req->first_input = bchain_alloc(lsize);
-    req->first_input->prev = NULL;
@@ -300 +306 @@
-           req->current_input->buff + req->current_offset,
-           req->first_input->size);
+    req->current_input->size -= lsize;
-    if(req->last_input == req->current_input)
-      req->last_input = req->first_input;
@@ -491 +498 @@
-                                   in->allocd - in->size - in->start,
-                                   &mask, ctx->conn.e);
-
+
+
-    if(len == -1 && errno == EAGAIN) return mask;
-    if(len <= 0) goto full_error;
@@ -562 +570 @@
-  /* We attempt to consume from the first_input */
-  struct bchain *in, *tofree;
-noit
+http
-        ctx->conn.e->fd, (int)len,
-        (int)(ctx->req.content_length - ctx->req.content_length_read));
@@ -574 +582 @@
-      bytes_read += partial_len;
-      ctx->req.content_length_read += partial_len;
-noit
+http
-            (int)bytes_read, (int)ctx->req.content_length_read,
-            (int)ctx->req.content_length);
@@ -586 +594 @@
-        if(in == NULL) {
-          ctx->req.last_input = NULL;
-noit
+http
-                (int)bytes_read);
-          return bytes_read;
@@ -607 +615 @@
-                                      in->allocd - in->size - in->start,
-                                      mask, ctx->conn.e);
-
+
+
-      if(rlen == -1 && errno == EAGAIN) {
-        /* We'd block to read more, but we have data,
@@ -613 +622 @@
-        if(ctx->req.first_input->size) break;
-        /* We've got nothing... */
-noit
+http
-        return -1;
-      }
-      if(rlen <= 0) {
-noit
+http
-        return -1;
-      }
@@ -641 +650 @@
-   * noted that in noit_http_request_release.
-   */
-noit
+http
-  while(ctx->drainage > 0) {
-    int len;
-noit
+http
-    len = noit_http_session_req_consume(ctx, NULL, ctx->drainage, &mask);
-    if(len == -1 && errno == EAGAIN) {
-noit
+http
-      return mask;
-    }
@@ -657 +666 @@
-  if(ctx->req.complete != noit_true) {
-    int maybe_write_mask;
-noit
+http
-    mask = noit_http_complete_request(ctx, origmask);
-noit
+http
-          e->fd, mask);
-    _http_perform_write(ctx, &maybe_write_mask);
-    if(ctx->conn.e == NULL) goto release;
-    if(ctx->req.complete != noit_true) {
-noit
+http
-            mask|maybe_write_mask);
-      return mask | maybe_write_mask;
-    }
-noit_debug
+http_access
-  }
-
-  /* only dispatch if the response is not complete */
-  if(ctx->res.complete == noit_false) {
-noit
+http
-    rv = ctx->dispatcher(ctx);
-noit
+http
-  }
-
@@ -693 +702 @@
-  if(ctx->req.complete == noit_false) goto next_req;
-  if(ctx->conn.e) {
-noit
+http
-    return mask | rv;
-  }
-noit
+http
-  return 0;
- release:
-  noit_http_ctx_session_release(ctx);
-noit
+http
-  return 0;
-}
@@ -1034 +1043 @@
-noit_http_response_end(noit_http_session_ctx *ctx) {
-  if(ctx->res.output)
-noit_debug
+http_access
-  if(!noit_http_response_flush(ctx, noit_true)) return noit_false;
-  return noit_true;
@@ -1064 +1073 @@
-}
-
+void
+noit_http_init() {
+  http_debug = noit_log_stream_find("debug/http");
+  http_access = noit_log_stream_find("http/access");
+  http_io = noit_log_stream_find("http/io");
+}

src/noit_http.h

@@ -180 +180 @@
-  noit_http_response_xml(noit_http_session_ctx *, xmlDocPtr);
-
+API_EXPORT(void)
+  noit_http_init();
-
-#endif

src/noit_rest.c

@@ -558 +558 @@
-}
-void noit_http_rest_init() {
+  noit_http_init();
-  eventer_name_callback("noit_wire_rest_api/1.0", noit_http_rest_handler);
-  eventer_name_callback("http_rest_api", noit_http_rest_raw_handler);