Merge Trond

diff --git a/ChangeLog b/ChangeLog
index ca56868e335072aa8ee2a43f1c5dfd00addf108f..913e9a0ad2ddfe7b3aea64f49ccfd3e924dead02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-0.43
+0.43 Wed Jul 28 16:29:47 PDT 2010
+  * Added --args to memstat so that a greater range of values can be returned.
+  * Prelimanary support for Windows.
   * memcached_stat_execute() merged. 
 
 0.42 Tue Jul  6 12:29:50 PDT 2010

diff --git a/clients/client_options.h b/clients/client_options.h
index b01117073b5faa40bfcf70721b3c3b69a0b06982..70329051038281b5fa9742b63b2d07afe8bdf955 100644 (file)
--- a/clients/client_options.h
+++ b/clients/client_options.h
@@ -38,6 +38,7 @@ typedef enum {
   OPT_UDP,
   OPT_USERNAME,
   OPT_PASSWD,
+  OPT_STAT_ARGS,
   OPT_FILE= 'f'
 } memcached_options;
 

diff --git a/clients/memstat.c b/clients/memstat.c
index 0bc365ac8010eabbe6491eb5174cad66e8d5cda3..765e7ab7e4b0047dc80ebea010d9d728d8e17107 100644 (file)
--- a/clients/memstat.c
+++ b/clients/memstat.c
@@ -40,10 +40,12 @@ static int opt_verbose= 0;
 static int opt_displayflag= 0;
 static int opt_analyze= 0;
 static char *opt_servers= NULL;
+static char *stat_args= NULL;
 static char *analyze_mode= NULL;
 
 static struct option long_options[]=
 {
+  {(OPTIONSTRING)"args", required_argument, NULL, OPT_STAT_ARGS},
   {(OPTIONSTRING)"version", no_argument, NULL, OPT_VERSION},
   {(OPTIONSTRING)"help", no_argument, NULL, OPT_HELP},
   {(OPTIONSTRING)"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
@@ -126,7 +128,7 @@ int main(int argc, char *argv[])
   }
   else
   {
-    rc= memcached_stat_execute(memc, NULL, stat_printer, NULL);
+    rc= memcached_stat_execute(memc, stat_args, stat_printer, NULL);
   }
 
   free(opt_servers);
@@ -332,6 +334,9 @@ static void options_parse(int argc, char *argv[])
     case OPT_SERVERS: /* --servers or -s */
       opt_servers= strdup(optarg);
       break;
+    case OPT_STAT_ARGS:
+      stat_args= strdup(optarg);
+      break;
     case OPT_ANALYZE: /* --analyze or -a */
       opt_analyze= OPT_ANALYZE;
       analyze_mode= (optarg) ? strdup(optarg) : NULL;

diff --git a/clients/ms_conn.c b/clients/ms_conn.c
index 005879bdaaed7a994df109a7493fe82565a3fe0c..82016e1fef60c3c557dfd45e4cb0827ebac10cc4 100644 (file)
--- a/clients/ms_conn.c
+++ b/clients/ms_conn.c
@@ -800,7 +800,7 @@ static int ms_network_connect(ms_conn_t *c,
 #ifdef AI_ADDRCONFIG
   hints.ai_flags= AI_PASSIVE | AI_ADDRCONFIG;
 #else
-+  hints.ai_flags= AI_PASSIVE;
+  hints.ai_flags= AI_PASSIVE;
 #endif /* AI_ADDRCONFIG */
   if (is_udp)
   {

diff --git a/clients/utilities.c b/clients/utilities.c
index 4d36cd20b135543aaaf854f66d62a3a30f313a1b..52f46b40562fc55b1bcc5b4b79ea1944de643cd8 100644 (file)
--- a/clients/utilities.c
+++ b/clients/utilities.c
@@ -61,6 +61,7 @@ static const char *lookup_help(memcached_options option)
   case OPT_USERNAME: return "Username to use for SASL authentication";
   case OPT_PASSWD: return "Password to use for SASL authentication";
   case OPT_FILE: return "Path to file in which to save result";
+  case OPT_STAT_ARGS: return "Argument for statistics";
   default: WATCHPOINT_ASSERT(0);
   };
 

diff --git a/configure.ac b/configure.ac
index e94862af33fe32dda13eae909cd62c94c0386a85..a2faafd6d845a3b05d822b853364566fbf75dd67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.42],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.43],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 
@@ -16,7 +16,7 @@ PANDORA_CANONICAL_TARGET
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=5:1:0
+MEMCACHED_LIBRARY_VERSION=5:2:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 398124e578e662bc72608a838150988fd189d3c0..e97ff32a3408267e0e79b666e57d9d643693373a 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -138,7 +138,8 @@ BUILT_SOURCES += ${SET_PAGES}
 
 STATS_PAGES= \
             memcached_stat.pop \
-            memcached_stat_get_keys.pop .pop\
+            memcached_stat_execute.pop\
+            memcached_stat_get_keys.pop\
             memcached_stat_get_value.pop \
             memcached_stat_servername.pop
 BUILT_SOURCES += ${STATS_PAGES}
@@ -271,6 +272,7 @@ HTML_FILES= \
            memcached_set_memory_allocators.html \
            memcached_set.html \
            memcached_set_user_data.html \
+           memcached_stat_execute.html \
            memcached_stat_get_keys.html \
            memcached_stat_get_value.html \
            memcached_stat.html \
@@ -402,6 +404,7 @@ man_MANS = \
           memcached_set_memory_allocators.3 \
           memcached_set_user_data.3 \
           memcached_stat.3 \
+          memcached_stat_execute.3 \
           memcached_stat_get_keys.3 \
           memcached_stat_get_value.3 \
           memcached_stat_servername.3 \

diff --git a/docs/memcached_stats.pod b/docs/memcached_stats.pod
index fe093d105915a57bcd09fe53bc37aa5e833fdc9e..3b198d99633e6ec0f02372062f409ffae5d98fd2 100644 (file)
--- a/docs/memcached_stats.pod
+++ b/docs/memcached_stats.pod
@@ -30,6 +30,12 @@ C Client Library for memcached (libmemcached, -lmemcached)
                              memcached_stat_st *stat, 
                              memcached_return_t *error);
 
+  memcached_return_t
+    memcached_stat_execute (memcached_st *memc,
+                            const char *args,
+                            memcached_stat_fn func,
+                            void *context);
+
 =head1 DESCRIPTION
 
 libmemcached(3) has the ability to query a memcached server (or collection
@@ -38,6 +44,12 @@ C<memcached_stat_st> structure. You are responsible for freeing this structure.
 While it is possible to access the structure directly it is not advisable.
 <memcached_stat_get_value() has been provided to query the structure.
 
+memcached_stat_execute() uses the servers found in C<memcached_stat_st> and 
+executes a "stat" command on each server. args is an optional argument that 
+can be passed in to modify the behavior of "stats". You will need to supply
+a callback function that will be supplied each pair of values returned by
+the memcached server.
+
 memcached_stat() fetches an array of C<memcached_stat_st> structures containing
 the state of all available memcached servers. The return value must be freed
 by the calling application. If called with the C<MEMCACHED_BEHAVIOR_USE_UDP>

diff --git a/docs/memstat.pod b/docs/memstat.pod
index 9341e7c8c02aaa71d7575cd260b89b5f419593d1..a1079cc02b16f13326db713133c92036f48ca684 100644 (file)
--- a/docs/memstat.pod
+++ b/docs/memstat.pod
@@ -12,7 +12,9 @@ B<memstat> dumps the state of memcached(1) servers.
 It displays all data to stdout.
 
 You can specify servers via the B<--servers> option or via the
-environment variable C<MEMCACHED_SERVERS>.
+environment variable C<MEMCACHED_SERVERS>. B<--args> can be used
+to specify the "argument" sent to the stats command (ie slab, size, items,
+etc..).
 
 For a full list of operations run the tool with the B<--help> option.
 

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index b181f63b20c6820d07f85c893663cece9bdb8d95..6b022b433faaf92bec604d72795f7992680d759c 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -83,7 +83,7 @@ you will need to install %{name}-devel.
 %exclude %{_libdir}/libmemcachedutil.la
 %exclude %{_libdir}/libmemcachedprotocol.la
 %{_libdir}/libhashkit.so.0.0.0
-%{_libdir}/libmemcached.so.5.0.1
+%{_libdir}/libmemcached.so.5.0.2
 %{_libdir}/libmemcachedutil.so.1.0.0
 %{_libdir}/libmemcachedprotocol.so.0.0.0
 %{_libdir}/libhashkit.so.0
@@ -132,6 +132,7 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached/memcached.hpp
 %{_includedir}/libmemcached/memcached_util.h
 %{_includedir}/libmemcached/parse.h
+%{_includedir}/libmemcached/platform.h
 %{_includedir}/libmemcached/protocol/cache.h
 %{_includedir}/libmemcached/protocol/callback.h
 %{_includedir}/libmemcached/protocol_handler.h
@@ -241,6 +242,7 @@ you will need to install %{name}-devel.
 %{_mandir}/man3/memcached_set_sasl_callbacks.3.gz
 %{_mandir}/man3/memcached_set_user_data.3.gz
 %{_mandir}/man3/memcached_stat.3.gz
+%{_mandir}/man3/memcached_stat_execute.3.gz
 %{_mandir}/man3/memcached_stat_get_keys.3.gz
 %{_mandir}/man3/memcached_stat_get_value.3.gz
 %{_mandir}/man3/memcached_stat_servername.3.gz

diff --git a/tests/include.am b/tests/include.am
index 7a9c206284d6824531cac8fde75c01c29cd5691e..501939df05b3506817138fcde717f77e23643543 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -92,20 +92,20 @@ tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL)
 test: check
 
 check-local: $(TEST_DOCS) test-mem test-hash memcapable
-       echo "Tests completed"
+       @echo "Tests completed"
 
 test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
-       echo "Tests completed"
+       @echo "Tests completed"
 
 memcapable: clients/memcapable
-       @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 test-memcat: clients/memcat clients/memcp
        @echo "Testing memcat"
-       @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" `pwd`/clients/memcp
        @clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch
        @clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp
@@ -117,7 +117,7 @@ test-memcat: clients/memcat clients/memcp
 
 valgrind-memcat: clients/memcat clients/memcp
        @echo "Testing memcat"
-       @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcp
        @$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch
 #      @diff clients/memcp tests/scratch
@@ -127,21 +127,21 @@ valgrind-memcat: clients/memcat clients/memcp
 
 test-memcp: clients/memcp
        @echo "Testing memcp"
-       @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 valgrind-memcp: clients/memcat clients/memcp
        @echo "Testing memcp"
-       @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 test-memrm: clients/memrm clients/memcp
        @echo "Testing memrm"
-       @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcat
        @clients/memrm --servers="localhost:12555" memcat
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -149,7 +149,7 @@ test-memrm: clients/memrm clients/memcp
 
 valgrind-memrm: clients/memcat clients/memcp
        @echo "Testing memrm"
-       @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcat
        @$(VALGRIND_COMMAND) clients/memrm --servers="localhost:12555" memcat
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -157,21 +157,21 @@ valgrind-memrm: clients/memcat clients/memcp
 
 test-memflush: clients/memflush
        @echo "Testing memflush"
-       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memflush --servers="localhost:12555"
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 valgrind-memflush: clients/memflush
        @echo "Testing memflush"
-       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555"
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 test-memdump: clients/memdump clients/memcp
        @echo "Testing memdump"
-       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcat
        @clients/memdump --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -179,7 +179,7 @@ test-memdump: clients/memdump clients/memcp
 
 valgrind-memdump: clients/memcat clients/memcp
        @echo "Testing memdump"
-       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcp --servers="localhost:12555" clients/memcat
        @$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
@@ -187,14 +187,14 @@ valgrind-memdump: clients/memcat clients/memcp
 
 test-memstat: clients/memstat
        @echo "Testing memstat"
-       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memstat --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid
 
 valgrind-memstat: clients/memstat
        @echo "Testing memstat"
-       @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555
+       @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index ad81f9d91dae9c23b0ca0e2f02fd88090679475a..06c414a8255dea8cb224f9d18d1329af4f9c4366 100644 (file)
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -2781,7 +2781,7 @@ static test_return_t user_supplied_bug16(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-#ifndef __sun
+#if !defined(__sun) && !defined(__OpenBSD__)
 /* Check the validity of chinese key*/
 static test_return_t user_supplied_bug17(memcached_st *memc)
 {
@@ -6222,7 +6222,7 @@ test_st user_tests[] ={
   {"user_supplied_bug14", 1, (test_callback_fn)user_supplied_bug14 },
   {"user_supplied_bug15", 1, (test_callback_fn)user_supplied_bug15 },
   {"user_supplied_bug16", 1, (test_callback_fn)user_supplied_bug16 },
-#ifndef __sun
+#if !defined(__sun) && !defined(__OpenBSD__)
   /*
   ** It seems to be something weird with the character sets..
   ** value_fetch is unable to parse the value line (iscntrl "fails"), so I

diff --git a/tests/server.c b/tests/server.c
index f2717795af0af04c2d5f46960a8f0f6a861e0278..70c0ae3b52e2497d06323292c5cb5547c1fb5124 100644 (file)
--- a/tests/server.c
+++ b/tests/server.c
@@ -51,6 +51,23 @@ void server_startup(server_startup_st *construct)
         char buffer[1024]; /* Nothing special for number */
         int count;
         int status;
+        in_port_t port;
+
+        {
+          char *var;
+          char variable_buffer[1024];
+
+          snprintf(variable_buffer, sizeof(variable_buffer), "LIBMEMCACHED_PORT_%u", x);
+
+          if ((var= getenv(variable_buffer)))
+          {
+            port= (in_port_t)atoi(var);
+          }
+          else
+          {
+            port= (in_port_t)(x + TEST_PORT_BASE);
+          }
+        }
 
         sprintf(buffer, "/tmp/%umemc.pid", x);
         if (access(buffer, F_OK) == 0)
@@ -73,24 +90,24 @@ void server_startup(server_startup_st *construct)
 
         if (x == 0)
         {
-          sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128",
-                 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
+          sprintf(buffer, "%s -d -u root -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128",
+                 MEMCACHED_BINARY, x, port, port);
         }
         else
         {
-          sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u",
-                 MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE);
+          sprintf(buffer, "%s -d -u root -P /tmp/%umemc.pid -t 1 -p %u -U %u",
+                 MEMCACHED_BINARY, x, port, port);
         }
-       if (libmemcached_util_ping("localhost", (in_port_t)(x + TEST_PORT_BASE), NULL))
+       if (libmemcached_util_ping("localhost", port, NULL))
        {
-         fprintf(stderr, "Server on port %u already exists\n", x + TEST_PORT_BASE);
+         fprintf(stderr, "Server on port %u already exists\n", port);
        }
        else
        {
          status= system(buffer);
          fprintf(stderr, "STARTING SERVER: %s  status:%d\n", buffer, status);
        }
-        count= sprintf(end_ptr, "localhost:%u,", x + TEST_PORT_BASE);
+        count= sprintf(end_ptr, "localhost:%u,", port);
         end_ptr+= count;
       }
       *end_ptr= 0;