Merge lp:~mwhudson/libmemcached/misc-memaslap-fixes into lp:libmemcached

[Michael Hudson-Doyle]

Hi,

I've been using memaslap a bit and ran into an assortment of little problems, all fixed in this branch. Please see the individual commits for details. I can split this up into more single-purpose branches if that would be preferable.

Cheers,
mwh

[Brian Aker (brianaker)]

memaslap was written by some folks who didn't maintain it... and frankly it is so ugly I tend to not to want to either.

[Michael Hudson-Doyle (mwhudson)]

Well, I can make another merge proposal that deletes it if that would be better :)

It seemed more capable and informative than memslap.

[Brian Aker (brianaker)]

BTW I am looking into why this seems to be failing in the build system.

[Brian Aker (brianaker)]

Why did you comment out -Wunsuffixed-float-constants?

[Michael Hudson-Doyle (mwhudson)]

Brian Aker <email address hidden> writes:

> Why did you comment out -Wunsuffixed-float-constants?

Because putting 'd' after all the floating point constants seemed really
tedious and the syntax is only supported by relatively new versions of
gcc (gcc.gnu.org/bugzilla/show_bug.cgi?id=39027 -- well, 4.5, I guess
that's fairly old now).

FWIW, memaslap contains the only floaing point constants in the entire
codebase, as far as I could tell.

Cheers,
mwh

=== modified file 'clients/include.am'
--- clients/include.am	2013-06-11 12:31:47 +0000
+++ clients/include.am	2013-10-02 01:01:19 +0000
@@ -94,9 +94,13 @@
 clients_memaslap_SOURCES+= clients/ms_thread.c
 
 clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc
+
+clients_memaslap_CXXFLAGS= @PTHREAD_CFLAGS@
+
 clients_memaslap_LDADD=
 clients_memaslap_LDADD+= @LIBEVENT_LIB@
 clients_memaslap_LDADD+= $(CLIENTS_LDADDS)
+clients_memaslap_LDADD+= @PTHREAD_LIBS@
 
 clients_memcapable_SOURCES=
 clients_memcapable_SOURCES+= clients/memcapable.cc

=== modified file 'clients/memaslap.c'
--- clients/memaslap.c	2013-02-23 10:17:33 +0000
+++ clients/memaslap.c	2013-10-02 01:01:19 +0000
@@ -753,12 +753,12 @@
 
   pos+= snprintf(pos,
                  sizeof(buf) - (size_t)(pos -buf),
-                 "written_bytes: %lu\n",
-                 (unsigned long) ms_stats.bytes_written);
+                 "written_bytes: %llu\n",
+                 (unsigned long long) ms_stats.bytes_written);
   pos+= snprintf(pos,
                  sizeof(buf) - (size_t)(pos -buf),
-                 "read_bytes: %lu\n",
-                 (unsigned long) ms_stats.bytes_read);
+                 "read_bytes: %llu\n",
+                 (unsigned long long) ms_stats.bytes_read);
   pos+= snprintf(pos,
                  sizeof(buf) - (size_t)(pos -buf),
                  "object_bytes: %lu\n",
@@ -799,7 +799,6 @@
                           ms_stats.bytes_written
                           + ms_stats.bytes_read) / 1024 / 1024
                  / ((double)time_diff / 1000000));
-  assert(pos <= buf);
 
   fprintf(stdout, "%s", buf);
   fflush(stdout);

=== modified file 'clients/ms_memslap.h'
--- clients/ms_memslap.h	2011-04-28 00:28:00 +0000
+++ clients/ms_memslap.h	2013-10-02 01:01:19 +0000
@@ -72,9 +72,9 @@
 typedef struct stats
 {
   volatile uint32_t active_conns;   /* active connections */
-  size_t bytes_read;              /* read bytes */
-  size_t bytes_written;           /* written bytes */
-  size_t obj_bytes;               /* object bytes */
+  uint64_t bytes_read;            /* read bytes */
+  uint64_t bytes_written;         /* written bytes */
+  uint64_t obj_bytes;             /* object bytes */
   size_t pre_cmd_get;             /* previous total get command count */
   size_t pre_cmd_set;             /* previous total set command count */
   size_t cmd_get;                 /* current total get command count */

=== modified file 'clients/ms_setting.c'
--- clients/ms_setting.c	2012-11-19 04:57:41 +0000
+++ clients/ms_setting.c	2013-10-02 01:01:19 +0000
@@ -11,7 +11,7 @@
 
 #include "mem_config.h"
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.2/memcached.h>
 
 #include <ctype.h>
 #include <inttypes.h>

=== modified file 'clients/ms_stats.c'
--- clients/ms_stats.c	2012-11-19 04:57:41 +0000
+++ clients/ms_stats.c	2013-10-02 01:01:19 +0000
@@ -186,6 +186,8 @@
     }
   }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
   for (int i= min_non_zero; i <= max_non_zero; i++)
   {
     if ((i % 4) == 0)
@@ -194,6 +196,7 @@
     }
     printf("   %6" PRIu64 , stat->dist[i]);
   }
+#pragma GCC diagnostic pop
 
   printf("\n\n");
 } /* ms_dump_stats */
@@ -271,7 +274,7 @@
     freq,
     (long long)diff_events,
     (long long)period_tps,
-    global_rate,
+    period_rate,
     (long long)(stat->get_miss - stat->pre_get_miss),
     (long long)stat->period_min_time,
     (long long)stat->period_max_time,
@@ -285,7 +288,7 @@
     run_time,
     (long long)events,
     (long long)global_tps,
-    period_rate,
+    global_rate,
     (long long)stat->get_miss,
     (long long)stat->min_time,
     (long long)stat->max_time,

=== modified file 'clients/ms_task.c'
--- clients/ms_task.c	2012-11-19 04:57:41 +0000
+++ clients/ms_task.c	2013-10-02 01:01:19 +0000
@@ -690,8 +690,8 @@
  */
 int64_t ms_time_diff(struct timeval *start_time, struct timeval *end_time)
 {
-  int64_t endtime= end_time->tv_sec * 1000000 + end_time->tv_usec;
-  int64_t starttime= start_time->tv_sec * 1000000 + start_time->tv_usec;
+  int64_t endtime= ((int64_t)end_time->tv_sec) * 1000000 + end_time->tv_usec;
+  int64_t starttime= ((int64_t)start_time->tv_sec) * 1000000 + start_time->tv_usec;
 
   assert(endtime >= starttime);
 

=== modified file 'm4/ax_harden_compiler_flags.m4'
--- m4/ax_harden_compiler_flags.m4	2013-09-16 06:38:46 +0000
+++ m4/ax_harden_compiler_flags.m4	2013-10-02 01:01:19 +0000
@@ -162,7 +162,6 @@
          _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail])
 # Anything below this comment please keep sorted.
 # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute])
-          _APPEND_COMPILE_FLAGS_ERROR([-Wunsuffixed-float-constants])
           _APPEND_COMPILE_FLAGS_ERROR([-Wjump-misses-init])
           _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes])
           _APPEND_COMPILE_FLAGS_ERROR([-Waddress])