Rewritten spdylay_frame_unpack_nv().

We use just single buffer to store name/value headers fields, instead of
allocating memory for each name/value strings.
It is now more than 2 times faster than old one.

lib/spdylay_frame.c

@@ -87,138 +87,106 @@ static ssize_t spdylay_frame_alloc_pack_nv(uint8_t **buf_ptr,
   return framelen;
 }
 
+int spdylay_frame_count_unpack_nv_space
+(size_t *nvlen_ptr, size_t *buflen_ptr, const uint8_t *in, size_t inlen)
+{
+  uint16_t n;
+  size_t buflen = 0;
+  size_t nvlen = 0;
+  size_t off = 0;
+  const size_t len_size = sizeof(uint16_t);
+  int i;
+  if(inlen < len_size) {
+    return SPDYLAY_ERR_INVALID_ARGUMENT;
+  }
+  n = spdylay_get_uint16(in);
+  off += len_size;
+  for(i = 0; i < n; ++i) {
+    uint16_t len;
+    int j;
+    for(j = 0; j < 2; ++j) {
+      if(inlen-off < len_size) {
+        return SPDYLAY_ERR_INVALID_ARGUMENT;
+      }
+      len = spdylay_get_uint16(in+off);
+      off += 2;
+      if(inlen-off < len) {
+        return SPDYLAY_ERR_INVALID_ARGUMENT;
+      }
+      buflen += len+1;
+      off += len;
+    }
+    for(off -= len, j = off+len; off != j; ++off) {
+      if(in[off] == '\0') {
+        /* spdy/2 spec says it does not allow multiple, in-sequence
+           NULL characters */
+        if(off+1 != j && in[off+1] == '\0') {
+          return SPDYLAY_ERR_INVALID_ARGUMENT;
+        }
+        ++nvlen;
+      }
+    }
+    ++nvlen;
+  }
+  *nvlen_ptr = nvlen;
+  *buflen_ptr = buflen+(nvlen*2+1)*sizeof(char*);
+  return 0;
+}
+
 int spdylay_frame_unpack_nv(char ***nv_ptr, const uint8_t *in, size_t inlen)
 {
-  int r = 0;
+  size_t nvlen, buflen;
+  int r, i;
+  char *buf, **index, *data;
   uint16_t n;
-  size_t off;
+  r = spdylay_frame_count_unpack_nv_space(&nvlen, &buflen, in, inlen);
-  size_t nv_max = 126;
+  if(r != 0) {
-  int i, j, k;
+    return r;
-  char *name = NULL, *val = NULL;
-  if(inlen < 2) {
-    return SPDYLAY_ERR_PROTO;
   }
-  memcpy(&n, in, sizeof(uint16_t));
+  buf = malloc(buflen);
-  n = ntohs(n);
+  if(buf == NULL) {
-  if(n > nv_max) {
-    nv_max = n;
-  }
-  *nv_ptr = malloc(nv_max*sizeof(char*)+1);
-  if(*nv_ptr == NULL) {
     return SPDYLAY_ERR_NOMEM;
   }
-  off = 2;
+  index = (char**)buf;
-  for(i = 0, j = 0; i < n; ++i) {
+  data = buf+(nvlen*2+1)*sizeof(char*);
-    uint16_t nlen, vlen;
+  n = spdylay_get_uint16(in);
-    size_t last, len;
+  in += 2;
-    if(off+2 > inlen) {
+  for(i = 0; i < n; ++i) {
-      r = SPDYLAY_ERR_PROTO;
+    uint16_t len;
-      break;
+    char *name, *val;
-    }
+    char *stop;
-    /* For NULL delimited values, they are splitted with each name */
+    len = spdylay_get_uint16(in);
-    memcpy(&nlen, &in[off], sizeof(uint16_t));
+    in += 2;
-    nlen = ntohs(nlen);
+    name = data;
-    off += 2;
+    memcpy(data, in, len);
-    if(off+nlen > inlen || nlen == 0) {
+    data += len;
-      r = SPDYLAY_ERR_PROTO;
+    *data = '\0';
-      break;
+    ++data;
-    }
+    in += len;
-    name = malloc(nlen+1);
+
-    if(name == NULL) {
+    len = spdylay_get_uint16(in);
-      r = SPDYLAY_ERR_NOMEM;
+    in += 2;
-      break;
+    val = data;
-    }
+    memcpy(data, in, len);
-    memcpy(name, &in[off], nlen);
+
-    name[nlen] = '\0';
+    for(stop = data+len; data != stop; ++data) {
-    off += nlen;
+      if(*data == '\0') {
-    if(off+2 > inlen) {
+        *index++ = name;
-      r = SPDYLAY_ERR_PROTO;
+        *index++ = val;
-      break;
+        val = data+1;
-    }
-    memcpy(&vlen, &in[off], sizeof(uint16_t));
-    vlen = ntohs(vlen);
-    off += 2;
-    if(off+vlen > inlen) {
-      r = SPDYLAY_ERR_PROTO;
-      break;
-    }
-    for(k = 0, last = off; k < vlen; ++k) {
-      size_t len;
-      if(in[off+k] == '\0') {
-        len = off+k-last;
-        if(len == 0) {
-          r = SPDYLAY_ERR_PROTO;
-          break;
-        }
-        val = malloc(len+1);
-        if(val == NULL) {
-          r = SPDYLAY_ERR_NOMEM;
-          break;
-        }
-        memcpy(val, &in[last], len);
-        val[len] = '\0';
-        if(j >= nv_max) {
-          char **nnv;
-          nv_max *= 2;
-          nnv = realloc(*nv_ptr, nv_max+1);
-          if(nnv == NULL) {
-            r = SPDYLAY_ERR_NOMEM;
-            break;
-          } else {
-            *nv_ptr = nnv;
       }
     }
-        (*nv_ptr)[j] = strdup(name);
+    *data = '\0';
-        (*nv_ptr)[j+1] = val;
+    ++data;
-        val = NULL;
+    in += len;
-        last = off+k+1;
+
-        j += 2;
+    *index++ = name;
+    *index++ = val;
   }
-    }
+  *index = NULL;
-    if(r != 0) {
+  assert((char*)index-buf == (nvlen*2)*sizeof(char*));
-      break;
+  *nv_ptr = (char**)buf;
-    }
+  return 0;
-    len = vlen-(last-off);
-    if(len == 0) {
-      r = SPDYLAY_ERR_PROTO;
-      break;
-    }
-    val = malloc(len+1);
-    if(val == NULL) {
-      free(name);
-      r = SPDYLAY_ERR_NOMEM;
-      break;
-    }
-    memcpy(val, &in[last], len);
-    val[len] = '\0';
-    if(j >= nv_max) {
-      char **nnv;
-      nv_max *= 2;
-      nnv = realloc(*nv_ptr, nv_max+1);
-      if(nnv == NULL) {
-        r = SPDYLAY_ERR_NOMEM;
-        break;
-      } else {
-        *nv_ptr = nnv;
-      }
-    }
-    (*nv_ptr)[j] = name;
-    (*nv_ptr)[j+1] = val;
-    name = val = NULL;
-    j += 2;
-    off += vlen;
-  }
-  free(name);
-  free(val);
-  if(r == 0) {
-    (*nv_ptr)[j] = NULL;
-  } else {
-    for(i = 0; i < j; ++i) {
-      free((*nv_ptr)[i]);
-    }
-    free(*nv_ptr);
-  }
-  return r;
 }
 
 static int spdylay_frame_alloc_unpack_nv(char ***nv_ptr,
@@ -308,33 +276,36 @@ int spdylay_frame_is_ctrl_frame(uint8_t first_byte)
   return first_byte & 0x80;
 }
 
-void spdylay_frame_nv_free(char **nv)
+void spdylay_frame_nv_del(char **nv)
 {
-  int i;
+  free(nv);
-  for(i = 0; nv[i]; ++i) {
-    free(nv[i]);
-  }
 }
 
 char** spdylay_frame_nv_copy(const char **nv)
 {
-  int n, i;
+  int i;
-  char **nnv;
+  char *buf;
-  for(n = 0;nv[n]; ++n);
+  char **index, *data;
-  nnv = malloc((n+1)*sizeof(char*));
+  size_t buflen = 0;
-  if(nnv == NULL) {
+  for(i = 0; nv[i]; ++i) {
+    buflen += strlen(nv[i])+1;
+  }
+  buflen += (i+1)*sizeof(char*);
+  buf = malloc(buflen);
+  if(buf == NULL) {
     return NULL;
   }
-  for(i = 0; i < n; ++i) {
+  index = (char**)buf;
-    nnv[i] = strdup(nv[i]);
+  data = buf+(i+1)*sizeof(char*);
-    if(nnv[i] == NULL) {
+
-      spdylay_frame_nv_free(nnv);
+  for(i = 0; nv[i]; ++i) {
-      free(nnv);
+    size_t len = strlen(nv[i])+1;
-      return NULL;
+    memcpy(data, nv[i], len);
+    *index++ = data;
+    data += len;
   }
-  }
+  *index = NULL;
-  nnv[n] = NULL;
+  return (char**)buf;
-  return nnv;
 }
 
 static int spdylay_string_compar(const void *lhs, const void *rhs)
@@ -365,8 +336,7 @@ void spdylay_frame_syn_stream_init(spdylay_syn_stream *frame, uint8_t flags,
 
 void spdylay_frame_syn_stream_free(spdylay_syn_stream *frame)
 {
-  spdylay_frame_nv_free(frame->nv);
+  spdylay_frame_nv_del(frame->nv);
-  free(frame->nv);
 }
 
 void spdylay_frame_syn_reply_init(spdylay_syn_reply *frame, uint8_t flags,
@@ -382,8 +352,7 @@ void spdylay_frame_syn_reply_init(spdylay_syn_reply *frame, uint8_t flags,
 
 void spdylay_frame_syn_reply_free(spdylay_syn_reply *frame)
 {
-  spdylay_frame_nv_free(frame->nv);
+  spdylay_frame_nv_del(frame->nv);
-  free(frame->nv);
 }
 
 void spdylay_frame_ping_init(spdylay_ping *frame, uint32_t unique_id)
@@ -425,8 +394,7 @@ void spdylay_frame_headers_init(spdylay_headers *frame, uint8_t flags,
 
 void spdylay_frame_headers_free(spdylay_headers *frame)
 {
-  spdylay_frame_nv_free(frame->nv);
+  spdylay_frame_nv_del(frame->nv);
-  free(frame->nv);
 }
 
 void spdylay_frame_rst_stream_init(spdylay_rst_stream *frame,

lib/spdylay_frame.h

@@ -185,6 +185,33 @@ size_t spdylay_frame_count_nv_space(char **nv);
  */
 ssize_t spdylay_frame_pack_nv(uint8_t *buf, char **nv);
 
+/*
+ * Counts number of name/value pair in |in| and computes length of
+ * buffers to store unpacked name/value pair and store them in
+ * |*num_nv_ptr| and |*buf_size_ptr| respectively.  We use folloing
+ * data structure in |*buf_size_ptr|.  First part of the data is array
+ * of pointer to name/value pair.  Supporse the buf pointer points to
+ * the data region and N is the number of name/value pair.  First
+ * (N*2+1)*sizeof(char*) bytes contain array of pointer to name/value
+ * pair and terminating NULL.  Each pointer to name/value pair points
+ * to the string in remaining data.  For each name/value pair, the
+ * name is copied to the remaining data with terminating NULL
+ * character. The value is also copied to the position after the data
+ * with terminating NULL character. The corresponding index is
+ * assigned to these pointers. If the value contains multiple values
+ * (delimited by single NULL), for each such data, corresponding index
+ * is assigned to name/value pointers. In this case, the name string
+ * is reused.
+ *
+ * With the above stragety, |*buf_size_ptr| is calculated as
+ * (N*2+1)*sizeof(char*)+sum(strlen(name)+1+strlen(value)+1){for each
+ * name/value pair}.
+ *
+ * This function returns 0 if it succeeds, or negative error code.
+ */
+int spdylay_frame_count_unpack_nv_space
+(size_t *num_nv_ptr, size_t *buf_size_ptr, const uint8_t *in, size_t inlen);
+
 /*
  * Unpacks name/value pairs in wire format |in| with length |inlen|
  * and stores them in |*nv_ptr|.  Thif function allocates enough
@@ -249,13 +276,14 @@ void spdylay_frame_data_free(spdylay_data *frame);
 int spdylay_frame_is_ctrl_frame(uint8_t first_byte);
 
 /*
- * Deallocates memory of key/value pairs in |nv|.
+ * Deallocates memory of name/value pair |nv|.
  */
-void spdylay_frame_nv_free(char **nv);
+void spdylay_frame_nv_del(char **nv);
 
 /*
  * Makes a deep copy of |nv| and returns the copy.  This function
- * returns the pointer to the copy if it succeeds, or NULL.
+ * returns the pointer to the copy if it succeeds, or NULL.  To free
+ * allocated memory, use spdylay_frame_nv_del().
  */
 char** spdylay_frame_nv_copy(const char **nv);
 

tests/main.c

@@ -106,6 +106,8 @@ int main(int argc, char* argv[])
       !CU_add_test(pSuite, "frame_unpack_nv", test_spdylay_frame_unpack_nv) ||
       !CU_add_test(pSuite, "frame_count_nv_space",
                    test_spdylay_frame_count_nv_space) ||
+      !CU_add_test(pSuite, "frame_count_unpack_nv_space",
+                   test_spdylay_frame_count_unpack_nv_space) ||
       !CU_add_test(pSuite, "frame_pack_ping", test_spdylay_frame_pack_ping) ||
       !CU_add_test(pSuite, "frame_pack_goaway",
                    test_spdylay_frame_pack_goaway) ||

tests/spdylay_frame_test.c

@@ -44,8 +44,19 @@ void test_spdylay_frame_unpack_nv()
   char **nv;
   size_t inlen = spdylay_frame_pack_nv(out, (char**)headers);
   CU_ASSERT(0 == spdylay_frame_unpack_nv(&nv, out, inlen));
-  spdylay_frame_nv_free(nv);
+  CU_ASSERT(strcmp("method", nv[0]) == 0);
-  free(nv);
+  CU_ASSERT(strcmp("GET", nv[1]) == 0);
+  CU_ASSERT(strcmp("scheme", nv[2]) == 0);
+  CU_ASSERT(strcmp("https", nv[3]) == 0);
+  CU_ASSERT(strcmp("url", nv[4]) == 0);
+  CU_ASSERT(strcmp("/", nv[5]) == 0);
+  CU_ASSERT(strcmp("x-head", nv[6]) == 0);
+  CU_ASSERT(strcmp("foo", nv[7]) == 0);
+  CU_ASSERT(strcmp("x-head", nv[8]) == 0);
+  CU_ASSERT(strcmp("bar", nv[9]) == 0);
+  CU_ASSERT(strcmp("version", nv[10]) == 0);
+  CU_ASSERT(strcmp("HTTP/1.1", nv[11]) == 0);
+  spdylay_frame_nv_del(nv);
 }
 
 void test_spdylay_frame_count_nv_space()
@@ -53,6 +64,17 @@ void test_spdylay_frame_count_nv_space()
   CU_ASSERT(83 == spdylay_frame_count_nv_space((char**)headers));
 }
 
+void test_spdylay_frame_count_unpack_nv_space()
+{
+  size_t nvlen, buflen;
+  uint8_t out[1024];
+  size_t inlen = spdylay_frame_pack_nv(out, (char**)headers);
+  CU_ASSERT(0 == spdylay_frame_count_unpack_nv_space(&nvlen, &buflen,
+                                                     out, inlen));
+  CU_ASSERT(6 == nvlen);
+  CU_ASSERT(166 == buflen);
+}
+
 void test_spdylay_frame_pack_ping()
 {
   spdylay_frame frame, oframe;

tests/spdylay_frame_test.h

@@ -27,6 +27,7 @@
 
 void test_spdylay_frame_unpack_nv();
 void test_spdylay_frame_count_nv_space();
+void test_spdylay_frame_count_unpack_nv_space();
 void test_spdylay_frame_pack_ping();
 void test_spdylay_frame_pack_goaway();
 void test_spdylay_frame_pack_headers();

tests/spdylay_session_test.c

@@ -142,15 +142,7 @@ static ssize_t fixed_length_data_source_read_callback
 
 static char** dup_nv(const char **src)
 {
-  int i;
+  return spdylay_frame_nv_copy(src);
-  char **dst;
-  for(i = 0; src[i]; ++i);
-  dst = malloc((i+1)*sizeof(char*));
-  for(i = 0; src[i]; ++i) {
-    dst[i] = strdup(src[i]);
-  }
-  dst[i] = NULL;
-  return dst;
 }
 
 void test_spdylay_session_recv()