0
@@ -1,3 +1,18 @@
0
+2006-08-21
0
+	* Nathan Neulinger <nneul@umr.edu>: fix incompatabilities with
0
+	  unix domain socket support and the UDP code and clean up stale 
0
+	  sockets
0
+
0
+2006-08-20
0
+	* Nathan Neulinger <nneul@umr.edu>: unix domain socket support
0
+
0
+2006-05-03
0
+	* Steven Grimm <sgrimm@facebook.com>:  big bunch of changes:
0
+	  big CPU reduction work, UDP-based interface, increased memory
0
+	  efficiency.  (intertwined patch, committed all together)
0
+	  <http://lists.danga.com/pipermail/memcached/2006-May/002164.html>
0
+	  or see svn commit logs
0
+
0
 2006-04-30
0
   * River Tarnell:  autoconf work for Solaris 10.  Brad:
0
   merge and verify it works on Nexenta.

0
@@ -1,3 +1,20 @@
0
+* bug as shown with netcat (w/ small 16 byte object reproduces)
0
+
0
+>>I've done the following script to check that memcached has a key in it's
0
+>>inside, and thus know that it's working correctly:
0
+>>echo -e "get is_ok\r\nquit\r\n" | netcat $host $ip
0
+>>
0
+>>and I find that sometimes it returns the VALUE in it's inside, but other
0
+>>not.
0
+
0
+* namespaces
0
+
0
+* binary get protocol
0
+
0
+* refresh/touch command.
0
+
0
+* finer granularity of time for flush_all/delete, or generation number.
0
+
0
 * slab class reassignment still buggy and can crash.  once that's
0
   stable, server should re-assign pages every 60 seconds or so
0
   to keep all classes roughly equal.  [Update: fixed now?, but 

0
@@ -1,5 +1,5 @@
0
 AC_PREREQ(2.52)
0
-AC_INIT(memcached, 1.1.13-pre2, brad@danga.com)
0
+AC_INIT(memcached, 1.2.0-rc1, brad@danga.com)
0
 AC_CANONICAL_SYSTEM
0
 AC_CONFIG_SRCDIR(memcached.c)
0
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

0
@@ -43,7 +43,10 @@ caches, so consult the README and memcached homepage for configuration
0
 suggestions.
0
 .TP
0
 .B \-p <num> 
0
-Listen on port <num>, the default is port 11211.
0
+Listen on TCP port <num>, the default is port 11211.
0
+.TP
0
+.B \-U <num> 
0
+Listen on UDP port <num>, the default is port 11211.
0
 .TP
0
 .B \-M
0
 Disable automatic removal of items from the cache when out of memory.
0
@@ -52,6 +55,20 @@ Additions will not be possible until adequate space is freed up.
0
 .B \-r
0
 Raise the core file size limit to the maximum allowable.
0
 .TP
0
+.B \-f <factor>
0
+Use <factor> as the multiplier for computing the sizes of memory chunks that
0
+items are stored in. A lower value may result in less wasted memory depending
0
+on the total amount of memory available and the distribution of item sizes.
0
+The default is 1.25.
0
+.TP
0
+.B \-s <size>
0
+Allocate a minimum of <size> bytes for the item key, value, and flags. The
0
+default is 48. If you have a lot of small keys and values, you can get a
0
+significant memory efficiency gain with a lower value. If you use a high
0
+chunk growth factor (-f option), on the other hand, you may want to increase
0
+the size to allow a bigger percentage of your items to fit in the most densely
0
+packed (smallest) chunks.
0
+.TP
0
 .B \-h
0
 Show the version of memcached and a summary of options.
0
 .TP

0
@@ -1,8 +1,9 @@
0
 Protocol
0
 --------
0
 
0
-Clients of memcached communicate with server through TCP
0
-connections. A given running memcached server listens on some
0
+Clients of memcached communicate with server through TCP connections.
0
+(A UDP interface is also available; details are below under "UDP
0
+protocol.") A given running memcached server listens on some
0
 (configurable) port; clients connect to that port, send commands to
0
 the server, read responses, and eventually close the connection.
0
 
0
@@ -388,3 +389,45 @@ quit\r\n
0
 Upon receiving this command, the server closes the
0
 connection. However, the client may also simply close the connection
0
 when it no longer needs it, without issuing this command.
0
+
0
+
0
+UDP protocol
0
+------------
0
+
0
+For very large installations where the number of clients is high enough
0
+that the number of TCP connections causes scaling difficulties, there is
0
+also a UDP-based interface. The UDP interface does not provide guaranteed
0
+delivery, so should only be used for operations that aren't required to
0
+succeed; typically it is used for "get" requests where a missing or
0
+incomplete response can simply be treated as a cache miss.
0
+
0
+Each UDP datagram contains a simple frame header, followed by data in the
0
+same format as the TCP protocol described above. In the current
0
+implementation, requests must be contained in a single UDP datagram, but
0
+responses may span several datagrams. (The only common requests that would
0
+span multiple datagrams are huge multi-key "get" requests and "set"
0
+requests, both of which are more suitable to TCP transport for reliability
0
+reasons anyway.)
0
+
0
+The frame header is 8 bytes long, as follows (all values are 16-bit integers
0
+in network byte order, high byte first):
0
+
0
+0-1 Request ID
0
+2-3 Sequence number
0
+4-5 Total number of datagrams in this message
0
+6-7 Reserved for future use; must be 0
0
+
0
+The request ID is supplied by the client. Typically it will be a
0
+monotonically increasing value starting from a random seed, but the client
0
+is free to use whatever request IDs it likes. The server's response will
0
+contain the same ID as the incoming request. The client uses the request ID
0
+to differentiate between responses to outstanding requests if there are
0
+several pending from the same server; any datagrams with an unknown request
0
+ID are probably delayed responses to an earlier request and should be
0
+discarded.
0
+
0
+The sequence number ranges from 0 to n-1, where n is the total number of
0
+datagrams in the message. The client should concatenate the payloads of the
0
+datagrams for a given response in sequence number order; the resulting byte
0
+stream will contain a complete response in the same format as the TCP
0
+protocol (including terminating \r\n sequences).

0
@@ -21,12 +21,7 @@
0
 #include "memcached.h"
0
 
0
 
0
-/* 
0
- * NOTE: we assume here for simplicity that slab ids are <=32. That's true in 
0
- * the powers-of-2 implementation, but if that changes this should be changed too
0
- */
0
-
0
-#define LARGEST_ID 32
0
+#define LARGEST_ID 255
0
 static item *heads[LARGEST_ID];
0
 static item *tails[LARGEST_ID];
0
 unsigned int sizes[LARGEST_ID];
0
@@ -41,14 +36,31 @@ void item_init(void) {
0
 }
0
 
0
 
0
-item *item_alloc(char *key, int flags, time_t exptime, int nbytes) {
0
-    int ntotal, len;
0
+/*
0
+ * Generates the variable-sized part of the header for an object.
0
+ *
0
+ * suffix  - Buffer for the "VALUE" line suffix (flags, size).
0
+ * nsuffix - The length of the suffix is stored here.
0
+ * keylen  - The length of the key plus any padding required to word-align the
0
+ *           "VALUE" suffix (which is done to speed up copying.)
0
+ *
0
+ * Returns the total size of the header.
0
+ */
0
+int item_make_header(char *key, int flags, int nbytes,
0
+                     char *suffix, int *nsuffix, int *keylen) {
0
+    *keylen = strlen(key) + 1; if(*keylen % 4) *keylen += 4 - (*keylen % 4);
0
+    *nsuffix = sprintf(suffix, " %u %u\r\n", flags, nbytes - 2);
0
+    return sizeof(item) + *keylen + *nsuffix + nbytes;
0
+}
0
+ 
0
+item *item_alloc(char *key, int flags, rel_time_t exptime, int nbytes) {
0
+    int nsuffix, ntotal, len;
0
     item *it;
0
     unsigned int id;
0
+    char suffix[40];
0
 
0
-    len = strlen(key) + 1; if(len % 4) len += 4 - (len % 4);
0
-    ntotal = sizeof(item) + len + nbytes;
0
-    
0
+    ntotal = item_make_header(key, flags, nbytes, suffix, &nsuffix, &len);
0
+ 
0
     id = slabs_clsid(ntotal);
0
     if (id == 0)
0
         return 0;
0
@@ -97,7 +109,8 @@ item *item_alloc(char *key, int flags, time_t exptime, int nbytes) {
0
     it->nbytes = nbytes;
0
     strcpy(ITEM_key(it), key);
0
     it->exptime = exptime;
0
-    it->flags = flags;
0
+    memcpy(ITEM_suffix(it), suffix, nsuffix);
0
+    it->nsuffix = nsuffix;
0
     return it;
0
 }
0
 
0
@@ -114,6 +127,18 @@ void item_free(item *it) {
0
     slabs_free(it, ntotal);
0
 }
0
 
0
+/*
0
+ * Returns true if an item will fit in the cache (its size does not exceed
0
+ * the maximum for a cache entry.)
0
+ */
0
+int item_size_ok(char *key, int flags, int nbytes) {
0
+    char prefix[40];
0
+    int keylen, nsuffix;
0
+
0
+    return slabs_clsid(item_make_header(key, flags, nbytes,
0
+                                        prefix, &nsuffix, &keylen)) != 0;
0
+}
0
+
0
 void item_link_q(item *it) { /* item is the new head */
0
     item **head, **tail;
0
     assert(it->slabs_clsid <= LARGEST_ID);
0
@@ -159,7 +184,7 @@ int item_link(item *it) {
0
     assert((it->it_flags & (ITEM_LINKED|ITEM_SLABBED)) == 0);
0
     assert(it->nbytes < 1048576);
0
     it->it_flags |= ITEM_LINKED;
0
-    it->time = time(0);
0
+    it->time = current_time;
0
     assoc_insert(ITEM_key(it), it);
0
 
0
     stats.curr_bytes += ITEM_ntotal(it);
0
@@ -195,7 +220,7 @@ void item_update(item *it) {
0
     assert((it->it_flags & ITEM_SLABBED) == 0);
0
 
0
     item_unlink_q(it);
0
-    it->time = time(0);
0
+    it->time = current_time;
0
     item_link_q(it);
0
 }
0
 
0
@@ -224,7 +249,7 @@ char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int
0
     bufcurr = 0;
0
 
0
     while (it && (!limit || shown < limit)) {
0
-        len = sprintf(temp, "ITEM %s [%u b; %lu s]\r\n", ITEM_key(it), it->nbytes - 2, it->time);
0
+        len = sprintf(temp, "ITEM %s [%u b; %lu s]\r\n", ITEM_key(it), it->nbytes - 2, it->time + stats.started);
0
         if (bufcurr + len + 6 > memlimit)  /* 6 is END\r\n\0 */
0
             break;
0
         strcpy(buffer + bufcurr, temp);
0
@@ -243,7 +268,7 @@ char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int
0
 void item_stats(char *buffer, int buflen) {
0
     int i;
0
     char *bufcurr = buffer;
0
-    time_t now = time(0);
0
+    rel_time_t now = current_time;
0
 
0
     if (buflen < 4096) {
0
         strcpy(buffer, "SERVER_ERROR out of memory");
0
@@ -252,7 +277,7 @@ void item_stats(char *buffer, int buflen) {
0
 
0
     for (i=0; i<LARGEST_ID; i++) {
0
         if (tails[i])
0
-            bufcurr += sprintf(bufcurr, "STAT items:%u:number %u\r\nSTAT items:%u:age %lu\r\n", 
0
+            bufcurr += sprintf(bufcurr, "STAT items:%u:number %u\r\nSTAT items:%u:age %u\r\n", 
0
                                i, sizes[i], i, now - tails[i]->time);
0
     }
0
     strcpy(bufcurr, "END");
0
@@ -262,7 +287,7 @@ void item_stats(char *buffer, int buflen) {
0
 /* dumps out a list of objects of each size, with granularity of 32 bytes */
0
 char* item_stats_sizes(int *bytes) {
0
     int num_buckets = 32768;   /* max 1MB object, divided into 32 bytes size buckets */
0
-    unsigned int *histogram = (int*) malloc(num_buckets * sizeof(int));
0
+    unsigned int *histogram = (unsigned int*) malloc(num_buckets * sizeof(int));
0
     char *buf = (char*) malloc(1024*1024*2*sizeof(char));
0
     int i;
0