Changeset 2d89607d671aa2191518fe131eb3f8bcee49127a

Timestamp:

01/25/09 17:12:28 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[1b6952c0dbe227d2f82b8d693a0b6d776470ce41]

git-author:

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

Message:

fixes... holy crap, it works. This things leaks and persists when it shouldn't... but we have data flow! refs #71

Files:

• src/noit_check.c (modified) (1 diff)
• src/noit_http.c (modified) (1 diff)
• src/noit_livestream_listener.c (modified) (2 diffs)
• src/stratcon_realtime_http.c (modified) (5 diffs)

src/noit_check.c

@@ -801 +801 @@
-    report_change = 1;
-
-error
+debug
-        check->stats.current.status);
-  if(report_change) {
-error
+debug
-          check->target, check->name,
-          noit_check_available_string(check->stats.current.available),

src/noit_http.c

@@ -512 +512 @@
-    return noit_false;
-  if(!ctx->res.output)
-ctx->res.output = bchain_alloc(DEFAULT_BCHAINSIZE
+assert(ctx->res.output = bchain_alloc(DEFAULT_BCHAINSIZE)
-  o = ctx->res.output;
-  while(o->next) o = o->next;

src/noit_livestream_listener.c

@@ -90 +90 @@
-  noit_livestream_closure_t *jcl;
-  jcl = calloc(1, sizeof(*jcl));
+  pthread_mutex_init(&jcl->lqueue_lock, NULL);
+  sem_init(&jcl->lqueue_sem, 0, 0);
-  return jcl;
-}
@@ -126 +128 @@
-
-  /* Go into blocking mode */
-
+
+
+
+
+
-
-  while(1) {

src/stratcon_realtime_http.c

@@ -34 +34 @@
-  int bytes_expected;
-  int bytes_read;
+  int bytes_written;
+  int body_len;
-  char *buffer;         /* These guys are for doing partial reads */
-
@@ -93 +95 @@
-} while(0)
-
+  scp = buff;
-  PROCESS_NEXT_FIELD(token,len); /* Skip the leader */
-  if(buff[0] == 'M') {
-    scp = buff;
-    snprintf(buffer, sizeof(buffer), "<script>window.parent.plot_iframe_data('");
-    if(noit_http_response_append(ctx, buffer, strlen(buffer)) == noit_false) return -1;
@@ -242 +244 @@
-    ctx->count = 0;
-    ctx->bytes_read = 0;
+    ctx->bytes_written = 0;
-    ctx->bytes_expected = 0;
-    if(ctx->buffer) free(ctx->buffer);
@@ -252 +255 @@
-
-#define full_nb_write(data, wlen) do { \
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    goto socket_error; \
-  } \
-
-
-
-
+
-} while(0)
-
-  while(1) {
+    u_int32_t net_body_len;
+
-    switch(ctx->state) {
-      case WANT_INITIATE:
@@ -279 +294 @@
-      case WANT_HEADER:
-        FULLREAD(e, ctx, sizeof(u_int32_t));
-ctx->bytes_expected
-ytes_expected = ntohl(ctx->bytes_expected
+net_body_len
+ody_len = ntohl(net_body_len
-        free(ctx->buffer); ctx->buffer = NULL;
-        ctx->state = WANT_BODY;
-        break;
-      case WANT_BODY:
-ytes_expected
+ody_len
-        noitL(noit_error, "Read: '%s'\n", ctx->buffer);
-        if(stratcon_line_to_javascript(ctx->ctx, ctx->buffer)) goto socket_error;
-        free(ctx->buffer); ctx->buffer = NULL;
-BODY
+HEADER
-        break;
-    }