nutcracker 0.2.4.10mac → 0.2.4.10

data/ext/nutcracker/src/{nc_epoll.c → nc_event.c}

@@ -16,86 +16,66 @@
  */
 
 #include <unistd.h>
+#include <sys/epoll.h>
+
 #include <nc_core.h>
 #include <nc_event.h>
 
-#ifdef NC_HAVE_EPOLL
-#include <sys/epoll.h>
-
-struct evbase * 
-evbase_create(int nevent, void (*callback_fp)(void *, uint32_t))
+int
+event_init(struct context *ctx, int size)
 {
-
-    struct evbase *evb;
     int status, ep;
     struct epoll_event *event;
 
-    if (nevent <= 0) {
-        log_error("nevent has to be positive %d", nevent);
-        return NULL;
-    }
+    ASSERT(ctx->ep < 0);
+    ASSERT(ctx->nevent != 0);
+    ASSERT(ctx->event == NULL);
 
-    ep = epoll_create(nevent);
+    ep = epoll_create(size);
     if (ep < 0) {
-        log_error("epoll create of size %d failed: %s", nevent, strerror(errno));
-        return NULL;
+        log_error("epoll create of size %d failed: %s", size, strerror(errno));
+        return -1;
     }
 
-    event = nc_calloc(nevent, sizeof(*event));
+    event = nc_calloc(ctx->nevent, sizeof(*ctx->event));
     if (event == NULL) {
         status = close(ep);
         if (status < 0) {
             log_error("close e %d failed, ignored: %s", ep, strerror(errno));
         }
-        return NULL;
-    }
-
-    evb = nc_alloc(sizeof(*evb));
-    if (evb == NULL) {
-        nc_free(event);
-        status = close(ep);
-        if (status < 0) {
-            log_error("close e %d failed, ignored: %s", ep, strerror(errno));
-        }
-        return NULL;
-
+        return -1;
     }
 
-    evb->nevent = nevent;
-    evb->ep = ep;
-    evb->event = event;
-    evb->callback_fp = callback_fp;
+    ctx->ep = ep;
+    ctx->event = event;
 
-    log_debug(LOG_INFO, "e %d with nevent %d", evb->ep,
-              evb->nevent);
+    log_debug(LOG_INFO, "e %d with nevent %d timeout %d", ctx->ep,
+              ctx->nevent, ctx->timeout);
 
-    return evb;
+    return 0;
 }
 
 void
-evbase_destroy(struct evbase *evb)
+event_deinit(struct context *ctx)
 {
     int status;
 
-    if (evb == NULL) return;
+    ASSERT(ctx->ep >= 0);
 
-    ASSERT(evb->ep >= 0);
+    nc_free(ctx->event);
 
-    nc_free(evb->event);
-
-    status = close(evb->ep);
+    status = close(ctx->ep);
     if (status < 0) {
-        log_error("close e %d failed, ignored: %s", evb->ep, strerror(errno));
+        log_error("close e %d failed, ignored: %s", ctx->ep, strerror(errno));
     }
-    nc_free(evb);
+    ctx->ep = -1;
 }
 
 int
-event_add_out(struct evbase *evb, struct conn *c)
+event_add_out(int ep, struct conn *c)
 {
     int status;
     struct epoll_event event;
-    int ep = evb->ep;
 
     ASSERT(ep > 0);
     ASSERT(c != NULL);
@@ -121,11 +101,10 @@ event_add_out(struct evbase *evb, struct conn *c)
 }
 
 int
-event_del_out(struct evbase *evb, struct conn *c)
+event_del_out(int ep, struct conn *c)
 {
     int status;
     struct epoll_event event;
-    int ep = evb->ep;
 
     ASSERT(ep > 0);
     ASSERT(c != NULL);
@@ -151,11 +130,10 @@ event_del_out(struct evbase *evb, struct conn *c)
 }
 
 int
-event_add_conn(struct evbase *evb, struct conn *c)
+event_add_conn(int ep, struct conn *c)
 {
     int status;
     struct epoll_event event;
-    int ep = evb->ep;
 
     ASSERT(ep > 0);
     ASSERT(c != NULL);
@@ -177,10 +155,9 @@ event_add_conn(struct evbase *evb, struct conn *c)
 }
 
 int
-event_del_conn(struct evbase *evb, struct conn *c)
+event_del_conn(int ep, struct conn *c)
 {
     int status;
-    int ep = evb->ep;
 
     ASSERT(ep > 0);
     ASSERT(c != NULL);
@@ -199,14 +176,9 @@ event_del_conn(struct evbase *evb, struct conn *c)
 }
 
 int
-event_wait(struct evbase *evb, int timeout)
+event_wait(int ep, struct epoll_event *event, int nevent, int timeout)
 {
-    int nsd, i;
-    uint32_t evflags = 0;
-    int ep = evb->ep;
-    struct epoll_event *event = evb->event;
-    int nevent = evb->nevent;
-    void (*callback_fp)(void *, uint32_t) = evb->callback_fp;
+    int nsd;
 
     ASSERT(ep > 0);
     ASSERT(event != NULL);
@@ -215,22 +187,6 @@ event_wait(struct evbase *evb, int timeout)
     for (;;) {
         nsd = epoll_wait(ep, event, nevent, timeout);
         if (nsd > 0) {
-            for (i = 0; i < nsd; i++) {
-                struct epoll_event *ev = &evb->event[i];
-
-                evflags = 0;
-                if (ev->events & EPOLLERR)
-                    evflags |= EV_ERR;
-
-                if (ev->events & EPOLLIN)
-                    evflags |= EV_READ;
-
-                if (ev->events & EPOLLOUT)
-                    evflags |= EV_WRITE;
-
-                if (callback_fp != NULL)
-                    (*callback_fp)((void *) ev->data.ptr, evflags);
-            }
             return nsd;
         }
 
@@ -253,26 +209,6 @@ event_wait(struct evbase *evb, int timeout)
 
         return -1;
     }
-    NOT_REACHED();
-}
 
-int
-event_add_st(struct evbase *evb, int fd)
-{
-    int status;
-    struct epoll_event ev;
-
-    ev.data.fd = fd;
-    ev.events = EPOLLIN;
-
-    status = epoll_ctl(evb->ep, EPOLL_CTL_ADD, fd, &ev);
-    if (status < 0) {
-        log_error("epoll ctl on e %d sd %d failed: %s", evb->ep, fd,
-                  strerror(errno));
-        return status;
-    }
-    
-    return status;
+    NOT_REACHED();
 }
-
-#endif /* NC_HAVE_EPOLL */

data/ext/nutcracker/src/nc_event.h

@@ -20,40 +20,20 @@
 
 #include <nc_core.h>
 
-#define NC_EVENT_SIZE 1024
-#define EV_READ 0xff
-#define EV_WRITE 0xff00
-#define EV_ERR 0xff0000
+/*
+ * A hint to the kernel that is used to size the event backing store
+ * of a given epoll instance
+ */
+#define EVENT_SIZE_HINT 1024
 
-#ifdef NC_HAVE_KQUEUE
-struct evbase {
-    int                  kq;
-    struct kevent        *changes;   /* list of changes to be made */
-    struct kevent        *kevents;   /* list of events returned from kevent */
-    int                  n_changes;  /* number of changes in our list */
-    int                  n_returned; /* number of events returned from kevent */
-    int                  n_processed;
-    int                  nevent;
-    void (*callback_fp)(void *, uint32_t);
-};
-#endif
-#ifdef NC_HAVE_EPOLL
-struct evbase {
-    int                   ep;
-    int                   nevent;
-    struct epoll_event    *event;
-    void (*callback_fp)(void *, uint32_t);
-};
-#endif
+int event_init(struct context *ctx, int size);
+void event_deinit(struct context *ctx);
 
-struct evbase *evbase_create(int size, void (*callback_fp)(void *, uint32_t));
-void evbase_destroy(struct evbase *evb);
+int event_add_out(int ep, struct conn *c);
+int event_del_out(int ep, struct conn *c);
+int event_add_conn(int ep, struct conn *c);
+int event_del_conn(int ep, struct conn *c);
 
-int event_add_out(struct evbase *evb, struct conn *c);
-int event_del_out(struct evbase *evb, struct conn *c);
-int event_add_conn(struct evbase *evb, struct conn *c);
-int event_del_conn(struct evbase *evb, struct conn *c);
-int event_wait(struct evbase *evb, int timeout);
-int event_add_st(struct evbase *evb, int fd);
+int event_wait(int ep, struct epoll_event *event, int nevent, int timeout);
 
-#endif /* _NC_EVENT_H */
+#endif

data/ext/nutcracker/src/nc_proxy.c

@@ -163,18 +163,18 @@ proxy_listen(struct context *ctx, struct conn *p)
         return NC_ERROR;
     }
 
-    status = event_add_conn(ctx->evb, p);
+    status = event_add_conn(ctx->ep, p);
     if (status < 0) {
-        log_error("event add conn p %d on addr '%.*s' failed: %s",
-                  p->sd, pool->addrstr.len, pool->addrstr.data,
+        log_error("event add conn e %d p %d on addr '%.*s' failed: %s",
+                  ctx->ep, p->sd, pool->addrstr.len, pool->addrstr.data,
                   strerror(errno));
         return NC_ERROR;
     }
 
-    status = event_del_out(ctx->evb, p);
+    status = event_del_out(ctx->ep, p);
     if (status < 0) {
-        log_error("event del out p %d on addr '%.*s' failed: %s",
-                  p->sd, pool->addrstr.len, pool->addrstr.data,
+        log_error("event del out e %d p %d on addr '%.*s' failed: %s",
+                  ctx->ep, p->sd, pool->addrstr.len, pool->addrstr.data,
                   strerror(errno));
         return NC_ERROR;
     }
@@ -325,9 +325,9 @@ proxy_accept(struct context *ctx, struct conn *p)
         }
     }
 
-    status = event_add_conn(ctx->evb, c);
+    status = event_add_conn(ctx->ep, c);
     if (status < 0) {
-        log_error("event add conn from p %d failed: %s", p->sd,
+        log_error("event add conn of c %d from p %d failed: %s", c->sd, p->sd,
                   strerror(errno));
         c->close(ctx, c);
         return status;

data/ext/nutcracker/src/nc_request.c

@@ -413,7 +413,7 @@ req_forward_error(struct context *ctx, struct conn *conn, struct msg *msg)
     }
 
     if (req_done(conn, TAILQ_FIRST(&conn->omsg_q))) {
-        status = event_add_out(ctx->evb, conn);
+        status = event_add_out(ctx->ep, conn);
         if (status != NC_OK) {
             conn->err = errno;
         }
@@ -482,7 +482,7 @@ req_forward(struct context *ctx, struct conn *c_conn, struct msg *msg)
 
     /* enqueue the message (request) into server inq */
     if (TAILQ_EMPTY(&s_conn->imsg_q)) {
-        status = event_add_out(ctx->evb, s_conn);
+        status = event_add_out(ctx->ep, s_conn);
         if (status != NC_OK) {
             req_forward_error(ctx, c_conn, msg);
             s_conn->err = errno;
@@ -533,7 +533,7 @@ req_send_next(struct context *ctx, struct conn *conn)
     nmsg = TAILQ_FIRST(&conn->imsg_q);
     if (nmsg == NULL) {
         /* nothing to send as the server inq is empty */
-        status = event_del_out(ctx->evb, conn);
+        status = event_del_out(ctx->ep, conn);
         if (status != NC_OK) {
             conn->err = errno;
         }

data/ext/nutcracker/src/nc_response.c

@@ -157,9 +157,11 @@ rsp_filter(struct context *ctx, struct conn *conn, struct msg *msg)
 
     pmsg = TAILQ_FIRST(&conn->omsg_q);
     if (pmsg == NULL) {
-        log_debug(LOG_ERR, "filter stray rsp %"PRIu64" len %"PRIu32" on s %d",
-                  msg->id, msg->mlen, conn->sd);
+        log_error("filter stray rsp %"PRIu64" len %"PRIu32" on s %d", msg->id,
+                  msg->mlen, conn->sd);
         rsp_put(msg);
+        errno = EINVAL;
+        conn->err = errno;
         return true;
     }
     ASSERT(pmsg->peer == NULL);
@@ -220,7 +222,7 @@ rsp_forward(struct context *ctx, struct conn *s_conn, struct msg *msg)
     ASSERT(c_conn->client && !c_conn->proxy);
 
     if (req_done(c_conn, TAILQ_FIRST(&c_conn->omsg_q))) {
-        status = event_add_out(ctx->evb, c_conn);
+        status = event_add_out(ctx->ep, c_conn);
         if (status != NC_OK) {
             c_conn->err = errno;
         }
@@ -265,7 +267,7 @@ rsp_send_next(struct context *ctx, struct conn *conn)
             log_debug(LOG_INFO, "c %d is done", conn->sd);
         }
 
-        status = event_del_out(ctx->evb, conn);
+        status = event_del_out(ctx->ep, conn);
         if (status != NC_OK) {
             conn->err = errno;
         }

data/ext/nutcracker/src/nc_server.c

@@ -367,7 +367,7 @@ server_close(struct context *ctx, struct conn *conn)
             msg->err = conn->err;
 
             if (req_done(c_conn, TAILQ_FIRST(&c_conn->omsg_q))) {
-                event_add_out(ctx->evb, msg->owner);
+                event_add_out(ctx->ep, msg->owner);
             }
 
             log_debug(LOG_INFO, "close s %d schedule error for req %"PRIu64" "
@@ -397,7 +397,7 @@ server_close(struct context *ctx, struct conn *conn)
             msg->err = conn->err;
 
             if (req_done(c_conn, TAILQ_FIRST(&c_conn->omsg_q))) {
-                event_add_out(ctx->evb, msg->owner);
+                event_add_out(ctx->ep, msg->owner);
             }
 
             log_debug(LOG_INFO, "close s %d schedule error for req %"PRIu64" "
@@ -476,10 +476,10 @@ server_connect(struct context *ctx, struct server *server, struct conn *conn)
         }
     }
 
-    status = event_add_conn(ctx->evb, conn);
+    status = event_add_conn(ctx->ep, conn);
     if (status != NC_OK) {
-        log_error("event add conn s %d for server '%.*s' failed: %s",
-                  conn->sd, server->pname.len, server->pname.data,
+        log_error("event add conn e %d s %d for server '%.*s' failed: %s",
+                  ctx->ep, conn->sd, server->pname.len, server->pname.data,
                   strerror(errno));
         goto error;
     }

data/ext/nutcracker/src/nc_stats.c

@@ -21,11 +21,11 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/epoll.h>
 #include <netinet/in.h>
 
 #include <nc_core.h>
 #include <nc_server.h>
-#include <nc_event.h>
 
 struct stats_desc {
     char *name; /* stats name */
@@ -777,7 +777,15 @@ stats_loop(void *arg)
     int n;
 
     for (;;) {
-        n = event_wait(st->st_evb, st->interval);
+        n = epoll_wait(st->ep, &st->event, 1, st->interval);
+        if (n < 0) {
+            if (errno == EINTR) {
+                continue;
+            }
+            log_error("epoll wait on e %d with event m %d failed: %s",
+                      st->ep, st->sd, strerror(errno));
+            break;
+        }
 
         /* aggregate stats from shadow (b) -> sum (c) */
         stats_aggregate(st);
@@ -839,6 +847,7 @@ static rstatus_t
 stats_start_aggregator(struct stats *st)
 {
     rstatus_t status;
+    struct epoll_event ev;
 
     if (!stats_enabled) {
         return NC_OK;
@@ -849,28 +858,25 @@ stats_start_aggregator(struct stats *st)
         return status;
     }
 
-    st->st_evb = evbase_create(1, NULL);
-    if (st->st_evb == NULL) {
-        log_error("stats aggregator create failed: %s", strerror(errno));
+    st->ep = epoll_create(10);
+    if (st->ep < 0) {
+        log_error("epoll create failed: %s", strerror(errno));
         return NC_ERROR;
     }
 
-    ASSERT(st->st_evb != NULL);
-    ASSERT(st->sd >= 0);
+    ev.data.fd = st->sd;
+    ev.events = EPOLLIN;
 
-    status = event_add_st(st->st_evb, st->sd);
+    status = epoll_ctl(st->ep, EPOLL_CTL_ADD, st->sd, &ev);
     if (status < 0) {
-        log_error("stats aggregator create failed: %s", strerror(errno));
-        evbase_destroy(st->st_evb);
-        st->st_evb = NULL;
+        log_error("epoll ctl on e %d sd %d failed: %s", st->ep, st->sd,
+                  strerror(errno));
         return NC_ERROR;
     }
 
     status = pthread_create(&st->tid, NULL, stats_loop, st);
     if (status < 0) {
         log_error("stats aggregator create failed: %s", strerror(status));
-        evbase_destroy(st->st_evb);
-        st->st_evb = NULL;
         return NC_ERROR;
     }
 
@@ -885,8 +891,7 @@ stats_stop_aggregator(struct stats *st)
     }
 
     close(st->sd);
-    evbase_destroy(st->st_evb);
-    st->st_evb = NULL;
+    close(st->ep);
 }
 
 struct stats *
@@ -916,7 +921,7 @@ stats_create(uint16_t stats_port, char *stats_ip, int stats_interval,
     array_null(&st->sum);
 
     st->tid = (pthread_t) -1;
-    st->st_evb = NULL;
+    st->ep = -1;
     st->sd = -1;
 
     string_set_text(&st->service_str, "service");

data/ext/nutcracker/src/nc_stats.h

@@ -18,8 +18,9 @@
 #ifndef _NC_STATS_H_
 #define _NC_STATS_H_
 
+#include <sys/epoll.h>
+
 #include <nc_core.h>
-#include <nc_event.h>
 
 #define STATS_POOL_CODEC(ACTION)                                                                            \
     /* client behavior */                                                                                   \
@@ -100,8 +101,8 @@ struct stats {
 
     pthread_t           tid;            /* stats aggregator thread */
     int                 sd;             /* stats descriptor */
-
-    struct evbase       *st_evb;
+    int                 ep;             /* epoll device */
+    struct epoll_event  event;          /* epoll event */
 
     struct string       service_str;    /* service string */
     struct string       service;        /* service */

data/ext/nutcracker/src/nc_util.c

@@ -22,10 +22,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <netdb.h>
-
-#ifdef NC_HAVE_BACKTRACE
 #include <execinfo.h>
-#endif
 
 #include <sys/time.h>
 #include <sys/types.h>
@@ -278,7 +275,6 @@ _nc_free(void *ptr, const char *name, int line)
 void
 nc_stacktrace(int skip_count)
 {
-#ifdef NC_HAVE_BACKTRACE
     void *stack[64];
     char **symbols;
     int size, i, j;
@@ -296,7 +292,6 @@ nc_stacktrace(int skip_count)
     }
 
     free(symbols);
-#endif
 }
 
 void
@@ -622,14 +617,3 @@ nc_unresolve_desc(int sd)
 
     return nc_unresolve_addr(addr, addrlen);
 }
-
-struct timespec
-nc_millisec_to_timespec (int n_millisec)
-{
-    struct timeval tv = {n_millisec/1000LL, (n_millisec%1000LL)*1000LL};
-    struct timespec ts;
-
-    TIMEVAL_TO_TIMESPEC(&tv, &ts);         
-
-    return ts;
-}

data/ext/nutcracker/src/nc_util.h

@@ -190,7 +190,6 @@ int _scnprintf(char *buf, size_t size, const char *fmt, ...);
 int _vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
 int64_t nc_usec_now(void);
 int64_t nc_msec_now(void);
-struct timespec nc_millisec_to_timespec(int millisec);
 
 /*
  * Address resolution for internet (ipv4 and ipv6) and unix domain