Merge lp:~vbernat/libmemcached/fix-memaslap-tps into lp:libmemcached

[Vincent Bernat]

The `--tps` option is currently broken except for very large TPS. The first commit fixes that. The second commit allows the time passed sleeping to be removed from the various provided statistic timers. I still get higher response time than without `--tps` but I assume this is related to how we need to reenter the event loop once we get throttled.

=== modified file 'clients/ms_conn.c'
--- clients/ms_conn.c	2013-02-23 10:17:33 +0000
+++ clients/ms_conn.c	2014-01-11 20:02:01 +0000
@@ -2473,7 +2473,7 @@
   {
     gettimeofday(&curr_time, NULL);
     time_diff= ms_time_diff(&ms_thread->startup_time, &curr_time);
-    tps= (int64_t)(((task->get_opt + task->set_opt) / (uint64_t)time_diff) * 1000000);
+    tps= (uint64_t)(task->get_opt + task->set_opt) * 1000000 / (uint64_t)time_diff;
 
     /* current throughput is greater than expected throughput */
     if (tps > ms_thread->thread_ctx->tps_perconn)
@@ -2499,6 +2499,7 @@
       || ((c->currcmd.cmd == CMD_SET) && (item->exp_time > 0)))
   {
     gettimeofday(&c->start_time, NULL);
+    memset(&c->throttle_time, 0, sizeof(c->start_time));
     if ((c->currcmd.cmd == CMD_SET) && (item->exp_time > 0))
     {
       /* record the current time */
@@ -2509,6 +2510,22 @@
 
 
 /**
+ * used to update the throttle time of each operation
+ *
+ * @param c, pointer of the concurrency
+ */
+static void ms_update_throttle_time(ms_conn_t *c)
+{
+  if ((ms_setting.stat_freq > 0)
+      && (c->throttle_time.tv_usec == 0)
+      && (c->throttle_time.tv_sec ==0))
+  {
+    gettimeofday(&c->throttle_time, NULL);
+  }
+} /* ms_update_throttle_time */
+
+
+/**
  * run the state machine
  *
  * @param c, pointer of the concurrency
@@ -2567,6 +2584,7 @@
     case conn_write:
       if (! c->ctnwrite && ms_need_yield(c))
       {
+        ms_update_throttle_time(c);
         usleep(10);
 
         if (! ms_update_event(c, EV_WRITE | EV_PERSIST))

=== modified file 'clients/ms_conn.h'
--- clients/ms_conn.h	2011-04-28 00:28:00 +0000
+++ clients/ms_conn.h	2014-01-11 20:02:01 +0000
@@ -192,6 +192,7 @@
   /* response time statistic and time out control */
   struct timeval start_time;        /* start time of current operation(s) */
   struct timeval end_time;          /* end time of current operation(s) */
+  struct timeval throttle_time;     /* start time where we started throttling */
 
   /* Binary protocol stuff */
   protocol_binary_response_header binary_header;    /* local temporary binary header */

=== modified file 'clients/ms_task.c'
--- clients/ms_task.c	2013-10-01 23:33:25 +0000
+++ clients/ms_task.c	2014-01-11 20:02:01 +0000
@@ -972,6 +972,12 @@
 
   gettimeofday(&c->end_time, NULL);
   uint64_t time_diff= (uint64_t)ms_time_diff(&c->start_time, &c->end_time);
+  if ((c->throttle_time.tv_usec != 0)
+      || (c->throttle_time.tv_sec != 0))
+  {
+    uint64_t throttle_time = (uint64_t)ms_time_diff(&c->throttle_time, &c->end_time);
+    time_diff -= throttle_time;
+  }
 
   pthread_mutex_lock(&ms_statistic.stat_mutex);