nutcracker 0.2.4.12 → 0.3.0.12

data/ext/nutcracker/src/nc_stats.h

@@ -18,36 +18,35 @@
 #ifndef _NC_STATS_H_
 #define _NC_STATS_H_
 
-#include <sys/epoll.h>
-
 #include <nc_core.h>
 
-#define STATS_POOL_CODEC(ACTION)                                                                            \
-    /* client behavior */                                                                                   \
-    ACTION( client_eof,             STATS_COUNTER,      "# eof on client connections")                      \
-    ACTION( client_err,             STATS_COUNTER,      "# errors on client connections")                   \
-    ACTION( client_connections,     STATS_GAUGE,        "# active client connections")                      \
-    /* pool behavior */                                                                                     \
-    ACTION( server_ejects,          STATS_COUNTER,      "# times backend server was ejected")               \
-    /* forwarder behavior */                                                                                \
-    ACTION( forward_error,          STATS_COUNTER,      "# times we encountered a forwarding error")        \
-    ACTION( fragments,              STATS_COUNTER,      "# fragments created from a multi-vector request")  \
-
-#define STATS_SERVER_CODEC(ACTION)                                                                          \
-    /* server behavior */                                                                                   \
-    ACTION( server_eof,             STATS_COUNTER,      "# eof on server connections")                      \
-    ACTION( server_err,             STATS_COUNTER,      "# errors on server connections")                   \
-    ACTION( server_timedout,        STATS_COUNTER,      "# timeouts on server connections")                 \
-    ACTION( server_connections,     STATS_GAUGE,        "# active server connections")                      \
-    /* data behavior */                                                                                     \
-    ACTION( requests,               STATS_COUNTER,      "# requests")                                       \
-    ACTION( request_bytes,          STATS_COUNTER,      "total request bytes")                              \
-    ACTION( responses,              STATS_COUNTER,      "# respones")                                       \
-    ACTION( response_bytes,         STATS_COUNTER,      "total response bytes")                             \
-    ACTION( in_queue,               STATS_GAUGE,        "# requests in incoming queue")                     \
-    ACTION( in_queue_bytes,         STATS_GAUGE,        "current request bytes in incoming queue")          \
-    ACTION( out_queue,              STATS_GAUGE,        "# requests in outgoing queue")                     \
-    ACTION( out_queue_bytes,        STATS_GAUGE,        "current request bytes in outgoing queue")          \
+#define STATS_POOL_CODEC(ACTION)                                                                                    \
+    /* client behavior */                                                                                           \
+    ACTION( client_eof,             STATS_COUNTER,      "# eof on client connections")                              \
+    ACTION( client_err,             STATS_COUNTER,      "# errors on client connections")                           \
+    ACTION( client_connections,     STATS_GAUGE,        "# active client connections")                              \
+    /* pool behavior */                                                                                             \
+    ACTION( server_ejects,          STATS_COUNTER,      "# times backend server was ejected")                       \
+    /* forwarder behavior */                                                                                        \
+    ACTION( forward_error,          STATS_COUNTER,      "# times we encountered a forwarding error")                \
+    ACTION( fragments,              STATS_COUNTER,      "# fragments created from a multi-vector request")          \
+
+#define STATS_SERVER_CODEC(ACTION)                                                                                  \
+    /* server behavior */                                                                                           \
+    ACTION( server_eof,             STATS_COUNTER,      "# eof on server connections")                              \
+    ACTION( server_err,             STATS_COUNTER,      "# errors on server connections")                           \
+    ACTION( server_timedout,        STATS_COUNTER,      "# timeouts on server connections")                         \
+    ACTION( server_connections,     STATS_GAUGE,        "# active server connections")                              \
+    ACTION( server_ejected_at,      STATS_TIMESTAMP,    "timestamp when server was ejected in usec since epoch")    \
+    /* data behavior */                                                                                             \
+    ACTION( requests,               STATS_COUNTER,      "# requests")                                               \
+    ACTION( request_bytes,          STATS_COUNTER,      "total request bytes")                                      \
+    ACTION( responses,              STATS_COUNTER,      "# respones")                                               \
+    ACTION( response_bytes,         STATS_COUNTER,      "total response bytes")                                     \
+    ACTION( in_queue,               STATS_GAUGE,        "# requests in incoming queue")                             \
+    ACTION( in_queue_bytes,         STATS_GAUGE,        "current request bytes in incoming queue")                  \
+    ACTION( out_queue,              STATS_GAUGE,        "# requests in outgoing queue")                             \
+    ACTION( out_queue_bytes,        STATS_GAUGE,        "current request bytes in outgoing queue")                  \
 
 #define STATS_ADDR      "0.0.0.0"
 #define STATS_PORT      22222
@@ -101,8 +100,6 @@ struct stats {
 
     pthread_t           tid;            /* stats aggregator thread */
     int                 sd;             /* stats descriptor */
-    int                 ep;             /* epoll device */
-    struct epoll_event  event;          /* epoll event */
 
     struct string       service_str;    /* service string */
     struct string       service;        /* service */
@@ -149,6 +146,10 @@ typedef enum stats_server_field {
     _stats_pool_decr_by(_ctx, _pool, STATS_POOL_##_name, _val);         \
 } while (0)
 
+#define stats_pool_set_ts(_ctx, _pool, _name, _val) do {                \
+    _stats_pool_set_ts(_ctx, _pool, STATS_POOL_##_name, _val);          \
+} while (0)
+
 #define stats_server_incr(_ctx, _server, _name) do {                    \
     _stats_server_incr(_ctx, _server, STATS_SERVER_##_name);            \
 } while (0)
@@ -165,6 +166,10 @@ typedef enum stats_server_field {
     _stats_server_decr_by(_ctx, _server, STATS_SERVER_##_name, _val);   \
 } while (0)
 
+#define stats_server_set_ts(_ctx, _server, _name, _val) do {            \
+     _stats_server_set_ts(_ctx, _server, STATS_SERVER_##_name, _val);   \
+} while (0)
+
 #else
 
 #define stats_pool_incr(_ctx, _pool, _name)
@@ -193,11 +198,13 @@ void _stats_pool_incr(struct context *ctx, struct server_pool *pool, stats_pool_
 void _stats_pool_decr(struct context *ctx, struct server_pool *pool, stats_pool_field_t fidx);
 void _stats_pool_incr_by(struct context *ctx, struct server_pool *pool, stats_pool_field_t fidx, int64_t val);
 void _stats_pool_decr_by(struct context *ctx, struct server_pool *pool, stats_pool_field_t fidx, int64_t val);
+void _stats_pool_set_ts(struct context *ctx, struct server_pool *pool, stats_pool_field_t fidx, int64_t val);
 
 void _stats_server_incr(struct context *ctx, struct server *server, stats_server_field_t fidx);
 void _stats_server_decr(struct context *ctx, struct server *server, stats_server_field_t fidx);
 void _stats_server_incr_by(struct context *ctx, struct server *server, stats_server_field_t fidx, int64_t val);
 void _stats_server_decr_by(struct context *ctx, struct server *server, stats_server_field_t fidx, int64_t val);
+void _stats_server_set_ts(struct context *ctx, struct server *server, stats_server_field_t fidx, int64_t val);
 
 struct stats *stats_create(uint16_t stats_port, char *stats_ip, int stats_interval, char *source, struct array *server_pool);
 void stats_destroy(struct stats *stats);

data/ext/nutcracker/src/nc_util.c

@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <execinfo.h>
 
 #include <sys/time.h>
 #include <sys/types.h>
@@ -34,6 +33,10 @@
 
 #include <nc_core.h>
 
+#ifdef NC_HAVE_BACKTRACE
+# include <execinfo.h>
+#endif
+
 int
 nc_set_blocking(int sd)
 {
@@ -275,6 +278,7 @@ _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;
@@ -292,6 +296,7 @@ nc_stacktrace(int skip_count)
     }
 
     free(symbols);
+#endif
 }
 
 void

data/ext/nutcracker/src/proto/nc_redis.c

@@ -53,7 +53,6 @@ redis_arg0(struct msg *r)
     case MSG_REQ_REDIS_SCARD:
     case MSG_REQ_REDIS_SMEMBERS:
     case MSG_REQ_REDIS_SPOP:
-    case MSG_REQ_REDIS_SRANDMEMBER:
 
     case MSG_REQ_REDIS_ZCARD:
         return true;
@@ -84,7 +83,6 @@ redis_arg1(struct msg *r)
     case MSG_REQ_REDIS_GETSET:
     case MSG_REQ_REDIS_INCRBY:
     case MSG_REQ_REDIS_INCRBYFLOAT:
-    case MSG_REQ_REDIS_SET:
     case MSG_REQ_REDIS_SETNX:
 
     case MSG_REQ_REDIS_HEXISTS:
@@ -178,6 +176,7 @@ redis_argn(struct msg *r)
     switch (r->type) {
     case MSG_REQ_REDIS_BITCOUNT:
 
+    case MSG_REQ_REDIS_SET:
     case MSG_REQ_REDIS_HDEL:
     case MSG_REQ_REDIS_HMGET:
     case MSG_REQ_REDIS_HMSET:
@@ -193,6 +192,7 @@ redis_argn(struct msg *r)
     case MSG_REQ_REDIS_SREM:
     case MSG_REQ_REDIS_SUNION:
     case MSG_REQ_REDIS_SUNIONSTORE:
+    case MSG_REQ_REDIS_SRANDMEMBER:
 
     case MSG_REQ_REDIS_ZADD:
     case MSG_REQ_REDIS_ZINTERSTORE:
@@ -1538,6 +1538,7 @@ redis_parse_rsp(struct msg *r)
     struct mbuf *b;
     uint8_t *p, *m;
     uint8_t ch;
+
     enum {
         SW_START,
         SW_STATUS,
@@ -1675,6 +1676,7 @@ redis_parse_rsp(struct msg *r)
                 r->token = p;
                 r->rlen = 0;
             } else if (ch == '-') {
+                /* handles null bulk reply = '$-1' */
                 state = SW_RUNTO_CRLF;
             } else if (isdigit(ch)) {
                 r->rlen = r->rlen * 10 + (uint32_t)(ch - '0');
@@ -1742,12 +1744,15 @@ redis_parse_rsp(struct msg *r)
                 /* rsp_start <- p */
                 r->narg_start = p;
                 r->rnarg = 0;
+            } else if (ch == '-') {
+                state = SW_RUNTO_CRLF;
             } else if (isdigit(ch)) {
                 r->rnarg = r->rnarg * 10 + (uint32_t)(ch - '0');
             } else if (ch == CR) {
                 if ((p - r->token) <= 1) {
                     goto error;
                 }
+
                 r->narg = r->rnarg;
                 r->narg_end = p;
                 r->token = NULL;
@@ -1776,7 +1781,16 @@ redis_parse_rsp(struct msg *r)
 
         case SW_MULTIBULK_ARGN_LEN:
             if (r->token == NULL) {
-                if (ch != '$') {
+                /*
+                 * From: http://redis.io/topics/protocol, a multi bulk reply
+                 * is used to return an array of other replies. Every element
+                 * of a multi bulk reply can be of any kind, including a
+                 * nested multi bulk reply.
+                 *
+                 * Here, we only handle a multi bulk reply element that
+                 * are either integer reply or bulk reply.
+                 */
+                if (ch != '$' && ch != ':') {
                     goto error;
                 }
                 r->token = p;
@@ -1790,8 +1804,8 @@ redis_parse_rsp(struct msg *r)
                     goto error;
                 }
 
-                if (r->rlen == 1 && (p - r->token) == 3) {
-                    /* handles not-found reply = '$-1'*/
+                if ((r->rlen == 1 && (p - r->token) == 3) || *r->token == ':') {
+                    /* handles not-found reply = '$-1' or integer reply = ':<num>' */
                     r->rlen = 0;
                     state = SW_MULTIBULK_ARGN_LF;
                 } else {

data/lib/nutcracker/version.rb

@@ -1,3 +1,3 @@
 module Nutcracker
-  VERSION = "0.2.4.12"
+  VERSION = "0.3.0.12"
 end

data/lib/nutcracker.rb

@@ -50,7 +50,7 @@ module Nutcracker
       @pid = ::Process.spawn Nutcracker.executable, *command
       Process.detach(@pid)
       sleep 2
-      abort "Nutcracker failed to start" unless running?
+      raise "Nutcracker failed to start" unless running?
       Kernel.at_exit { kill if running? }
       self
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutcracker
 version: !ruby/object:Gem::Version
-  version: 0.2.4.12
+  version: 0.3.0.12
 platform: ruby
 authors:
 - Eran Barak Levi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -136,8 +136,10 @@ files:
 - ext/nutcracker/m4/lt~obsolete.m4
 - ext/nutcracker/Makefile.am
 - ext/nutcracker/Makefile.in
+- ext/nutcracker/man/nutcracker.8
 - ext/nutcracker/notes/c-styleguide.txt
 - ext/nutcracker/notes/debug.txt
+- ext/nutcracker/notes/kqueue.pdf
 - ext/nutcracker/notes/memcache.txt
 - ext/nutcracker/notes/recommendation.md
 - ext/nutcracker/notes/redis.md
@@ -152,6 +154,12 @@ files:
 - ext/nutcracker/scripts/populate_memcached.sh
 - ext/nutcracker/scripts/redis-check.py
 - ext/nutcracker/scripts/redis-check.sh
+- ext/nutcracker/src/event/Makefile.am
+- ext/nutcracker/src/event/Makefile.in
+- ext/nutcracker/src/event/nc_epoll.c
+- ext/nutcracker/src/event/nc_event.h
+- ext/nutcracker/src/event/nc_evport.c
+- ext/nutcracker/src/event/nc_kqueue.c
 - ext/nutcracker/src/hashkit/Makefile.am
 - ext/nutcracker/src/hashkit/Makefile.in
 - ext/nutcracker/src/hashkit/nc_crc16.c
@@ -179,8 +187,6 @@ files:
 - ext/nutcracker/src/nc_connection.h
 - ext/nutcracker/src/nc_core.c
 - ext/nutcracker/src/nc_core.h
-- ext/nutcracker/src/nc_event.c
-- ext/nutcracker/src/nc_event.h
 - ext/nutcracker/src/nc_log.c
 - ext/nutcracker/src/nc_log.h
 - ext/nutcracker/src/nc_mbuf.c

data/ext/nutcracker/src/nc_event.c

@@ -1,214 +0,0 @@
-/*
- * twemproxy - A fast and lightweight proxy for memcached protocol.
- * Copyright (C) 2011 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unistd.h>
-#include <sys/epoll.h>
-
-#include <nc_core.h>
-#include <nc_event.h>
-
-int
-event_init(struct context *ctx, int size)
-{
-    int status, ep;
-    struct epoll_event *event;
-
-    ASSERT(ctx->ep < 0);
-    ASSERT(ctx->nevent != 0);
-    ASSERT(ctx->event == NULL);
-
-    ep = epoll_create(size);
-    if (ep < 0) {
-        log_error("epoll create of size %d failed: %s", size, strerror(errno));
-        return -1;
-    }
-
-    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 -1;
-    }
-
-    ctx->ep = ep;
-    ctx->event = event;
-
-    log_debug(LOG_INFO, "e %d with nevent %d timeout %d", ctx->ep,
-              ctx->nevent, ctx->timeout);
-
-    return 0;
-}
-
-void
-event_deinit(struct context *ctx)
-{
-    int status;
-
-    ASSERT(ctx->ep >= 0);
-
-    nc_free(ctx->event);
-
-    status = close(ctx->ep);
-    if (status < 0) {
-        log_error("close e %d failed, ignored: %s", ctx->ep, strerror(errno));
-    }
-    ctx->ep = -1;
-}
-
-int
-event_add_out(int ep, struct conn *c)
-{
-    int status;
-    struct epoll_event event;
-
-    ASSERT(ep > 0);
-    ASSERT(c != NULL);
-    ASSERT(c->sd > 0);
-    ASSERT(c->recv_active);
-
-    if (c->send_active) {
-        return 0;
-    }
-
-    event.events = (uint32_t)(EPOLLIN | EPOLLOUT | EPOLLET);
-    event.data.ptr = c;
-
-    status = epoll_ctl(ep, EPOLL_CTL_MOD, c->sd, &event);
-    if (status < 0) {
-        log_error("epoll ctl on e %d sd %d failed: %s", ep, c->sd,
-                  strerror(errno));
-    } else {
-        c->send_active = 1;
-    }
-
-    return status;
-}
-
-int
-event_del_out(int ep, struct conn *c)
-{
-    int status;
-    struct epoll_event event;
-
-    ASSERT(ep > 0);
-    ASSERT(c != NULL);
-    ASSERT(c->sd > 0);
-    ASSERT(c->recv_active);
-
-    if (!c->send_active) {
-        return 0;
-    }
-
-    event.events = (uint32_t)(EPOLLIN | EPOLLET);
-    event.data.ptr = c;
-
-    status = epoll_ctl(ep, EPOLL_CTL_MOD, c->sd, &event);
-    if (status < 0) {
-        log_error("epoll ctl on e %d sd %d failed: %s", ep, c->sd,
-                  strerror(errno));
-    } else {
-        c->send_active = 0;
-    }
-
-    return status;
-}
-
-int
-event_add_conn(int ep, struct conn *c)
-{
-    int status;
-    struct epoll_event event;
-
-    ASSERT(ep > 0);
-    ASSERT(c != NULL);
-    ASSERT(c->sd > 0);
-
-    event.events = (uint32_t)(EPOLLIN | EPOLLOUT | EPOLLET);
-    event.data.ptr = c;
-
-    status = epoll_ctl(ep, EPOLL_CTL_ADD, c->sd, &event);
-    if (status < 0) {
-        log_error("epoll ctl on e %d sd %d failed: %s", ep, c->sd,
-                  strerror(errno));
-    } else {
-        c->send_active = 1;
-        c->recv_active = 1;
-    }
-
-    return status;
-}
-
-int
-event_del_conn(int ep, struct conn *c)
-{
-    int status;
-
-    ASSERT(ep > 0);
-    ASSERT(c != NULL);
-    ASSERT(c->sd > 0);
-
-    status = epoll_ctl(ep, EPOLL_CTL_DEL, c->sd, NULL);
-    if (status < 0) {
-        log_error("epoll ctl on e %d sd %d failed: %s", ep, c->sd,
-                  strerror(errno));
-    } else {
-        c->recv_active = 0;
-        c->send_active = 0;
-    }
-
-    return status;
-}
-
-int
-event_wait(int ep, struct epoll_event *event, int nevent, int timeout)
-{
-    int nsd;
-
-    ASSERT(ep > 0);
-    ASSERT(event != NULL);
-    ASSERT(nevent > 0);
-
-    for (;;) {
-        nsd = epoll_wait(ep, event, nevent, timeout);
-        if (nsd > 0) {
-            return nsd;
-        }
-
-        if (nsd == 0) {
-            if (timeout == -1) {
-               log_error("epoll wait on e %d with %d events and %d timeout "
-                         "returned no events", ep, nevent, timeout);
-                return -1;
-            }
-
-            return 0;
-        }
-
-        if (errno == EINTR) {
-            continue;
-        }
-
-        log_error("epoll wait on e %d with %d events failed: %s", ep, nevent,
-                  strerror(errno));
-
-        return -1;
-    }
-
-    NOT_REACHED();
-}

data/ext/nutcracker/src/nc_event.h

@@ -1,39 +0,0 @@
-/*
- * twemproxy - A fast and lightweight proxy for memcached protocol.
- * Copyright (C) 2011 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _NC_EVENT_H_
-#define _NC_EVENT_H_
-
-#include <nc_core.h>
-
-/*
- * A hint to the kernel that is used to size the event backing store
- * of a given epoll instance
- */
-#define EVENT_SIZE_HINT 1024
-
-int event_init(struct context *ctx, int size);
-void event_deinit(struct context *ctx);
-
-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_wait(int ep, struct epoll_event *event, int nevent, int timeout);
-
-#endif