Merge

diff --git a/.hgignore b/.hgignore
index cd363e7a47bb2ab981807bc358cba8c612ba3034..9aa168ed5e7b56fd3b449305196d0ea85caa756c 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -22,6 +22,14 @@ autom4te.cache/*$
 .(gz|cmp|tar|rpm|srpm)$
 support/libmemcached.pc$
 support/libmemcached.spec$
+docs/pod2htmd.tmp
+docs/pod2htmi.tmp
+lib/memcachedplus.loT
+tests/atomsmasher
+tests/startservers
+tests/stopservers
+tests/udptest
+
 
 
 Makefile(.in)?$

diff --git a/ChangeLog b/ChangeLog
index d57737ac7e61861533e185d691c92a1fbf2124f6..e6228373142009cdad6ca2b5482a56e26fb26987 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.17
+  * More error messages on command line tools.
+
 0.16
   * Work on the UDP protocol
   * Added get_by_key, set_by_key tests for C++ API

diff --git a/README b/README
index 0deb8b3e81c5b1ba8f37ace3af2d6c5aa987d8f3..d91ccc961c739ae181dfac8bf903115d1a95cda4 100644 (file)
--- a/README
+++ b/README
@@ -17,6 +17,10 @@ Want to contribute? If you write more then three good patches, then I will
 just ask you to commit directly to the tree. I am happy to have additional
 people work on this project.
 
+If you are looking for answers to your questions please check out the
+mailing list at:
+http://lists.tangent.org/  libmemcached.
+
 Cheers,
   -Brian Aker
    Seattle, WA.

diff --git a/THANKS b/THANKS
index f91fa70564350182a972736ac1c4ef19060c4f0c..45809cec22285ddc2682a4039559295c7c1885cb 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -5,4 +5,6 @@ Tobias Luetke - Performance Feedback
 Andre Cruz - Help with getting the CRC Hash function to match other connectors
 Brian Pontz - Hsieh hash
 Tim Bunce - Perl Driver work and feedback on API
+Kevin Dalley - Bug Fixes
+Patrick Galbraith - work on C++ interface
 Ross McFarland - Idea for sorting servers.

diff --git a/TODO b/TODO
index d3682c98dca824f09a8e42862178be788b417bcf..9735eab9ad86813e3e591c75f87cd502a241d3da 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,3 +7,5 @@
 - Make a "make deb"... or accept patch...
 - implement more connection/hash algo
 - implement compression
+- Finish UDP protocol
+- Revisit get() code (look for performance enhancements)

diff --git a/configure.ac b/configure.ac
index d1a1da75fe7dadfe6beff89fd0a7eb9d6c368901..b70514adce3ecf21e209a970a307932b5ee84b18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ MEMCACHED_LIBRARY_NAME=libmemcached
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=16
+MEMCACHED_MINOR_VERSION=17
 MEMCACHED_MICRO_VERSION=0
 
 #API version

diff --git a/include/memcached.h b/include/memcached.h
index 0939a7ae4d5ba66203f6cb34c91cdbbc65b85c45..92000fe8ae11eb74bc12a647dc48bfce557c86bc 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -32,7 +32,7 @@ extern "C" {
 #define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
 
 /* string value */
-#define LIBMEMCACHED_VERSION_STRING "0.16"
+#define LIBMEMCACHED_VERSION_STRING "0.17"
 
 typedef enum {
   MEMCACHED_SUCCESS,

diff --git a/src/memcat.c b/src/memcat.c
index 2db0c8ee04e93d05bd8a8c4289874532f653ba54..7d2c14db13ca48b3b0d170037b520747d4bea3ab 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -37,7 +37,10 @@ int main(int argc, char *argv[])
     if ((temp= getenv("MEMCACHED_SERVERS")))
       opt_servers= strdup(temp);
     else
+    {
+      fprintf(stderr, "No Servers provided\n");
       exit(1);
+    }
   }
 
   memc= memcached_create(NULL);

diff --git a/src/memcp.c b/src/memcp.c
index 57d0a70da61282d5207b12c0e34d7f17db35c2b6..cbdbf44960006985388c8013b0844bb457cf8096 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -47,7 +47,10 @@ int main(int argc, char *argv[])
     if ((temp= getenv("MEMCACHED_SERVERS")))
       opt_servers= strdup(temp);
     else
+    {
+      fprintf(stderr, "No Servers provided\n");
       exit(1);
+    }
   }
 
   if (opt_servers)

diff --git a/src/memflush.c b/src/memflush.c
index 3c47fc3cd24e22c80479d7313167f2ce81881bd5..ed3a5f81494f65e134a27e77868fc698e67f5b64 100644 (file)
--- a/src/memflush.c
+++ b/src/memflush.c
@@ -31,7 +31,10 @@ int main(int argc, char *argv[])
     if ((temp= getenv("MEMCACHED_SERVERS")))
       opt_servers= strdup(temp);
     else
+    {
+      fprintf(stderr, "No Servers provided\n");
       exit(1);
+    }
   }
 
   memc= memcached_create(NULL);

diff --git a/src/memrm.c b/src/memrm.c
index 2a79933af89a6a83af0d88b83907c2d9574a0ea4..7b774d72d8122ae20041caf5dbe8a95b35266ba7 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -32,7 +32,10 @@ int main(int argc, char *argv[])
     if ((temp= getenv("MEMCACHED_SERVERS")))
       opt_servers= strdup(temp);
     else
+    {
+      fprintf(stderr, "No Servers provided\n");
       exit(1);
+    }
   }
 
   memc= memcached_create(NULL);

diff --git a/src/memslap.c b/src/memslap.c
index c0d20868729e1ee251967b430ce12d7006271f6b..899d8b81af45ea9852cc056985660dce388f65fe 100644 (file)
--- a/src/memslap.c
+++ b/src/memslap.c
@@ -96,7 +96,10 @@ int main(int argc, char *argv[])
     if ((temp= getenv("MEMCACHED_SERVERS")))
       opt_servers= strdup(temp);
     else
+    {
+      fprintf(stderr, "No Servers provided\n");
       exit(1);
+    }
   }
 
   servers= memcached_servers_parse(opt_servers);

diff --git a/src/memstat.c b/src/memstat.c
index 6f3c55d80fee6dffa79c6e283090b01cc5537cce..540d3f4fe27c0349d8da1aa92993e0e7360035e9 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -41,7 +41,10 @@ int main(int argc, char *argv[])
     if ((temp= getenv("MEMCACHED_SERVERS")))
       opt_servers= strdup(temp);
     else
+    {
+      fprintf(stderr, "No Servers provided\n");
       exit(1);
+    }
   }
 
   memc= memcached_create(NULL);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 04c1c8f85287694b0dbbcd815d341e805a13ec4a..f23fde0b9a054c8f44081e1a3d6ba1b80d4f7e85 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = output.res output2.res\
 LIBS = 
 
 noinst_HEADERS = test.h server.h
-noinst_PROGRAMS = testapp testplus udptest atomsmasher
+noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
 testapp_SOURCES = test.c function.c ../src/generator.c ../src/execute.c server.c
 testapp_LDADD = $(LDADDS)
@@ -30,6 +30,9 @@ udptest_LDADD = $(LDADDS)
 atomsmasher_SOURCES = test.c atomsmasher.c server.c ../src/generator.c ../src/execute.c
 atomsmasher_LDADD = $(LDADDS)
 
+startservers_SOURCES = start.c server.c
+startservers_LDADD = $(LDADDS)
+
 record:
        ./testapp > output.res
 

diff --git a/tests/server.c b/tests/server.c
index 8f4dc2986401570ca5474143aa5d0168c53685c0..ce8db70bd1029be16eb3b1f6e522fc3cb450b850 100644 (file)
--- a/tests/server.c
+++ b/tests/server.c
@@ -34,12 +34,14 @@ void server_startup(server_startup_st *construct)
       {
         char buffer[1024]; /* Nothing special for number */
         int count;
+        int status;
 
         if (construct->udp)
-          sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -U %u", x, x+ TEST_PORT_BASE);
+          sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -U %u", x, x+ TEST_PORT_BASE);
         else
-          sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -p %u", x, x+ TEST_PORT_BASE);
-        system(buffer);
+          sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -t 1 -p %u", x, x+ TEST_PORT_BASE);
+        status= system(buffer);
+        WATCHPOINT_ASSERT(status == 0);
         count= sprintf(end_ptr, "localhost:%u,", x + TEST_PORT_BASE);
         end_ptr+= count;
       }

diff --git a/tests/start.c b/tests/start.c
new file mode 100644 (file)
index 0000000..aa042f9
--- /dev/null
+++ b/tests/start.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include <string.h>
+#include "server.h"
+
+int main(void)
+{
+  server_startup_st construct;
+
+  memset(&construct, 0, sizeof(server_startup_st));
+
+  construct.count= 4;
+
+  server_startup(&construct);
+
+  return 0;
+}