nutcracker 0.3.0.12 → 0.4.0.13

data/ext/nutcracker/src/nc_util.c

@@ -299,6 +299,18 @@ nc_stacktrace(int skip_count)
 #endif
 }
 
+void
+nc_stacktrace_fd(int fd)
+{
+#ifdef NC_HAVE_BACKTRACE
+    void *stack[64];
+    int size;
+
+    size = backtrace(stack, 64);
+    backtrace_symbols_fd(stack, size, fd);
+#endif
+}
+
 void
 nc_assert(const char *cond, const char *file, int line, int panic)
 {

data/ext/nutcracker/src/nc_util.h

@@ -185,6 +185,7 @@ ssize_t _nc_recvn(int sd, void *vptr, size_t n);
 
 void nc_assert(const char *cond, const char *file, int line, int panic);
 void nc_stacktrace(int skip_count);
+void nc_stacktrace_fd(int fd);
 
 int _scnprintf(char *buf, size_t size, const char *fmt, ...);
 int _vscnprintf(char *buf, size_t size, const char *fmt, va_list args);

data/ext/nutcracker/src/proto/Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/proto
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/config/depcomp $(noinst_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -51,31 +95,83 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libproto_a_AR = $(AR) $(ARFLAGS)
 libproto_a_LIBADD =
 am_libproto_a_OBJECTS = nc_memcache.$(OBJEXT) nc_redis.$(OBJEXT)
 libproto_a_OBJECTS = $(am_libproto_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libproto_a_SOURCES)
 DIST_SOURCES = $(libproto_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -239,10 +335,11 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
 libproto.a: $(libproto_a_OBJECTS) $(libproto_a_DEPENDENCIES) $(EXTRA_libproto_a_DEPENDENCIES) 
-	-rm -f libproto.a
-	$(libproto_a_AR) libproto.a $(libproto_a_OBJECTS) $(libproto_a_LIBADD)
-	$(RANLIB) libproto.a
+	$(AM_V_at)-rm -f libproto.a
+	$(AM_V_AR)$(libproto_a_AR) libproto.a $(libproto_a_OBJECTS) $(libproto_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libproto.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -254,25 +351,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nc_redis.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -280,26 +377,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -311,15 +397,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -328,6 +410,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -470,18 +567,19 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

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

@@ -192,6 +192,7 @@ memcache_parse_req(struct msg *r)
                 m = r->token;
                 r->token = NULL;
                 r->type = MSG_UNKNOWN;
+                r->narg++;
 
                 switch (p - m) {
 
@@ -307,23 +308,35 @@ memcache_parse_req(struct msg *r)
 
         case SW_SPACES_BEFORE_KEY:
             if (ch != ' ') {
-                r->token = p;
-                r->key_start = p;
+                p = p - 1; /* go back by 1 byte */
+                r->token = NULL;
                 state = SW_KEY;
             }
-
             break;
 
         case SW_KEY:
+            if (r->token == NULL) {
+                r->token = p;
+            }
             if (ch == ' ' || ch == CR) {
-                if ((p - r->key_start) > MEMCACHE_MAX_KEY_LENGTH) {
+                struct keypos *kpos;
+
+                if ((p - r->token) > MEMCACHE_MAX_KEY_LENGTH) {
                     log_error("parsed bad req %"PRIu64" of type %d with key "
                               "prefix '%.*s...' and length %d that exceeds "
                               "maximum key length", r->id, r->type, 16,
-                              r->key_start, p - r->key_start);
+                              r->token, p - r->token);
                     goto error;
                 }
-                r->key_end = p;
+
+                kpos = array_push(r->keys);
+                if (kpos == NULL) {
+                    goto enomem;
+                }
+                kpos->start = r->token;
+                kpos->end = p;
+
+                r->narg++;
                 r->token = NULL;
 
                 /* get next state */
@@ -360,8 +373,9 @@ memcache_parse_req(struct msg *r)
                 break;
 
             default:
-                r->token = p;
-                goto fragment;
+                r->token = NULL;
+                p = p - 1; /* go back by 1 byte */
+                state = SW_KEY;
             }
 
             break;
@@ -424,7 +438,6 @@ memcache_parse_req(struct msg *r)
                     goto error;
                 }
                 /* vlen_start <- p */
-                r->token = p;
                 r->vlen = (uint32_t)(ch - '0');
                 state = SW_VLEN;
             }
@@ -677,19 +690,6 @@ memcache_parse_req(struct msg *r)
                 r->state, r->pos - b->pos, b->last - b->pos);
     return;
 
-fragment:
-    ASSERT(p != b->last);
-    ASSERT(r->token != NULL);
-    r->pos = r->token;
-    r->token = NULL;
-    r->state = state;
-    r->result = MSG_PARSE_FRAGMENT;
-
-    log_hexdump(LOG_VERB, b->pos, mbuf_length(b), "parsed req %"PRIu64" res %d "
-                "type %d state %d rpos %d of %d", r->id, r->result, r->type,
-                r->state, r->pos - b->pos, b->last - b->pos);
-    return;
-
 done:
     ASSERT(r->type > MSG_UNKNOWN && r->type < MSG_SENTINEL);
     r->pos = p + 1;
@@ -702,6 +702,15 @@ done:
                 r->state, r->pos - b->pos, b->last - b->pos);
     return;
 
+enomem:
+    r->result = MSG_PARSE_ERROR;
+    r->state = state;
+
+    log_hexdump(LOG_INFO, b->pos, mbuf_length(b), "out of memory on parse req %"PRIu64" "
+                "res %d type %d state %d", r->id, r->result, r->type, r->state);
+
+    return;
+
 error:
     r->result = MSG_PARSE_ERROR;
     r->state = state;
@@ -724,17 +733,17 @@ memcache_parse_rsp(struct msg *r)
         SW_RSP_STR,
         SW_SPACES_BEFORE_KEY,
         SW_KEY,
-        SW_SPACES_BEFORE_FLAGS,
+        SW_SPACES_BEFORE_FLAGS,     /* 5 */
         SW_FLAGS,
         SW_SPACES_BEFORE_VLEN,
         SW_VLEN,
         SW_RUNTO_VAL,
-        SW_VAL,
+        SW_VAL,                     /* 10 */
         SW_VAL_LF,
         SW_END,
         SW_RUNTO_CRLF,
         SW_CRLF,
-        SW_ALMOST_DONE,
+        SW_ALMOST_DONE,             /* 15 */
         SW_SENTINEL
     } state;
 
@@ -795,14 +804,14 @@ memcache_parse_rsp(struct msg *r)
             if (ch == ' ' || ch == CR) {
                 /* type_end <- p - 1 */
                 m = r->token;
-                r->token = NULL;
+                /* r->token = NULL; */
                 r->type = MSG_UNKNOWN;
 
                 switch (p - m) {
                 case 3:
                     if (str4cmp(m, 'E', 'N', 'D', '\r')) {
                         r->type = MSG_RSP_MC_END;
-                        /* end_start <- m; end_end <- p - 1*/
+                        /* end_start <- m; end_end <- p - 1 */
                         r->end = m;
                         break;
                     }
@@ -924,21 +933,8 @@ memcache_parse_rsp(struct msg *r)
             break;
 
         case SW_KEY:
-            if (r->token == NULL) {
-                r->token = p;
-                r->key_start = p;
-            }
-
             if (ch == ' ') {
-                if ((p - r->key_start) > MEMCACHE_MAX_KEY_LENGTH) {
-                    log_error("parsed bad req %"PRIu64" of type %d with key "
-                              "prefix '%.*s...' and length %d that exceeds "
-                              "maximum key length", r->id, r->type, 16,
-                              r->key_start, p - r->key_start);
-                    goto error;
-                }
-                r->key_end = p;
-                r->token = NULL;
+                /* r->token = NULL; */
                 state = SW_SPACES_BEFORE_FLAGS;
             }
 
@@ -958,7 +954,7 @@ memcache_parse_rsp(struct msg *r)
         case SW_FLAGS:
             if (r->token == NULL) {
                 /* flags_start <- p */
-                r->token = p;
+                /* r->token = p; */
             }
 
             if (isdigit(ch)) {
@@ -966,7 +962,7 @@ memcache_parse_rsp(struct msg *r)
                 ;
             } else if (ch == ' ') {
                 /* flags_end <- p - 1 */
-                r->token = NULL;
+                /* r->token = NULL; */
                 state = SW_SPACES_BEFORE_VLEN;
             } else {
                 goto error;
@@ -981,21 +977,18 @@ memcache_parse_rsp(struct msg *r)
                 }
                 p = p - 1; /* go back by 1 byte */
                 state = SW_VLEN;
+                r->vlen = 0;
             }
 
             break;
 
         case SW_VLEN:
-            if (r->token == NULL) {
-                /* vlen_start <- p */
-                r->token = p;
-                r->vlen = (uint32_t)(ch - '0');
-            } else if (isdigit(ch)) {
+            if (isdigit(ch)) {
                 r->vlen = r->vlen * 10 + (uint32_t)(ch - '0');
             } else if (ch == ' ' || ch == CR) {
                 /* vlen_end <- p - 1 */
                 p = p - 1; /* go back by 1 byte */
-                r->token = NULL;
+                /* r->token = NULL; */
                 state = SW_RUNTO_CRLF;
             } else {
                 goto error;
@@ -1008,6 +1001,7 @@ memcache_parse_rsp(struct msg *r)
             case LF:
                 /* val_start <- p + 1 */
                 state = SW_VAL;
+                r->token = NULL;
                 break;
 
             default:
@@ -1041,7 +1035,8 @@ memcache_parse_rsp(struct msg *r)
         case SW_VAL_LF:
             switch (ch) {
             case LF:
-                state = SW_END;
+                /* state = SW_END; */
+                state = SW_RSP_STR;
                 break;
 
             default:
@@ -1134,6 +1129,9 @@ memcache_parse_rsp(struct msg *r)
     r->state = state;
 
     if (b->last == b->end && r->token != NULL) {
+        if (state <= SW_RUNTO_VAL || state == SW_CRLF || state == SW_ALMOST_DONE) {
+            r->state = SW_START;
+        }
         r->pos = r->token;
         r->token = NULL;
         r->result = MSG_PARSE_REPAIR;
@@ -1169,52 +1167,139 @@ error:
                 r->state);
 }
 
-/*
- * Pre-split copy handler invoked when the request is a multi vector -
- * 'get' or 'gets' request and is about to be split into two requests
- */
-void
-memcache_pre_splitcopy(struct mbuf *mbuf, void *arg)
+static rstatus_t
+memcache_append_key(struct msg *r, uint8_t *key, uint32_t keylen)
 {
-    struct msg *r = arg;                  /* request vector */
-    struct string get = string("get ");   /* 'get ' string */
-    struct string gets = string("gets "); /* 'gets ' string */
+    struct mbuf *mbuf;
+    struct keypos *kpos;
 
-    ASSERT(r->request);
-    ASSERT(!r->redis);
-    ASSERT(mbuf_empty(mbuf));
+    mbuf = msg_ensure_mbuf(r, keylen + 2);
+    if (mbuf == NULL) {
+        return NC_ENOMEM;
+    }
 
-    switch (r->type) {
-    case MSG_REQ_MC_GET:
-        mbuf_copy(mbuf, get.data, get.len);
-        break;
+    kpos = array_push(r->keys);
+    if (kpos == NULL) {
+        return NC_ENOMEM;
+    }
 
-    case MSG_REQ_MC_GETS:
-        mbuf_copy(mbuf, gets.data, gets.len);
-        break;
+    kpos->start = mbuf->last;
+    kpos->end = mbuf->last + keylen;
+    mbuf_copy(mbuf, key, keylen);
+    r->mlen += keylen;
 
-    default:
-        NOT_REACHED();
-    }
+    mbuf_copy(mbuf, (uint8_t *)" ", 1);
+    r->mlen += 1;
+    return NC_OK;
 }
 
 /*
- * Post-split copy handler invoked when the request is a multi vector -
- * 'get' or 'gets' request and has already been split into two requests
+ * read the comment in proto/nc_redis.c
  */
-rstatus_t
-memcache_post_splitcopy(struct msg *r)
+static rstatus_t
+memcache_fragment_retrieval(struct msg *r, uint32_t ncontinuum,
+                            struct msg_tqh *frag_msgq,
+                            uint32_t key_step)
 {
     struct mbuf *mbuf;
-    struct string crlf = string(CRLF);
+    struct msg **sub_msgs;
+    uint32_t i;
+    rstatus_t status;
 
-    ASSERT(r->request);
-    ASSERT(!r->redis);
-    ASSERT(!STAILQ_EMPTY(&r->mhdr));
+    sub_msgs = nc_zalloc(ncontinuum * sizeof(*sub_msgs));
+    if (sub_msgs == NULL) {
+        return NC_ENOMEM;
+    }
+
+    ASSERT(r->frag_seq == NULL);
+    r->frag_seq = nc_alloc(array_n(r->keys) * sizeof(*r->frag_seq));
+    if (r->frag_seq == NULL) {
+        nc_free(sub_msgs);
+        return NC_ENOMEM;
+    }
+
+    mbuf = STAILQ_FIRST(&r->mhdr);
+    mbuf->pos = mbuf->start;
+
+    /*
+     * This code is based on the assumption that 'gets ' is located
+     * in a contiguous location.
+     * This is always true because we have capped our MBUF_MIN_SIZE at 512 and
+     * whenever we have multiple messages, we copy the tail message into a new mbuf
+     */
+    for (; *(mbuf->pos) != ' ';) {          /* eat get/gets  */
+        mbuf->pos++;
+    }
+    mbuf->pos++;
+
+    r->frag_id = msg_gen_frag_id();
+    r->nfrag = 0;
+    r->frag_owner = r;
+
+    for (i = 0; i < array_n(r->keys); i++) {        /* for each  key */
+        struct msg *sub_msg;
+        struct keypos *kpos = array_get(r->keys, i);
+        uint32_t idx = msg_backend_idx(r, kpos->start, kpos->end - kpos->start);
+
+        if (sub_msgs[idx] == NULL) {
+            sub_msgs[idx] = msg_get(r->owner, r->request, r->redis);
+            if (sub_msgs[idx] == NULL) {
+                nc_free(sub_msgs);
+                return NC_ENOMEM;
+            }
+        }
+        r->frag_seq[i] = sub_msg = sub_msgs[idx];
+
+        sub_msg->narg++;
+        status = memcache_append_key(sub_msg, kpos->start, kpos->end - kpos->start);
+        if (status != NC_OK) {
+            nc_free(sub_msgs);
+            return status;
+        }
+    }
+
+    for (i = 0; i < ncontinuum; i++) {     /* prepend mget header, and forward it */
+        struct msg *sub_msg = sub_msgs[i];
+        if (sub_msg == NULL) {
+            continue;
+        }
+
+        /* prepend get/gets */
+        if (r->type == MSG_REQ_MC_GET) {
+            status = msg_prepend(sub_msg, (uint8_t *)"get ", 4);
+        } else if (r->type == MSG_REQ_MC_GETS) {
+            status = msg_prepend(sub_msg, (uint8_t *)"gets ", 5);
+        }
+        if (status != NC_OK) {
+            nc_free(sub_msgs);
+            return status;
+        }
+
+        /* append \r\n */
+        status = msg_append(sub_msg, (uint8_t *)CRLF, CRLF_LEN);
+        if (status != NC_OK) {
+            nc_free(sub_msgs);
+            return status;
+        }
 
-    mbuf = STAILQ_LAST(&r->mhdr, mbuf, next);
-    mbuf_copy(mbuf, crlf.data, crlf.len);
+        sub_msg->type = r->type;
+        sub_msg->frag_id = r->frag_id;
+        sub_msg->frag_owner = r->frag_owner;
 
+        TAILQ_INSERT_TAIL(frag_msgq, sub_msg, m_tqe);
+        r->nfrag++;
+    }
+
+    nc_free(sub_msgs);
+    return NC_OK;
+}
+
+rstatus_t
+memcache_fragment(struct msg *r, uint32_t ncontinuum, struct msg_tqh *frag_msgq)
+{
+    if (memcache_retrieval(r)) {
+        return memcache_fragment_retrieval(r, ncontinuum, frag_msgq, 1);
+    }
     return NC_OK;
 }
 
@@ -1237,6 +1322,7 @@ memcache_pre_coalesce(struct msg *r)
         return;
     }
 
+    pr->frag_owner->nfrag_done++;
     switch (r->type) {
 
     case MSG_RSP_MC_VALUE:
@@ -1244,13 +1330,9 @@ memcache_pre_coalesce(struct msg *r)
 
         /*
          * Readjust responses of the fragmented message vector by not
-         * including the end marker for all but the last response
+         * including the end marker for all
          */
 
-        if (pr->last_fragment) {
-            break;
-        }
-
         ASSERT(r->end != NULL);
 
         for (;;) {
@@ -1294,6 +1376,84 @@ memcache_pre_coalesce(struct msg *r)
     }
 }
 
+/*
+ * copy one response from src to dst
+ * return bytes copied
+ * */
+static rstatus_t
+memcache_copy_bulk(struct msg *dst, struct msg *src)
+{
+    struct mbuf *mbuf, *nbuf;
+    uint8_t *p;
+    uint32_t len = 0;
+    uint32_t bytes = 0;
+    uint32_t i = 0;
+
+    for (mbuf = STAILQ_FIRST(&src->mhdr);
+         mbuf && mbuf_empty(mbuf);
+         mbuf = STAILQ_FIRST(&src->mhdr)) {
+
+        mbuf_remove(&src->mhdr, mbuf);
+        mbuf_put(mbuf);
+    }
+
+    mbuf = STAILQ_FIRST(&src->mhdr);
+    if (mbuf == NULL) {
+        return NC_OK;           /* key not exists */
+    }
+    p = mbuf->pos;
+
+    /* get : VALUE key 0 len\r\nval\r\n */
+    /* gets: VALUE key 0 len cas\r\nval\r\n */
+
+    ASSERT(*p == 'V');
+    for (i = 0; i < 3; i++) {                 /*  eat 'VALUE key 0 '  */
+        for (; *p != ' ';) {
+            p++;
+        }
+        p++;
+    }
+
+    len = 0;
+    for (; p < mbuf->last && isdigit(*p); p++) {
+        len = len * 10 + (uint32_t)(*p - '0');
+    }
+
+    for (; p < mbuf->last && ('\r' != *p); p++) { /* eat cas for gets */
+        ;
+    }
+
+    len += CRLF_LEN * 2;
+    len += (p - mbuf->pos);
+
+    bytes = len;
+
+    /* copy len bytes to dst */
+    for (; mbuf;) {
+        if (mbuf_length(mbuf) <= len) {   /* steal this mbuf from src to dst */
+            nbuf = STAILQ_NEXT(mbuf, next);
+            mbuf_remove(&src->mhdr, mbuf);
+            mbuf_insert(&dst->mhdr, mbuf);
+            len -= mbuf_length(mbuf);
+            mbuf = nbuf;
+        } else {                        /* split it */
+            nbuf = mbuf_get();
+            if (nbuf == NULL) {
+                return NC_ENOMEM;
+            }
+            mbuf_copy(nbuf, mbuf->pos, len);
+            mbuf_insert(&dst->mhdr, nbuf);
+            mbuf->pos += len;
+            break;
+        }
+    }
+
+    dst->mlen += bytes;
+    src->mlen -= bytes;
+    log_debug(LOG_VVERB, "memcache_copy_bulk copy bytes: %d", bytes);
+    return NC_OK;
+}
+
 /*
  * Post-coalesce handler is invoked when the message is a response to
  * the fragmented multi vector request - 'get' or 'gets' and all the
@@ -1301,6 +1461,37 @@ memcache_pre_coalesce(struct msg *r)
  * the fragmented request is consider to be done
  */
 void
-memcache_post_coalesce(struct msg *r)
+memcache_post_coalesce(struct msg *request)
 {
+    struct msg *response = request->peer;
+    struct msg *sub_msg;
+    uint32_t i;
+    rstatus_t status;
+
+    ASSERT(!response->request);
+    ASSERT(request->request && (request->frag_owner == request));
+    if (request->error || request->ferror) {
+        response->owner->err = 1;
+        return;
+    }
+
+    for (i = 0; i < array_n(request->keys); i++) {      /* for each  key */
+        sub_msg = request->frag_seq[i]->peer;           /* get it's peer response */
+        if (sub_msg == NULL) {
+            response->owner->err = 1;
+            return;
+        }
+        status = memcache_copy_bulk(response, sub_msg);
+        if (status != NC_OK) {
+            response->owner->err = 1;
+            return;
+        }
+    }
+
+    /* append END\r\n */
+    status = msg_append(response, (uint8_t *)"END\r\n", 5);
+    if (status != NC_OK) {
+        response->owner->err = 1;
+        return;
+    }
 }