Changeset a0b8bf

Timestamp:

03/05/08 19:16:07 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master, ketama-compat

Children:

787337

Parents:

cc8dfa

git-author:

Tomash Brechko <tomash.brechko@…> (03/05/08 19:16:07)

git-committer:

Tomash Brechko <tomash.brechko@…> (03/05/08 19:16:07)

Message:

Control latency-throughput with TCP_NODELAY.

File:

• src/client.c (modified) (8 diffs)

src/client.c

@@ -39 +39 @@
 #include <signal.h>
 #include <time.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 
 
@@ -94 +96 @@
 
 
+enum socket_mode_e { NOT_TCP = -1, TCP_LATENCY, TCP_THROUGHPUT };
+
+
 struct client;
 
@@ -101 +106 @@
   struct client *client;
   int fd;
+  enum socket_mode_e socket_mode;
   int noreply;
   int last_cmd_noreply;
@@ -1519 +1525 @@
 
 
+/* Is the following required for any platform?  */
+#if (! defined(IPPROTO_TCP) && defined(SOL_TCP))
+#define IPPROTO_TCP  SOL_TCP
+#endif
+
+
+static inline
+void
+tcp_optimize_latency(struct command_state *state)
+{
+#ifdef TCP_NODELAY
+  if (state->socket_mode == TCP_THROUGHPUT)
+    {
+      static const int enable = 1;
+      setsockopt(state->fd, IPPROTO_TCP, TCP_NODELAY,
+                 &enable, sizeof(enable));
+      state->socket_mode = TCP_LATENCY;
+    }
+#endif /* TCP_NODELAY */
+}
+
+
+static inline
+void
+tcp_optimize_throughput(struct command_state *state)
+{
+#ifdef TCP_NODELAY
+  if (state->socket_mode == TCP_LATENCY)
+    {
+      static const int disable = 0;
+      setsockopt(state->fd, IPPROTO_TCP, TCP_NODELAY,
+                 &disable, sizeof(disable));
+      state->socket_mode = TCP_THROUGHPUT;
+    }
+#endif /* TCP_NODELAY */
+}
+
+
 static
 int
@@ -1544 +1588 @@
           state->fd = client_connect_inet(s->host, s->port,
                                           1, c->connect_timeout);
+          /* This is to trigger actual reset.  */
+          state->socket_mode = TCP_THROUGHPUT;
+          tcp_optimize_latency(state);
         }
       else
         {
           state->fd = client_connect_unix(s->host, s->host_len);
+          state->socket_mode = NOT_TCP;
         }
     }
@@ -1609 +1657 @@
         {
           if (state->client->nowait || state->noreply)
-            parse_reply = NULL;
+            {
+              parse_reply = NULL;
+              tcp_optimize_throughput(state);
+            }
 
           state->last_cmd_noreply = state->noreply;
@@ -1616 +1667 @@
         {
           state->last_cmd_noreply = 0;
+          tcp_optimize_latency(state);
         }
 
@@ -2008 +2060 @@
       --state->nowait_count;
       command_state_reset(state, 0, parse_nowait_reply);
+      tcp_optimize_latency(state);
       ++state->reply_count;
     }