Changeset cd1ab55918856e8682710ede8ef2e44377887173

Timestamp:

12/03/07 04:32:21 (9 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[01751d3c6a2df6acc30c50e9cd1cce9064262450]

git-author:

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

Message:

more work on the kqueue stuff

Files:

• Makefile.in (added)
• configure.in (added)
• src/eventer/eventer_kqueue_impl.c (modified) (1 diff)
• src/noit_config.h.in (modified) (1 diff)
• src/noitd.c (modified) (1 diff)
• src/utils/noit_atomic.h (added)

src/eventer/eventer_kqueue_impl.c

@@ -6 +6 @@
-#include "noit_defines.h"
-#include "eventer/eventer.h"
+#include "utils/noit_atomic.h"
-
-#include <sys/event.h>
+#include <pthread.h>
+
+int maxfds;
+struct {
+  eventer_t e;
+  pthread_t executor;
+  noit_spinlock_t lock;
+} **master_fds;
+
+int kqueue_fd;
+typedef struct kqueue_setup {
+  struct kevent *__ke_vec;
+  unsigned int __ke_vec_a;
+  unsigned int __ke_vec_used;
+} * kqs_t;
+
+static pthread_mutex_t kqs_lock;
+static kqs_t master_kqs = NULL;
+static pthread_key_t kqueue_setup_key;
+#define KQUEUE_DECL kqs_t kqs
+#define KQUEUE_SETUP kqs = (kqs_t) pthread_getspecific(kqueue_setup_key)
+#define ke_vec kqs->__ke_vec
+#define ke_vec_a kqs->__ke_vec_a
+#define ke_vec_used kqs->__ke_vec_used
+
+static void
+ke_change (register int const ident,
+           register int const filter,
+           register int const flags,
+           register void *const udata) {
+  enum { initial_alloc = 64 };
+  register struct kevent *kep;
+  KQUEUE_DECL;
+
+  KQUEUE_SETUP;
+  if (!ke_vec_a) {
+    ke_vec_a = initial_alloc;
+    ke_vec = (struct kevent *) malloc(ke_vec_a * sizeof (struct kevent));
+  }
+  else if (ke_vec_used == ke_vec_a) {
+    ke_vec_a <<= 1;
+    ke_vec = (struct kevent *) realloc(ke_vec,
+                                       ke_vec_a * sizeof (struct kevent));
+  }
+  kep = &ke_vec[ke_vec_used++];
+
+  EV_SET(kep, ident, filter, flags, 0, 0, udata);
+}
-
-static int eventer_kqueue_impl_init() {
+  struct rlimit rlim;
+  kqueue_fd = kqueue();
+  if(kqueue_fd == -1) {
+    return -1;
+  }
+  pthread_mutex_init(&kqs_lock, NULL);
+  master_kqs = calloc(1, sizeof(*master_kqs));
+  getrlimit(RLIMIT_NOFILE, &rlim);
+  maxfds = rlim.rlim_cur;
+  master_fds = calloc(maxfds, sizeof(*master_fds));
-  return 0;
-}

src/noit_config.h.in

@@ -46 +46 @@
-#undef HAVE_TIME_H
-#undef HAVE_SYS_STAT_H
+#undef HAVE_LIBKERN_OSATOMIC_H
-#define IFS_CH '/'
-

src/noitd.c

@@ -10 +10 @@
-    exit(-1);
-  }
-
+
+
+
+
-  return 0;
-}