Changeset e7c26b45d2a6c8cef064cf2253d77bf8f360bef8

Timestamp:

01/27/09 22:38:44 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[b13e0b2a4f10bf3512ef2acdf53ae9e88b4a7ee5]

git-author:

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

Message:

fix duplicates by not reusing stream names, refs #71

Files:

• src/noit_livestream_listener.c (modified) (7 diffs)

src/noit_livestream_listener.c

@@ -16 +16 @@
-#include <sys/ioctl.h>
-#include <errno.h>
+
+static noit_atomic32_t ls_counter = 0;
-
-struct log_entry {
@@ -37 +39 @@
-} noit_livestream_closure_t;
-
+noit_livestream_closure_t *
+noit_livestream_closure_alloc(void) {
+  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;
+}
+
+void
+noit_livestream_closure_free(noit_livestream_closure_t *jcl) {
+  struct log_entry *tofree;
+  while(jcl->lqueue) {
+    tofree = jcl->lqueue;
+    jcl->lqueue = jcl->lqueue->next;
+    free(tofree->buff);
+    free(tofree);
+  }
+  free(jcl);
+}
+
-static int
-noit_livestream_logio_open(noit_log_stream_t ls) {
@@ -51 +74 @@
-  struct log_entry *le;
-  if(!jcl) return 0;
+
+  if(jcl->wants_shutdown) {
+    /* This has been terminated by the client, _fail here_ */
+    return 0;
+  }
-
-  le = calloc(1, sizeof(*le));
@@ -67 +95 @@
-static int
-noit_livestream_logio_close(noit_log_stream_t ls) {
+  noit_livestream_closure_t *jcl = ls->op_ctx;
+  if(jcl) noit_livestream_closure_free(jcl);
-  ls->op_ctx = NULL;
-  return 0;
@@ -84 +114 @@
-                                 NOIT_LIVESTREAM_DATA_FEED,
-                                 noit_livestream_handler);
-}
-
-noit_livestream_closure_t *
-noit_livestream_closure_alloc(void) {
-  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;
-}
-
-void
-noit_livestream_closure_free(noit_livestream_closure_t *jcl) {
-  struct log_entry *tofree;
-  while(jcl->lqueue) {
-    tofree = jcl->lqueue;
-    jcl->lqueue = jcl->lqueue->next;
-    free(tofree->buff);
-    free(tofree);
-  }
-  free(jcl);
-}
-
@@ -219 +228 @@
-
-    jcl->feed = malloc(32);
-e->fd
+noit_atomic_inc32(&ls_counter)
-    noit_log_stream_new(jcl->feed, "noit_livestream", jcl->feed,
-                        jcl, NULL);
@@ -240 +249 @@
-  }
-
+  noit_check_transient_remove_feed(jcl->check, jcl->feed);
+  noit_livestream_closure_free(jcl);
-  /* Undo our dup */
-  eventer_free(newe);