Changeset 775 for branches/binary/server/memcached.h

Timestamp:

04/02/08 17:41:43 (20 months ago)

Author:

dsallings

Message:

Syscall optimizations from Trond Norbye.

From Trond:
I have been using the last two days to test the modifications I have done to
the binary protocol, and I have not been able to find any new bugs. From my
testing the binary protocol now use the same amount of system calls as the
textual protocol.

I have tried to use a common state machine, and branch the execution path as
late as possible.

Files:

• branches/binary/server/memcached.h (modified) (2 diffs)

branches/binary/server/memcached.h

@@ -176 +176 @@
 #define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + 1 + (item)->nsuffix + (item)->nbytes)
 
+/**
+ * NOTE: If you modify this table you _MUST_ update the function state_text
+ */
 enum conn_states {
     conn_listening,  /** the socket which listens for connections */
+    conn_new_cmd,    /** Prepare connection for next command */
+    conn_waiting,    /** waiting for a readable socket */
     conn_read,       /** reading in a command line */
+    conn_parse_cmd,  /** try to parse a command from the input buffer */
     conn_write,      /** writing out a simple response */
     conn_nread,      /** reading in a fixed number of bytes */
@@ -184 +190 @@
     conn_closing,    /** closing this connection */
     conn_mwrite,     /** writing out many items sequentially */
-    conn_bin_init,   /** Reinitializing a binary protocol connection */
-    conn_negotiate,  /** Negotiating a protocol */
+    conn_max_state,  /** Max state value (used for assertion) */
 };