Update interfaces/rename a few things to get them out of the way.

libgearman/common.h

@@ -52,6 +52,7 @@
 #include <libgearman/byteorder.h>
 #include <libgearman/strcommand.h>
 #include <libgearman/string.h>
+#include <libgearman/vector.hpp>
 #include <libgearman/unique.h>
 #include <libgearman/result.hpp>
 #include <libgearman/actions.h>

libgearman/include.am

@@ -32,6 +32,7 @@ nobase_include_HEADERS+= \
 			 libgearman/task.h \
 			 libgearman/unique.h \
 			 libgearman/universal.h \
+			 libgearman/vector.hpp \
 			 libgearman/version.h \
 			 libgearman/visibility.h \
 			 libgearman/worker.h \
@@ -76,6 +77,7 @@ libgearman_libgearman_la_SOURCES= \
 				  libgearman/task.cc \
 				  libgearman/unique.cc \
 				  libgearman/universal.cc \
+				  libgearman/vector.cc \
 				  libgearman/worker.cc \
 				  libgearman/work.cc
 

libgearman/job.cc

@@ -55,7 +55,7 @@ struct gearman_job_reducer_st {
   gearman_universal_st &universal;
   gearman_client_st *client;
   gearman_result_st result;
-  gearman_string_st *reducer_function;
+  gearman_vector_st *reducer_function;
   gearman_aggregator_fn *aggregator_fn;
 
   gearman_job_reducer_st(gearman_universal_st &universal_arg,
@@ -332,7 +332,7 @@ gearman_return_t gearman_job_send_complete(gearman_job_st *job,
       return rc;
     }
 
-    gearman_string_st *reduced_value= job->reducer->result.string();
+    gearman_vector_st *reduced_value= job->reducer->result.string();
     if (reduced_value)
     {
       result= gearman_string_value(reduced_value);

libgearman/result.hpp

@@ -46,7 +46,7 @@ struct gearman_result_st
   union {
     bool boolean;
     int64_t integer;
-    gearman_string_st string;
+    gearman_vector_st string;
   } value;
 
   gearman_result_st() :
@@ -68,7 +68,7 @@ struct gearman_result_st
     return _is_null;
   }
 
-  gearman_string_st *string()
+  gearman_vector_st *string()
   {
     if (type == GEARMAN_RESULT_BINARY)
       return &value.string;

libgearman/string.cc

@@ -36,211 +36,3 @@
 
 
 #include <libgearman/common.h>
-
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
-
-#define GEARMAN_BLOCK_SIZE 1024*4
-
-inline static gearman_return_t _string_check(gearman_string_st *string, const size_t need)
-{
-  if (not string)
-    return GEARMAN_INVALID_ARGUMENT;
-
-  if (need && need > size_t(string->current_size - size_t(string->end - string->string)))
-  {
-    size_t current_offset= size_t(string->end - string->string);
-    char *new_value;
-    size_t adjust;
-    size_t new_size;
-
-    /* This is the block multiplier. To keep it larger and surive division errors we must round it up */
-    adjust= (need - size_t(string->current_size - size_t(string->end - string->string))) / GEARMAN_BLOCK_SIZE;
-    adjust++;
-
-    new_size= sizeof(char) * size_t((adjust * GEARMAN_BLOCK_SIZE) + string->current_size);
-    /* Test for overflow */
-    if (new_size < need)
-      return GEARMAN_MEMORY_ALLOCATION_FAILURE;
-
-    new_value= static_cast<char *>(realloc(string->string, new_size));
-
-    if (new_value == NULL)
-    {
-      return GEARMAN_MEMORY_ALLOCATION_FAILURE;
-    }
-
-    string->string= new_value;
-    string->end= string->string + current_offset;
-
-    string->current_size+= (GEARMAN_BLOCK_SIZE * adjust);
-  }
-
-  return GEARMAN_SUCCESS;
-}
-
-static inline void _init_string(gearman_string_st *self)
-{
-  self->current_size= 0;
-  self->end= self->string= NULL;
-}
-
-gearman_string_st *gearman_string_create(gearman_string_st *self, size_t initial_size)
-{
-  gearman_return_t rc;
-
-  /* Saving malloc calls :) */
-  if (self)
-  {
-    self->options.is_allocated= false;
-  }
-  else
-  {
-    self= static_cast<gearman_string_st *>(malloc(sizeof(gearman_string_st)));
-
-    if (self == NULL)
-    {
-      return NULL;
-    }
-
-    self->options.is_allocated= true;
-  }
-
-  _init_string(self);
-
-  rc=  _string_check(self, initial_size);
-  if (rc != GEARMAN_SUCCESS)
-  {
-    free(self);
-
-    return NULL;
-  }
-
-  if (initial_size)
-    self->string[0]= 0;
-
-  return self;
-}
-
-gearman_return_t gearman_string_append_character(gearman_string_st *string, char character)
-{
-  gearman_return_t rc;
-
-  rc=  _string_check(string, 1 +1); // Null terminate
-
-  if (gearman_failed(rc))
-  {
-    return rc;
-  }
-
-  *string->end= character;
-  string->end++;
-  *string->end= 0;
-
-  return GEARMAN_SUCCESS;
-}
-
-gearman_return_t gearman_string_append(gearman_string_st *string,
-                                       const char *value, size_t length)
-{
-  gearman_return_t rc;
-
-  rc= _string_check(string, length +1);
-
-  if (gearman_failed(rc))
-  {
-    return rc;
-  }
-
-  memcpy(string->end, value, length);
-  string->end+= length;
-  *string->end= 0; // Add a NULL
-
-  return GEARMAN_SUCCESS;
-}
-
-char *gearman_string_c_copy(gearman_string_st *string)
-{
-  char *c_ptr;
-
-  if (gearman_string_length(string) == 0)
-    return NULL;
-
-  c_ptr= static_cast<char *>(malloc((gearman_string_length(string) +1) * sizeof(char)));
-
-  if (c_ptr == NULL)
-    return NULL;
-
-  memcpy(c_ptr, gearman_string_value(string), gearman_string_length(string));
-  c_ptr[gearman_string_length(string)]= 0;
-
-  return c_ptr;
-}
-
-void gearman_string_reset(gearman_string_st *string)
-{
-  assert(string);
-  string->end= string->string;
-}
-
-void gearman_string_free(gearman_string_st *ptr)
-{
-  if (ptr == NULL)
-    return;
-
-  if (ptr->string)
-  {
-    free(ptr->string);
-  }
-
-  if (ptr->options.is_allocated)
-  {
-    free(ptr);
-  }
-}
-
-gearman_return_t gearman_string_check(gearman_string_st *string, size_t need)
-{
-  return _string_check(string, need);
-}
-
-size_t gearman_string_length(const gearman_string_st *self)
-{
-  if (not self)
-    return 0;
-
-  return size_t(self->end - self->string);
-}
-
-size_t gearman_string_size(const gearman_string_st *self)
-{
-  if (not self)
-    return 0;
-
-  return self->current_size;
-}
-
-const char *gearman_string_value(const gearman_string_st *self)
-{
-  if (not self)
-    return NULL;
-
-  return self->string;
-}
-
-gearman_string_t gearman_string(const gearman_string_st *self)
-{
-  assert(self);
-  gearman_string_t passable= { gearman_string_value(self), gearman_string_length(self) };
-  return passable;
-}
-
-gearman_string_t gearman_string_take_string(gearman_string_st *self)
-{
-  assert(self);
-  gearman_string_t passable= gearman_string(self);
-  _init_string(self);
-
-  return passable;
-}

libgearman/string.h

@@ -48,77 +48,12 @@ struct gearman_string_t {
 #define gearman_string_param(X) (X).c_str, (X).size
 
 #ifdef BUILDING_LIBGEARMAN
-/**
-  Strings are always under our control so we make some assumptions
-  about them.
-
-  1) is_initialized is always valid.
-  2) A string once intialized will always be, until free where we
-     unset this flag.
-*/
-struct gearman_string_st {
-  char *end;
-  char *string;
-  size_t current_size;
-  struct {
-    bool is_allocated:1;
-  } options;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-GEARMAN_LOCAL
-gearman_string_st *gearman_string_create(gearman_string_st *string,
-                                         size_t initial_size);
-GEARMAN_LOCAL
-gearman_return_t gearman_string_check(gearman_string_st *string, size_t need);
-
-GEARMAN_LOCAL
-char *gearman_string_c_copy(gearman_string_st *string);
-
-GEARMAN_LOCAL
-gearman_return_t gearman_string_append_character(gearman_string_st *string,
-                                                     char character);
-GEARMAN_LOCAL
-gearman_return_t gearman_string_append(gearman_string_st *string,
-                                           const char *value, size_t length);
-GEARMAN_LOCAL
-void gearman_string_reset(gearman_string_st *string);
-
-GEARMAN_LOCAL
-void gearman_string_free(gearman_string_st *string);
-
-GEARMAN_LOCAL
-size_t gearman_string_length(const gearman_string_st *self);
-
-GEARMAN_LOCAL
-size_t gearman_string_size(const gearman_string_st *self);
-
-GEARMAN_LOCAL
-const char *gearman_string_value(const gearman_string_st *self);
-
-GEARMAN_LOCAL
-char *gearman_string_value_mutable(const gearman_string_st *self);
-
-GEARMAN_LOCAL
-gearman_string_t gearman_string(const gearman_string_st *self);
-
-GEARMAN_LOCAL
-gearman_string_t gearman_string_take_string(gearman_string_st *self);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
 
 #ifdef __cplusplus // correct define
-#define gearman_string_make(X) (X), size_t>((sizeof(X) - 1))
+#define gearman_string_make(X) (X), size_t((sizeof(X) - 1))
 #else
 #define gearman_string_make(X) (X), (((size_t)((sizeof(X) - 1)))
 #endif // correct define
 
 #define gearman_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
+#endif // BUILDING_LIBGEARMAN

libgearman/vector.cc

@@ -0,0 +1,246 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Gearmand String
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#include <libgearman/common.h>
+
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
+
+#define GEARMAN_BLOCK_SIZE 1024*4
+
+inline static gearman_return_t _string_check(gearman_vector_st *string, const size_t need)
+{
+  if (not string)
+    return GEARMAN_INVALID_ARGUMENT;
+
+  if (need && need > size_t(string->current_size - size_t(string->end - string->string)))
+  {
+    size_t current_offset= size_t(string->end - string->string);
+    char *new_value;
+    size_t adjust;
+    size_t new_size;
+
+    /* This is the block multiplier. To keep it larger and surive division errors we must round it up */
+    adjust= (need - size_t(string->current_size - size_t(string->end - string->string))) / GEARMAN_BLOCK_SIZE;
+    adjust++;
+
+    new_size= sizeof(char) * size_t((adjust * GEARMAN_BLOCK_SIZE) + string->current_size);
+    /* Test for overflow */
+    if (new_size < need)
+      return GEARMAN_MEMORY_ALLOCATION_FAILURE;
+
+    new_value= static_cast<char *>(realloc(string->string, new_size));
+
+    if (new_value == NULL)
+    {
+      return GEARMAN_MEMORY_ALLOCATION_FAILURE;
+    }
+
+    string->string= new_value;
+    string->end= string->string + current_offset;
+
+    string->current_size+= (GEARMAN_BLOCK_SIZE * adjust);
+  }
+
+  return GEARMAN_SUCCESS;
+}
+
+static inline void _init_string(gearman_vector_st *self)
+{
+  self->current_size= 0;
+  self->end= self->string= NULL;
+}
+
+gearman_vector_st *gearman_string_create(gearman_vector_st *self, size_t initial_size)
+{
+  gearman_return_t rc;
+
+  /* Saving malloc calls :) */
+  if (self)
+  {
+    self->options.is_allocated= false;
+  }
+  else
+  {
+    self= static_cast<gearman_vector_st *>(malloc(sizeof(gearman_vector_st)));
+
+    if (self == NULL)
+    {
+      return NULL;
+    }
+
+    self->options.is_allocated= true;
+  }
+
+  _init_string(self);
+
+  rc=  _string_check(self, initial_size);
+  if (rc != GEARMAN_SUCCESS)
+  {
+    free(self);
+
+    return NULL;
+  }
+
+  if (initial_size)
+    self->string[0]= 0;
+
+  return self;
+}
+
+gearman_return_t gearman_string_append_character(gearman_vector_st *string, char character)
+{
+  gearman_return_t rc;
+
+  rc=  _string_check(string, 1 +1); // Null terminate
+
+  if (gearman_failed(rc))
+  {
+    return rc;
+  }
+
+  *string->end= character;
+  string->end++;
+  *string->end= 0;
+
+  return GEARMAN_SUCCESS;
+}
+
+gearman_return_t gearman_string_append(gearman_vector_st *string,
+                                       const char *value, size_t length)
+{
+  gearman_return_t rc;
+
+  rc= _string_check(string, length +1);
+
+  if (gearman_failed(rc))
+  {
+    return rc;
+  }
+
+  memcpy(string->end, value, length);
+  string->end+= length;
+  *string->end= 0; // Add a NULL
+
+  return GEARMAN_SUCCESS;
+}
+
+char *gearman_string_c_copy(gearman_vector_st *string)
+{
+  char *c_ptr;
+
+  if (gearman_string_length(string) == 0)
+    return NULL;
+
+  c_ptr= static_cast<char *>(malloc((gearman_string_length(string) +1) * sizeof(char)));
+
+  if (c_ptr == NULL)
+    return NULL;
+
+  memcpy(c_ptr, gearman_string_value(string), gearman_string_length(string));
+  c_ptr[gearman_string_length(string)]= 0;
+
+  return c_ptr;
+}
+
+void gearman_string_reset(gearman_vector_st *string)
+{
+  assert(string);
+  string->end= string->string;
+}
+
+void gearman_string_free(gearman_vector_st *ptr)
+{
+  if (ptr == NULL)
+    return;
+
+  if (ptr->string)
+  {
+    free(ptr->string);
+  }
+
+  if (ptr->options.is_allocated)
+  {
+    free(ptr);
+  }
+}
+
+gearman_return_t gearman_string_check(gearman_vector_st *string, size_t need)
+{
+  return _string_check(string, need);
+}
+
+size_t gearman_string_length(const gearman_vector_st *self)
+{
+  if (not self)
+    return 0;
+
+  return size_t(self->end - self->string);
+}
+
+size_t gearman_string_size(const gearman_vector_st *self)
+{
+  if (not self)
+    return 0;
+
+  return self->current_size;
+}
+
+const char *gearman_string_value(const gearman_vector_st *self)
+{
+  if (not self)
+    return NULL;
+
+  return self->string;
+}
+
+gearman_string_t gearman_string(const gearman_vector_st *self)
+{
+  assert(self);
+  gearman_string_t passable= { gearman_string_value(self), gearman_string_length(self) };
+  return passable;
+}
+
+gearman_string_t gearman_string_take_string(gearman_vector_st *self)
+{
+  assert(self);
+  gearman_string_t passable= gearman_string(self);
+  _init_string(self);
+
+  return passable;
+}

libgearman/vector.hpp

@@ -0,0 +1,104 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libgearman library
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once
+
+#ifdef BUILDING_LIBGEARMAN
+/**
+  vectors are always under our control so we make some assumptions about them.
+
+  1) is_initialized is always valid.
+  2) A string once intialized will always be, until free where we
+     unset this flag.
+*/
+struct gearman_vector_st {
+  char *end;
+  char *string;
+  size_t current_size;
+  struct {
+    bool is_allocated:1;
+  } options;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+GEARMAN_LOCAL
+gearman_vector_st *gearman_string_create(gearman_vector_st *string,
+                                         size_t initial_size);
+GEARMAN_LOCAL
+gearman_return_t gearman_string_check(gearman_vector_st *string, size_t need);
+
+GEARMAN_LOCAL
+char *gearman_string_c_copy(gearman_vector_st *string);
+
+GEARMAN_LOCAL
+gearman_return_t gearman_string_append_character(gearman_vector_st *string,
+                                                     char character);
+GEARMAN_LOCAL
+gearman_return_t gearman_string_append(gearman_vector_st *string,
+                                           const char *value, size_t length);
+GEARMAN_LOCAL
+void gearman_string_reset(gearman_vector_st *string);
+
+GEARMAN_LOCAL
+void gearman_string_free(gearman_vector_st *string);
+
+GEARMAN_LOCAL
+size_t gearman_string_length(const gearman_vector_st *self);
+
+GEARMAN_LOCAL
+size_t gearman_string_size(const gearman_vector_st *self);
+
+GEARMAN_LOCAL
+const char *gearman_string_value(const gearman_vector_st *self);
+
+GEARMAN_LOCAL
+char *gearman_string_value_mutable(const gearman_vector_st *self);
+
+GEARMAN_LOCAL
+gearman_string_t gearman_string(const gearman_vector_st *self);
+
+GEARMAN_LOCAL
+gearman_string_t gearman_string_take_string(gearman_vector_st *self);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // BUILDING_LIBGEARMAN

tests/client_test.cc

@@ -37,7 +37,7 @@
 #include <tests/do_background.h>
 #include <tests/execute.h>
 #include <tests/gearman_client_do_job_handle.h>
-#include <tests/gearman_worker_set_reducer.h>
+#include <tests/gearman_client_execute_reduce.h>
 #include <tests/task.h>
 #include <tests/unique.h>
 #include <tests/workers.h>

tests/gearman_worker_set_reducer.cc → tests/gearman_client_execute_reduce.cc

@@ -39,7 +39,7 @@
 #include <cassert>
 #include <cstring>
 #include <libgearman/gearman.h>
-#include <tests/gearman_worker_set_reducer.h>
+#include <tests/gearman_client_execute_reduce.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"