Merge fixed from trond

diff --git a/config/bootstrap b/config/bootstrap
index 74d9fa1d8491507c15e3b4f836a0413f9664c89f..624c14570987c575ffd6ec9e62e1d5c582f440b7 100755 (executable)
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -26,9 +26,9 @@ set -e
 
 ## We do not currently support glibtoolize
 if test x$LIBTOOLIZE = x; then
 
 ## We do not currently support glibtoolize
 if test x$LIBTOOLIZE = x; then

-#  if test \! "x`which glibtoolize 2> /dev/null | grep -v '^no'`" = x; then
-#    LIBTOOLIZE=glibtoolize
-  if test \! "x`which libtoolize-1.5 2> /dev/null | grep -v '^no'`" = x; then
+  if test \! "x`which glibtoolize 2> /dev/null | grep -v '^no'`" = x; then
+    LIBTOOLIZE=glibtoolize
+  elif test \! "x`which libtoolize-1.5 2> /dev/null | grep -v '^no'`" = x; then

     LIBTOOLIZE=libtoolize-1.5
   elif test \! "x`which libtoolize 2> /dev/null | grep -v '^no'`" = x; then
     LIBTOOLIZE=libtoolize
     LIBTOOLIZE=libtoolize-1.5
   elif test \! "x`which libtoolize 2> /dev/null | grep -v '^no'`" = x; then
     LIBTOOLIZE=libtoolize

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index accf24b717dc073dc530263445c784ea0896b1ba..767075d466fe998c33efd824268ece87d95c6c0e 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -28,8 +28,9 @@ memcached_st *memcached_create(memcached_st *ptr)
   ptr->retry_timeout= 0;
   ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
   ptr->retry_timeout= 0;
   ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 

-  ptr->io_msg_watermark = 500;
-  ptr->io_bytes_watermark = 65 * 1024;
+  /* TODO, Document why we picked these defaults */
+  ptr->io_msg_watermark= 500;
+  ptr->io_bytes_watermark= 65 * 1024;

 
   return ptr;
 }
 
   return ptr;
 }

diff --git a/libmemcached/memcached_purge.c b/libmemcached/memcached_purge.c
index d9d43057627a58f9703771b79f885a16c66d3f89..749a30d6c19d85891fd8a69aed1b8f5dfaffa4b4 100644 (file)
--- a/libmemcached/memcached_purge.c
+++ b/libmemcached/memcached_purge.c
@@ -5,21 +5,23 @@
 
 void memcached_purge(memcached_server_st *ptr) 
 {
 
 void memcached_purge(memcached_server_st *ptr) 
 {

+  int32_t timeout;

   char buffer[2048];
   char buffer[2048];

-  size_t buffer_length = sizeof(buffer);
+  size_t buffer_length= sizeof(buffer);

   memcached_result_st result;
 
   if (ptr->root->purging || /* already purging */
       (memcached_server_response_count(ptr) < ptr->root->io_msg_watermark && 
        ptr->io_bytes_sent < ptr->root->io_bytes_watermark) ||
       (ptr->io_bytes_sent > ptr->root->io_bytes_watermark && 
   memcached_result_st result;
 
   if (ptr->root->purging || /* already purging */
       (memcached_server_response_count(ptr) < ptr->root->io_msg_watermark && 
        ptr->io_bytes_sent < ptr->root->io_bytes_watermark) ||
       (ptr->io_bytes_sent > ptr->root->io_bytes_watermark && 

-       memcached_server_response_count(ptr) < 10)) {
+       memcached_server_response_count(ptr) < 10)) 
+  {

     return;
   }
 
   /* memcached_io_write and memcached_response may call memcached_purge
      so we need to be able stop any recursion.. */
     return;
   }
 
   /* memcached_io_write and memcached_response may call memcached_purge
      so we need to be able stop any recursion.. */

-  ptr->root->purging = 1;
+  ptr->root->purging= 1;

 
   /* Force a flush of the buffer to ensure that we don't have the n-1 pending
      requests buffered up.. */
 
   /* Force a flush of the buffer to ensure that we don't have the n-1 pending
      requests buffered up.. */


@@ -33,10 +35,10 @@ void memcached_purge(memcached_server_st *ptr)
   
   /* memcached_response may call memcached_io_read, but let's use a short
      timeout if there is no data yet */
   
   /* memcached_response may call memcached_io_read, but let's use a short
      timeout if there is no data yet */

-  int32_t timeout = ptr->root->poll_timeout;
-  ptr->root->poll_timeout = 1;
+  timeout= ptr->root->poll_timeout;
+  ptr->root->poll_timeout= 1;

   memcached_response(ptr, buffer, sizeof(buffer), &result);
   memcached_response(ptr, buffer, sizeof(buffer), &result);

-  ptr->root->poll_timeout = timeout;
+  ptr->root->poll_timeout= timeout;

   memcached_server_response_increment(ptr);
   ptr->root->purging = 0;
 }
   memcached_server_response_increment(ptr);
   ptr->root->purging = 0;
 }