Merge lp:~tangent-org/libmemcached/1.0-build into lp:libmemcached/1.0

[Brian Aker]

[lp:~tangent-org/libmemcached/1.0-build]

1126. By Tangent.Org Continuous Integration on 2012-12-31

Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-181

=== modified file 'example/include.am'
--- example/include.am	2012-11-20 10:34:30 +0000
+++ example/include.am	2012-12-31 09:09:27 +0000
@@ -23,4 +23,4 @@
 example_memcached_light_SOURCES+= util/pidfile.cc
 
 example_memcached_light_LDADD+= libmemcached/libmemcachedprotocol.la
-example_memcached_light_LDFLAGS+= @LIBEVENT_LDFLAGS@
+example_memcached_light_LDADD+= @LIBEVENT_LIB@
 
=== modified file 'libmemcached/common.h'
--- libmemcached/common.h	2012-12-16 19:51:48 +0000
+++ libmemcached/common.h	2012-12-31 09:09:27 +0000
@@ -215,7 +215,14 @@
 
 memcached_return_t run_distribution(memcached_st *ptr);
 
-#define memcached_server_response_increment(A) (A)->cursor_active_++
+#ifdef __cplusplus
+static inline void memcached_server_response_increment(org::libmemcached::Instance* instance)
+{
+  instance->events(POLLIN);
+  instance->cursor_active_++;
+}
+#endif
+
 #define memcached_server_response_decrement(A) (A)->cursor_active_--
 #define memcached_server_response_reset(A) (A)->cursor_active_=0
 
 
=== modified file 'libmemcached/connect.cc'
--- libmemcached/connect.cc	2012-12-27 11:32:03 +0000
+++ libmemcached/connect.cc	2012-12-31 09:09:27 +0000
@@ -631,6 +631,9 @@
       server->fd= INVALID_SOCKET;
       continue;
 
+    case ECONNREFUSED:
+      // Probably not running service
+
     default:
       break;
     }
@@ -830,16 +833,6 @@
   return rc;
 }
 
-memcached_return_t memcached_connect_try(org::libmemcached::Instance* server)
-{
-  if (server and server->root and server->root->state.is_parsing)
-  {
-    return MEMCACHED_SUCCESS;
-  }
-
-  return _memcached_connect(server, false);
-}
-
 memcached_return_t memcached_connect(org::libmemcached::Instance* server)
 {
   return _memcached_connect(server, true);
 
=== modified file 'libmemcached/connect.hpp'
--- libmemcached/connect.hpp	2012-07-07 09:48:42 +0000
+++ libmemcached/connect.hpp	2012-12-31 09:09:27 +0000
@@ -37,6 +37,4 @@
 
 #pragma once
 
-memcached_return_t memcached_connect_try(org::libmemcached::Instance*);
 memcached_return_t memcached_connect(org::libmemcached::Instance*);
-
 
=== modified file 'libmemcached/get.cc'
--- libmemcached/get.cc	2012-12-16 19:51:48 +0000
+++ libmemcached/get.cc	2012-12-31 09:09:27 +0000
@@ -315,7 +315,7 @@
       }
       hosts_connected++;
 
-      if ((memcached_io_writev(instance, vector, 4, false)) == false)
+      if ((memcached_io_writev(instance, vector, 1, false)) == false)
       {
         failures_occured_in_sending= true;
         continue;
@@ -324,7 +324,7 @@
       memcached_instance_response_increment(instance);
       WATCHPOINT_ASSERT(instance->cursor_active_ == 1);
     }
-    else
+
     {
       if ((memcached_io_writev(instance, (vector + 1), 3, false)) == false)
       {
 
=== modified file 'libmemcached/instance.cc'
--- libmemcached/instance.cc	2012-12-27 11:32:03 +0000
+++ libmemcached/instance.cc	2012-12-31 09:09:27 +0000
@@ -160,11 +160,6 @@
     memcached_io_init_udp_header(self, 0);
   }
 
-  if (memc)
-  {
-    memcached_connect_try(self);
-  }
-
   return self;
 }
 
 
=== modified file 'libmemcached/stats.cc'
--- libmemcached/stats.cc	2012-12-24 09:47:40 +0000
+++ libmemcached/stats.cc	2012-12-31 09:09:27 +0000
@@ -232,7 +232,6 @@
 {
   char buffer[SMALL_STRING_LEN];
   int length;
-  char *ret;
 
   *error= MEMCACHED_SUCCESS;
 
@@ -336,7 +335,8 @@
     return NULL;
   }
 
-  ret= static_cast<char *>(libmemcached_malloc(ptr, (size_t) (length + 1)));
+  // User is responsible for free() memory, so use malloc()
+  char *ret= static_cast<char *>(malloc(size_t(length +1)));
   memcpy(ret, buffer, (size_t) length);
   ret[length]= '\0';
 
 
=== modified file 'libmemcached/string.cc'
--- libmemcached/string.cc	2012-09-10 07:42:54 +0000
+++ libmemcached/string.cc	2012-12-31 09:09:27 +0000
@@ -279,17 +279,22 @@
 
 char *memcached_string_take_value(memcached_string_st *self)
 {
-  assert_msg(self, "Invalid memcached_string_st");
-  // If we fail at adding the null, we copy and move on
-  if (memcached_success(memcached_string_append_null(self)))
+  char* value= NULL;
+
+  if (memcached_string_length(self))
   {
-    return memcached_string_c_copy(self);
+    assert_msg(self, "Invalid memcached_string_st");
+    // If we fail at adding the null, we copy and move on
+    if (memcached_success(memcached_string_append_null(self)))
+    {
+      return memcached_string_c_copy(self);
+    }
+
+    value= self->string;
+
+    _init_string(self);
   }
 
-  char *value= self->string;
-
-  _init_string(self);
-
   return value;
 }
 
 
=== modified file 'libmemcached/version.cc'
--- libmemcached/version.cc	2012-12-27 11:32:03 +0000
+++ libmemcached/version.cc	2012-12-31 09:09:27 +0000
@@ -41,7 +41,7 @@
   return LIBMEMCACHED_VERSION_STRING;
 }
 
-static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
+static inline memcached_return_t memcached_version_textual(memcached_st *memc)
 {
   libmemcached_io_vector_st vector[]=
   {
@@ -50,9 +50,9 @@
 
   uint32_t success= 0;
   bool errors_happened= false;
-  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
+  for (uint32_t x= 0; x < memcached_server_count(memc); x++)
   {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
+    org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
 
     // Optimization, we only fetch version once.
     if (instance->major_version != UINT8_MAX)
@@ -75,7 +75,7 @@
     // Collect the returned items
     org::libmemcached::Instance* instance;
     memcached_return_t readable_error;
-    while ((instance= memcached_io_get_readable_server(ptr, readable_error)))
+    while ((instance= memcached_io_get_readable_server(memc, readable_error)))
     {
       memcached_return_t rrc= memcached_response(instance, NULL);
       if (memcached_failed(rrc))
@@ -89,7 +89,7 @@
   return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
-static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
+static inline memcached_return_t memcached_version_binary(memcached_st *memc)
 {
   protocol_binary_request_version request= {};
 
@@ -103,9 +103,9 @@
 
   uint32_t success= 0;
   bool errors_happened= false;
-  for (uint32_t x= 0; x < memcached_server_count(ptr); x++) 
+  for (uint32_t x= 0; x < memcached_server_count(memc); x++) 
   {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
+    org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
 
     initialize_binary_request(instance, request.message.header);
 
@@ -130,7 +130,7 @@
     // Collect the returned items
     org::libmemcached::Instance* instance;
     memcached_return_t readable_error;
-    while ((instance= memcached_io_get_readable_server(ptr, readable_error)))
+    while ((instance= memcached_io_get_readable_server(memc, readable_error)))
     {
       char buffer[32];
       memcached_return_t rrc= memcached_response(instance, buffer, sizeof(buffer), NULL);
@@ -202,27 +202,27 @@
   }
 }
 
-memcached_return_t memcached_version(memcached_st *ptr)
+memcached_return_t memcached_version(memcached_st *memc)
 {
-  if (ptr)
+  if (memc)
   {
     memcached_return_t rc;
-    if (memcached_failed(rc= initialize_query(ptr, true)))
+    if (memcached_failed(rc= initialize_query(memc, true)))
     {
       return rc;
     }
 
-    if (memcached_is_udp(ptr))
+    if (memcached_is_udp(memc))
     {
       return MEMCACHED_NOT_SUPPORTED;
     }
 
-    if (memcached_is_binary(ptr))
+    if (memcached_is_binary(memc))
     {
-      return memcached_version_binary(ptr);
+      return memcached_version_binary(memc);
     }
 
-    return memcached_version_textual(ptr);      
+    return memcached_version_textual(memc);      
   }
 
   return MEMCACHED_INVALID_ARGUMENTS;
 
=== modified file 'libtest/comparison.hpp'
--- libtest/comparison.hpp	2012-10-22 00:48:10 +0000
+++ libtest/comparison.hpp	2012-12-31 09:09:27 +0000
@@ -39,13 +39,13 @@
 #include <typeinfo>
 
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/ostream.hpp>
-#include <libtest/memcached.hpp>
+# include <libmemcached-1.0/memcached.h>
+# include <libmemcachedutil-1.0/ostream.hpp>
+# include <libtest/memcached.hpp>
 #endif
 
 #if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
-#include <libgearman-1.0/ostream.hpp>
+# include <libgearman-1.0/ostream.hpp>
 #endif
 
 namespace libtest {