Changeset 37f5a09eba7361266c79ca6fdecd3851336934c8

Timestamp:

04/07/10 02:18:29 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[1aca1b7f24f7ddd3bb8e44f598a9e0500025d82f]

git-author:

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

Message:

pass the acceptor_closure into the noit_http context so we can print out something like common log format

Files:

• src/noit_http.c (modified) (6 diffs)
• src/noit_http.h (modified) (4 diffs)
• src/noit_listener.c (modified) (1 diff)
• src/noit_listener.h (modified) (1 diff)
• src/noit_rest.c (modified) (2 diffs)
• src/stratcon_datastore.c (modified) (2 diffs)

src/noit_http.c

@@ -245 +245 @@
-        len, len, b->buff + b->start + ctx->res.output_raw_offset);
-  ctx->res.output_raw_offset += len;
+  ctx->res.bytes_written += len;
-  tlen += len;
-  goto choose_bucket;
@@ -258 +259 @@
-  if(!req->current_input) req->current_input = req->first_input;
-  if(!req->current_input) return noit_false;
+  if(req->start_time.tv_sec == 0) gettimeofday(&req->start_time, NULL);
- restart:
-  while(req->current_input->prev &&
@@ -677 +679 @@
-      return mask | maybe_write_mask;
-    }
-access
+debug
-  }
-
@@ -714 +716 @@
-
-noit_http_session_ctx *
-
+
+
-  noit_http_session_ctx *ctx;
-  ctx = calloc(1, sizeof(*ctx));
@@ -723 +726 @@
-  ctx->dispatcher_closure = c;
-  ctx->drive = noit_http_session_drive;
+  ctx->ac = ac;
-  return ctx;
-}
@@ -1042 +1046 @@
-noit_boolean
-noit_http_response_end(noit_http_session_ctx *ctx) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  if(!noit_http_response_flush(ctx, noit_true)) return noit_false;
-  return noit_true;

src/noit_http.h

@@ -39 +39 @@
-#include "utils/noit_hash.h"
-#include "utils/noit_atomic.h"
+#include "noit_listener.h"
-
-typedef enum {
@@ -96 +97 @@
-  noit_hash_table headers;
-  noit_boolean complete;
+  struct timeval start_time;
-} noit_http_request;
-
@@ -114 +116 @@
-  noit_boolean closed;         /* set by _end() */
-  noit_boolean complete;       /* complete, drained and disposable */
+  size_t bytes_written;        /* tracks total bytes written */
-} noit_http_response;
-
@@ -128 +131 @@
-  void *dispatcher_closure;
-  eventer_func_t drive;
+  acceptor_closure_t *ac;
-} noit_http_session_ctx;
-
-API_EXPORT(noit_http_session_ctx *)
-
+
+
-API_EXPORT(void)
-  noit_http_session_ctx_release(noit_http_session_ctx *);

src/noit_listener.c

@@ -489 +489 @@
-}
-
+int
+noit_convert_sockaddr_to_buff(char *buff, int blen, struct sockaddr *remote) {
+  char name[128] = "";
+  buff[0] = '\0';
+  if(remote) {
+    int len = 0;
+    switch(remote->sa_family) {
+      case AF_INET:
+        len = sizeof(struct sockaddr_in);
+        inet_ntop(remote->sa_family, &((struct sockaddr_in *)remote)->sin_addr,
+                  name, len);
+        break;
+      case AF_INET6:
+       len = sizeof(struct sockaddr_in6);
+        inet_ntop(remote->sa_family, &((struct sockaddr_in6 *)remote)->sin6_addr,
+                  name, len);
+       break;
+      case AF_UNIX:
+        len = SUN_LEN(((struct sockaddr_un *)remote));
+        snprintf(name, sizeof(name), "%s", ((struct sockaddr_un *)remote)->sun_path);
+        break;
+      default: return 0;
+    }
+  }
+  strlcpy(buff, name, blen);
+  return strlen(buff);
+}
+
-void
-noit_listener_init(const char *toplevel) {

src/noit_listener.h

@@ -85 +85 @@
-  noit_control_dispatch(eventer_t, int, void *, struct timeval *);
-
+API_EXPORT(int)
+  noit_convert_sockaddr_to_buff(char *, int, struct sockaddr *);
+
-API_EXPORT(noit_hash_table *)
-  noit_listener_commands();

src/noit_rest.c

@@ -321 +321 @@
-    restc->http_ctx =
-        noit_http_session_ctx_new(noit_rest_request_dispatcher,
-
+, ac
-    
-    switch(ac->cmd) {
@@ -367 +367 @@
-    restc->http_ctx =
-        noit_http_session_ctx_new(noit_rest_request_dispatcher,
-
+, ac
-  }
-  return restc->http_ctx->drive(e, mask, restc->http_ctx, now);

src/stratcon_datastore.c

@@ -205 +205 @@
-pthread_mutex_t storagenode_to_info_cache_lock;
-noit_hash_table storagenode_to_info_cache;
-
-int
-convert_sockaddr_to_buff(char *buff, int blen, struct sockaddr *remote) {
-  char name[128] = "";
-  buff[0] = '\0';
-  if(remote) {
-    int len = 0;
-    switch(remote->sa_family) {
-      case AF_INET:
-        len = sizeof(struct sockaddr_in);
-        inet_ntop(remote->sa_family, &((struct sockaddr_in *)remote)->sin_addr,
-                  name, len);
-        break;
-      case AF_INET6:
-       len = sizeof(struct sockaddr_in6);
-        inet_ntop(remote->sa_family, &((struct sockaddr_in6 *)remote)->sin6_addr,
-                  name, len);
-       break;
-      case AF_UNIX:
-        len = SUN_LEN(((struct sockaddr_un *)remote));
-        snprintf(name, sizeof(name), "%s", ((struct sockaddr_un *)remote)->sun_path);
-        break;
-      default: return 0;
-    }
-  }
-  strlcpy(buff, name, blen);
-  return strlen(buff);
-}
-
-/* Thread-safe connection pools */
@@ -1248 +1220 @@
-  const char *fqdn = fqdn_in ? fqdn_in : "default";
-
-
+noit_
-  if(!*remote_str) strlcpy(remote_str, "default", sizeof(remote_str));
-