[memcached] bradfitz, r329: remove all trailing whitespace,
not just...
commits at code.sixapart.com
commits at code.sixapart.com
Mon Sep 4 02:23:20 UTC 2006
remove all trailing whitespace, not just first occurrence. :)
U trunk/server/assoc.c
U trunk/server/daemon.c
U trunk/server/devtools/clean-whitespace.pl
U trunk/server/items.c
U trunk/server/memcached.c
U trunk/server/memcached.h
U trunk/server/slabs.c
Modified: trunk/server/assoc.c
===================================================================
--- trunk/server/assoc.c 2006-09-04 02:20:45 UTC (rev 328)
+++ trunk/server/assoc.c 2006-09-04 02:23:19 UTC (rev 329)
@@ -5,14 +5,13 @@
* The hash function used here is by Bob Jenkins, 1996:
* <http://burtleburtle.net/bob/hash/doobs.html>
* "By Bob Jenkins, 1996. bob_jenkins at burtleburtle.net.
- * You may use this code any way you wish, private, educational,
+ * You may use this code any way you wish, private, educational,
* or commercial. It's free."
*
* The rest of the file is licensed under the BSD license. See LICENSE.
*
* $Id$
*/
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -28,18 +27,13 @@
#include <errno.h>
#include <event.h>
#include <assert.h>
-
#include "memcached.h"
-
typedef unsigned long int ub4; /* unsigned 4-byte quantities */
typedef unsigned char ub1; /* unsigned 1-byte quantities */
-
/* hard-code one million buckets, for now (2**20 == 4MB hash) */
#define HASHPOWER 20
-
#define hashsize(n) ((ub4)1<<(n))
#define hashmask(n) (hashsize(n)-1)
-
#define mix(a,b,c) \
{ \
a -= b; a -= c; a ^= (c>>13); \
@@ -52,7 +46,6 @@
b -= c; b -= a; b ^= (a<<10); \
c -= a; c -= b; c ^= (b>>15); \
}
-
/*
--------------------------------------------------------------------
hash() -- hash a variable-length key into a 32-bit value
@@ -62,37 +55,30 @@
Returns a 32-bit value. Every bit of the key affects every bit of
the return value. Every 1-bit and 2-bit delta achieves avalanche.
About 6*len+35 instructions.
-
The best hash table sizes are powers of 2. There is no need to do
mod a prime (mod is sooo slow!). If you need less than 32 bits,
use a bitmask. For example, if you need only 10 bits, do
h = (h & hashmask(10));
In which case, the hash table should have hashsize(10) elements.
-
If you are hashing n strings (ub1 **)k, do it like this:
for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
-
By Bob Jenkins, 1996. bob_jenkins at burtleburtle.net. You may use this
code any way you wish, private, educational, or commercial. It's free.
-
See http://burtleburtle.net/bob/hash/evahash.html
Use for hash table lookup, or anything where one collision in 2^^32 is
acceptable. Do NOT use for cryptographic purposes.
--------------------------------------------------------------------
*/
-
ub4 hash( k, length, initval)
register ub1 *k; /* the key */
register ub4 length; /* the length of the key */
register ub4 initval; /* the previous hash, or an arbitrary value */
{
register ub4 a,b,c,len;
-
/* Set up the internal state */
len = length;
a = b = 0x9e3779b9; /* the golden ratio; an arbitrary value */
c = initval; /* the previous hash value */
-
/*---------------------------------------- handle most of the key */
while (len >= 12)
{
@@ -102,7 +88,6 @@
mix(a,b,c);
k += 12; len -= 12;
}
-
/*------------------------------------- handle the last 11 bytes */
c += length;
switch(len) /* all the case statements fall through */
@@ -125,9 +110,7 @@
/*-------------------------------------------- report the result */
return c;
}
-
static item** hashtable = 0;
-
void assoc_init(void) {
unsigned int hash_size = hashsize(HASHPOWER) * sizeof(void*);
hashtable = malloc(hash_size);
@@ -137,11 +120,9 @@
}
memset(hashtable, 0, hash_size);
}
-
item *assoc_find(char *key) {
ub4 hv = hash(key, strlen(key), 0) & hashmask(HASHPOWER);
item *it = hashtable[hv];
-
while (it) {
if (strcmp(key, ITEM_key(it)) == 0)
return it;
@@ -149,20 +130,16 @@
}
return 0;
}
-
/* returns the address of the item pointer before the key. if *item == 0,
the item wasn't found */
-
static item** _hashitem_before (char *key) {
ub4 hv = hash(key, strlen(key), 0) & hashmask(HASHPOWER);
item **pos = &hashtable[hv];
-
while (*pos && strcmp(key, ITEM_key(*pos))) {
pos = &(*pos)->h_next;
}
return pos;
}
-
/* Note: this isn't an assoc_update. The key must not already exist to call this */
int assoc_insert(char *key, item *it) {
ub4 hv = hash(key, strlen(key), 0) & hashmask(HASHPOWER);
@@ -170,7 +147,6 @@
hashtable[hv] = it;
return 1;
}
-
void assoc_delete(char *key) {
item **before = _hashitem_before(key);
if (*before) {
@@ -179,8 +155,7 @@
*before = nxt;
return;
}
- /* Note: we never actually get here. the callers don't delete things
+ /* Note: we never actually get here. the callers don't delete things
they can't find. */
assert(*before != 0);
-}
-
+}
\ No newline at end of file
Modified: trunk/server/daemon.c
===================================================================
--- trunk/server/daemon.c 2006-09-04 02:20:45 UTC (rev 328)
+++ trunk/server/daemon.c 2006-09-04 02:23:19 UTC (rev 329)
@@ -28,22 +28,18 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-
#if defined __SUNPRO_C || defined __DECC || defined __HP_cc
# pragma ident "@(#)$Header: /cvsroot/wikipedia/willow/src/bin/willow/daemon.c,v 1.1 2005/05/02 19:15:21 kateturner Exp $"
# pragma ident "$NetBSD: daemon.c,v 1.9 2003/08/07 16:42:46 agc Exp $"
#endif
-
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
-
int
daemon(nochdir, noclose)
int nochdir, noclose;
{
int fd;
-
switch (fork()) {
case -1:
return (-1);
@@ -52,13 +48,10 @@
default:
_exit(0);
}
-
if (setsid() == -1)
return (-1);
-
if (!nochdir)
(void)chdir("/");
-
if (!noclose && (fd = open("/dev/null", O_RDWR, 0)) != -1) {
(void)dup2(fd, STDIN_FILENO);
(void)dup2(fd, STDOUT_FILENO);
@@ -67,4 +60,4 @@
(void)close(fd);
}
return (0);
-}
+}
\ No newline at end of file
Modified: trunk/server/devtools/clean-whitespace.pl
===================================================================
--- trunk/server/devtools/clean-whitespace.pl 2006-09-04 02:20:45 UTC (rev 328)
+++ trunk/server/devtools/clean-whitespace.pl 2006-09-04 02:23:19 UTC (rev 329)
@@ -9,7 +9,7 @@
close ($fh);
my $after = $before;
$after =~ s/\t/ /g;
- $after =~ s/\s+$//m;
+ $after =~ s/\s+$//mg;
next if $after eq $before;
open(my $fh, ">$f") or die;
print $fh $after;
Modified: trunk/server/items.c
===================================================================
--- trunk/server/items.c 2006-09-04 02:20:45 UTC (rev 328)
+++ trunk/server/items.c 2006-09-04 02:23:19 UTC (rev 329)
@@ -16,15 +16,11 @@
#include <time.h>
#include <event.h>
#include <assert.h>
-
#include "memcached.h"
-
-
#define LARGEST_ID 255
static item *heads[LARGEST_ID];
static item *tails[LARGEST_ID];
unsigned int sizes[LARGEST_ID];
-
void item_init(void) {
int i;
for(i=0; i<LARGEST_ID; i++) {
@@ -33,8 +29,6 @@
sizes[i]=0;
}
}
-
-
/*
* Generates the variable-sized part of the header for an object.
*
@@ -51,40 +45,31 @@
*nsuffix = sprintf(suffix, " %u %u\r\n", flags, nbytes - 2);
return sizeof(item) + *keylen + *nsuffix + nbytes;
}
-
item *item_alloc(char *key, int flags, rel_time_t exptime, int nbytes) {
int nsuffix, ntotal, len;
item *it;
unsigned int id;
char suffix[40];
-
ntotal = item_make_header(key, flags, nbytes, suffix, &nsuffix, &len);
-
id = slabs_clsid(ntotal);
if (id == 0)
return 0;
-
it = slabs_alloc(ntotal);
if (it == 0) {
int tries = 50;
item *search;
-
/* If requested to not push old items out of cache when memory runs out,
* we're out of luck at this point...
*/
-
if (!settings.evict_to_free) return 0;
-
- /*
- * try to get one off the right LRU
+ /*
+ * try to get one off the right LRU
* don't necessariuly unlink the tail because it may be locked: refcount>0
* search up from tail an item with refcount==0 and unlink it; give up after 50
* tries
*/
-
if (id > LARGEST_ID) return 0;
if (tails[id]==0) return 0;
-
for (search = tails[id]; tries>0 && search; tries--, search=search->prev) {
if (search->refcount==0) {
item_unlink(search);
@@ -94,13 +79,9 @@
it = slabs_alloc(ntotal);
if (it==0) return 0;
}
-
assert(it->slabs_clsid == 0);
-
it->slabs_clsid = id;
-
assert(it != heads[it->slabs_clsid]);
-
it->next = it->prev = it->h_next = 0;
it->refcount = 0;
it->it_flags = 0;
@@ -112,20 +93,17 @@
it->nsuffix = nsuffix;
return it;
}
-
void item_free(item *it) {
unsigned int ntotal = ITEM_ntotal(it);
assert((it->it_flags & ITEM_LINKED) == 0);
assert(it != heads[it->slabs_clsid]);
assert(it != tails[it->slabs_clsid]);
- assert(it->refcount == 0);
-
+ assert(it->refcount == 0);
/* so slab size changer can tell later if item is already free or not */
it->slabs_clsid = 0;
it->it_flags |= ITEM_SLABBED;
slabs_free(it, ntotal);
}
-
/*
* Returns true if an item will fit in the cache (its size does not exceed
* the maximum for a cache entry.)
@@ -133,16 +111,13 @@
int item_size_ok(char *key, int flags, int nbytes) {
char prefix[40];
int keylen, nsuffix;
-
return slabs_clsid(item_make_header(key, flags, nbytes,
prefix, &nsuffix, &keylen)) != 0;
}
-
void item_link_q(item *it) { /* item is the new head */
item **head, **tail;
assert(it->slabs_clsid <= LARGEST_ID);
assert((it->it_flags & ITEM_SLABBED) == 0);
-
head = &heads[it->slabs_clsid];
tail = &tails[it->slabs_clsid];
assert(it != *head);
@@ -155,13 +130,11 @@
sizes[it->slabs_clsid]++;
return;
}
-
void item_unlink_q(item *it) {
item **head, **tail;
assert(it->slabs_clsid <= LARGEST_ID);
head = &heads[it->slabs_clsid];
tail = &tails[it->slabs_clsid];
-
if (*head == it) {
assert(it->prev == 0);
*head = it->next;
@@ -172,29 +145,23 @@
}
assert(it->next != it);
assert(it->prev != it);
-
if (it->next) it->next->prev = it->prev;
if (it->prev) it->prev->next = it->next;
sizes[it->slabs_clsid]--;
return;
}
-
int item_link(item *it) {
assert((it->it_flags & (ITEM_LINKED|ITEM_SLABBED)) == 0);
assert(it->nbytes < 1048576);
it->it_flags |= ITEM_LINKED;
it->time = current_time;
assoc_insert(ITEM_key(it), it);
-
stats.curr_bytes += ITEM_ntotal(it);
stats.curr_items += 1;
stats.total_items += 1;
-
item_link_q(it);
-
return 1;
}
-
void item_unlink(item *it) {
if (it->it_flags & ITEM_LINKED) {
it->it_flags &= ~ITEM_LINKED;
@@ -205,7 +172,6 @@
}
if (it->refcount == 0) item_free(it);
}
-
void item_remove(item *it) {
assert((it->it_flags & ITEM_SLABBED) == 0);
if (it->refcount) it->refcount--;
@@ -214,24 +180,18 @@
item_free(it);
}
}
-
void item_update(item *it) {
assert((it->it_flags & ITEM_SLABBED) == 0);
-
item_unlink_q(it);
it->time = current_time;
item_link_q(it);
}
-
int item_replace(item *it, item *new_it) {
assert((it->it_flags & ITEM_SLABBED) == 0);
-
item_unlink(it);
return item_link(new_it);
}
-
char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int *bytes) {
-
int memlimit = 2*1024*1024;
char *buffer;
int bufcurr;
@@ -239,14 +199,11 @@
int len;
int shown = 0;
char temp[512];
-
if (slabs_clsid > LARGEST_ID) return 0;
it = heads[slabs_clsid];
-
buffer = malloc(memlimit);
if (buffer == 0) return 0;
bufcurr = 0;
-
while (it && (!limit || shown < limit)) {
len = sprintf(temp, "ITEM %s [%u b; %lu s]\r\n", ITEM_key(it), it->nbytes - 2, it->time + stats.started);
if (bufcurr + len + 6 > memlimit) /* 6 is END\r\n\0 */
@@ -256,46 +213,38 @@
shown++;
it = it->next;
}
-
strcpy(buffer+bufcurr, "END\r\n");
bufcurr+=5;
-
*bytes = bufcurr;
return buffer;
}
-
void item_stats(char *buffer, int buflen) {
int i;
char *bufcurr = buffer;
rel_time_t now = current_time;
-
if (buflen < 4096) {
strcpy(buffer, "SERVER_ERROR out of memory");
return;
}
-
for (i=0; i<LARGEST_ID; i++) {
if (tails[i])
- bufcurr += sprintf(bufcurr, "STAT items:%u:number %u\r\nSTAT items:%u:age %u\r\n",
+ bufcurr += sprintf(bufcurr, "STAT items:%u:number %u\r\nSTAT items:%u:age %u\r\n",
i, sizes[i], i, now - tails[i]->time);
}
strcpy(bufcurr, "END");
return;
}
-
/* dumps out a list of objects of each size, with granularity of 32 bytes */
char* item_stats_sizes(int *bytes) {
int num_buckets = 32768; /* max 1MB object, divided into 32 bytes size buckets */
unsigned int *histogram = (unsigned int*) malloc(num_buckets * sizeof(int));
char *buf = (char*) malloc(1024*1024*2*sizeof(char));
int i;
-
if (histogram == 0 || buf == 0) {
if (histogram) free(histogram);
if (buf) free(buf);
return 0;
}
-
/* build the histogram */
memset(histogram, 0, num_buckets * sizeof(int));
for (i=0; i<LARGEST_ID; i++) {
@@ -308,7 +257,6 @@
iter = iter->next;
}
}
-
/* write the buffer */
*bytes = 0;
for (i=0; i<num_buckets; i++) {
@@ -317,7 +265,6 @@
}
}
*bytes += sprintf(&buf[*bytes], "END\r\n");
-
free(histogram);
return buf;
-}
+}
\ No newline at end of file
Modified: trunk/server/memcached.c
===================================================================
--- trunk/server/memcached.c 2006-09-04 02:20:45 UTC (rev 328)
+++ trunk/server/memcached.c 2006-09-04 02:23:19 UTC (rev 329)
@@ -47,40 +47,30 @@
#include <event.h>
#include <assert.h>
#include <limits.h>
-
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
-
#include "memcached.h"
-
struct stats stats;
struct settings settings;
-
static item **todelete = 0;
static int delcurr;
static int deltotal;
-
#define TRANSMIT_COMPLETE 0
#define TRANSMIT_INCOMPLETE 1
#define TRANSMIT_SOFT_ERROR 2
#define TRANSMIT_HARD_ERROR 3
-
int *buckets = 0; /* bucket->generation array for a managed instance */
-
#define REALTIME_MAXDELTA 60*60*24*30
rel_time_t realtime(time_t exptime) {
/* no. of seconds in 30 days - largest possible delta exptime */
-
if (exptime == 0) return 0; /* 0 means never expire */
-
if (exptime > REALTIME_MAXDELTA)
return (rel_time_t) (exptime - stats.started);
else {
return (rel_time_t) (exptime + current_time);
}
}
-
void stats_init(void) {
stats.curr_items = stats.total_items = stats.curr_conns = stats.total_conns = stats.conn_structs = 0;
stats.get_cmds = stats.set_cmds = stats.get_hits = stats.get_misses = 0;
@@ -92,7 +82,6 @@
stats.get_cmds = stats.set_cmds = stats.get_hits = stats.get_misses = 0;
stats.bytes_read = stats.bytes_written = 0;
}
-
void settings_init(void) {
settings.port = 11211;
settings.udpport = 11211;
@@ -107,7 +96,6 @@
settings.factor = 1.25;
settings.chunk_size = 48; /* space for a modest key and value */
}
-
/*
* Adds a message header to a connection.
*
@@ -116,7 +104,6 @@
int add_msghdr(conn *c)
{
struct msghdr *msg;
-
if (c->msgsize == c->msgused) {
msg = realloc(c->msglist, c->msgsize * 2 * sizeof(struct msghdr));
if (! msg)
@@ -124,7 +111,6 @@
c->msglist = msg;
c->msgsize *= 2;
}
-
msg = c->msglist + c->msgused;
msg->msg_iov = &c->iov[c->iovused];
msg->msg_iovlen = 0;
@@ -135,30 +121,24 @@
msg->msg_flags = 0;
c->msgbytes = 0;
c->msgused++;
-
if (c->udp) {
/* Leave room for the UDP header, which we'll fill in later. */
return add_iov(c, NULL, UDP_HEADER_SIZE);
}
-
return 0;
}
-
conn **freeconns;
int freetotal;
int freecurr;
-
void conn_init(void) {
freetotal = 200;
freecurr = 0;
freeconns = (conn **)malloc(sizeof (conn *)*freetotal);
return;
}
-
conn *conn_new(int sfd, int init_state, int event_flags, int read_buffer_size,
int is_udp) {
conn *c;
-
/* do we have a free conn structure from a previous close? */
if (freecurr > 0) {
c = freeconns[--freecurr];
@@ -172,20 +152,17 @@
c->iov = 0;
c->msglist = 0;
c->hdrbuf = 0;
-
c->rsize = read_buffer_size;
c->wsize = DATA_BUFFER_SIZE;
c->isize = ITEM_LIST_INITIAL;
c->iovsize = IOV_LIST_INITIAL;
c->msgsize = MSG_LIST_INITIAL;
c->hdrsize = 0;
-
c->rbuf = (char *) malloc(c->rsize);
c->wbuf = (char *) malloc(c->wsize);
c->ilist = (item **) malloc(sizeof(item *) * c->isize);
c->iov = (struct iovec *) malloc(sizeof(struct iovec) * c->iovsize);
c->msglist = (struct msghdr *) malloc(sizeof(struct msghdr) * c->msgsize);
-
if (c->rbuf == 0 || c->wbuf == 0 || c->ilist == 0 || c->iov == 0 ||
c->msglist == 0) {
if (c->rbuf != 0) free(c->rbuf);
@@ -197,13 +174,10 @@
perror("malloc()");
return 0;
}
-
c->rsize = c->wsize = DATA_BUFFER_SIZE;
c->isize = 200; /* TODO: another instance of '200'. must kill all these */
-
stats.conn_structs++;
}
-
if (settings.verbose > 1) {
if (init_state == conn_listening)
fprintf(stderr, "<%d server listening\n", sfd);
@@ -212,7 +186,6 @@
else
fprintf(stderr, "<%d new client connection\n", sfd);
}
-
c->sfd = sfd;
c->udp = is_udp;
c->state = init_state;
@@ -226,16 +199,13 @@
c->iovused = 0;
c->msgcurr = 0;
c->msgused = 0;
-
c->write_and_go = conn_read;
c->write_and_free = 0;
c->item = 0;
c->bucket = -1;
c->gen = 0;
-
event_set(&c->event, sfd, event_flags, event_handler, (void *)c);
c->ev_flags = event_flags;
-
if (event_add(&c->event, 0) == -1) {
if (freecurr < freetotal) {
freeconns[freecurr++] = c;
@@ -251,31 +221,25 @@
}
return 0;
}
-
stats.curr_conns++;
stats.total_conns++;
-
return c;
}
-
void conn_cleanup(conn *c) {
if (c->item) {
item_free(c->item);
c->item = 0;
}
-
if (c->ileft) {
for (; c->ileft > 0; c->ileft--,c->icurr++) {
item_remove(*(c->icurr));
}
}
-
if (c->write_and_free) {
free(c->write_and_free);
c->write_and_free = 0;
}
}
-
/*
* Frees a connection.
*/
@@ -296,17 +260,13 @@
free(c);
}
}
-
void conn_close(conn *c) {
/* delete the event, the socket and the conn */
event_del(&c->event);
-
if (settings.verbose > 1)
fprintf(stderr, "<%d connection closed.\n", c->sfd);
-
close(c->sfd);
conn_cleanup(c);
-
/* if the connection has big buffers, just free it */
if (c->rsize > READ_BUFFER_HIGHWAT) {
conn_free(c);
@@ -324,12 +284,9 @@
conn_free(c);
}
}
-
stats.curr_conns--;
-
return;
}
-
/*
* Reallocates memory and updates a buffer size if successful.
*/
@@ -342,7 +299,6 @@
}
return 0;
}
-
/*
* Shrinks a connection's buffers if they're too big. This prevents
* periodic large "get" requests from permanently chewing lots of server
@@ -354,24 +310,19 @@
void conn_shrink(conn *c) {
if (c->udp)
return;
-
if (c->rsize > READ_BUFFER_HIGHWAT && c->rbytes < DATA_BUFFER_SIZE) {
do_realloc((void **)&c->rbuf, DATA_BUFFER_SIZE, 1, &c->rsize);
}
-
if (c->isize > ITEM_LIST_HIGHWAT) {
do_realloc((void **)&c->ilist, ITEM_LIST_INITIAL, sizeof(c->ilist[0]), &c->isize);
}
-
if (c->msgsize > MSG_LIST_HIGHWAT) {
do_realloc((void **)&c->msglist, MSG_LIST_INITIAL, sizeof(c->msglist[0]), &c->msgsize);
}
-
if (c->iovsize > IOV_LIST_HIGHWAT) {
do_realloc((void **)&c->iov, IOV_LIST_INITIAL, sizeof(c->iov[0]), &c->iovsize);
}
}
-
/*
* Sets a connection's current state in the state machine. Any special
* processing that needs to happen on certain state transitions can
@@ -385,8 +336,6 @@
c->state = state;
}
}
-
-
/*
* Ensures that there is room for another struct iovec in a connection's
* iov list.
@@ -402,50 +351,40 @@
return -1;
c->iov = new_iov;
c->iovsize *= 2;
-
/* Point all the msghdr structures at the new list. */
for (i = 0, iovnum = 0; i < c->msgused; i++) {
c->msglist[i].msg_iov = &c->iov[iovnum];
iovnum += c->msglist[i].msg_iovlen;
}
}
-
return 0;
}
-
-
/*
* Adds data to the list of pending data that will be written out to a
* connection.
*
* Returns 0 on success, -1 on out-of-memory.
*/
-
int add_iov(conn *c, const void *buf, int len) {
struct msghdr *m;
int i;
int leftover;
int limit_to_mtu;
-
do {
m = &c->msglist[c->msgused - 1];
-
/*
* Limit UDP packets, and the first payloads of TCP replies, to
* UDP_MAX_PAYLOAD_SIZE bytes.
*/
limit_to_mtu = c->udp || (1 == c->msgused);
-
/* We may need to start a new msghdr if this one is full. */
if (m->msg_iovlen == IOV_MAX ||
limit_to_mtu && c->msgbytes >= UDP_MAX_PAYLOAD_SIZE) {
add_msghdr(c);
m = &c->msglist[c->msgused - 1];
}
-
if (ensure_iov_space(c))
return -1;
-
/* If the fragment is too big to fit in the datagram, split it up */
if (limit_to_mtu && len + c->msgbytes > UDP_MAX_PAYLOAD_SIZE) {
leftover = len + c->msgbytes - UDP_MAX_PAYLOAD_SIZE;
@@ -453,30 +392,23 @@
} else {
leftover = 0;
}
-
m = &c->msglist[c->msgused - 1];
m->msg_iov[m->msg_iovlen].iov_base = buf;
m->msg_iov[m->msg_iovlen].iov_len = len;
-
c->msgbytes += len;
c->iovused++;
m->msg_iovlen++;
-
buf = ((char *)buf) + len;
len = leftover;
} while (leftover > 0);
-
return 0;
}
-
-
/*
* Constructs a set of UDP headers and attaches them to the outgoing messages.
*/
int build_udp_headers(conn *c) {
int i;
unsigned char *hdr;
-
if (c->msgused > c->hdrsize) {
void *new_hdrbuf;
if (c->hdrbuf)
@@ -488,7 +420,6 @@
c->hdrbuf = (unsigned char *) new_hdrbuf;
c->hdrsize = c->msgused * 2;
}
-
hdr = c->hdrbuf;
for (i = 0; i < c->msgused; i++) {
c->msglist[i].msg_iov[0].iov_base = hdr;
@@ -503,107 +434,83 @@
*hdr++ = 0;
assert(hdr == c->msglist[i].iov[0].iov_base + UDP_HEADER_SIZE);
}
-
return 0;
}
-
-
void out_string(conn *c, char *str) {
int len;
-
if (settings.verbose > 1)
fprintf(stderr, ">%d %s\n", c->sfd, str);
-
len = strlen(str);
if (len + 2 > c->wsize) {
/* ought to be always enough. just fail for simplicity */
str = "SERVER_ERROR output line too long";
len = strlen(str);
}
-
strcpy(c->wbuf, str);
strcpy(c->wbuf + len, "\r\n");
c->wbytes = len + 2;
c->wcurr = c->wbuf;
-
conn_set_state(c, conn_write);
c->write_and_go = conn_read;
return;
}
-
-/*
+/*
* we get here after reading the value in set/add/replace commands. The command
* has been stored in c->item_comm, and the item is ready in c->item.
*/
-
void complete_nread(conn *c) {
item *it = c->item;
int comm = c->item_comm;
item *old_it;
rel_time_t now = current_time;
-
stats.set_cmds++;
-
while(1) {
if (strncmp(ITEM_data(it) + it->nbytes - 2, "\r\n", 2) != 0) {
out_string(c, "CLIENT_ERROR bad data chunk");
break;
}
-
old_it = assoc_find(ITEM_key(it));
-
if (old_it && settings.oldest_live &&
old_it->time <= settings.oldest_live) {
item_unlink(old_it);
old_it = 0;
}
-
if (old_it && old_it->exptime && old_it->exptime < now) {
item_unlink(old_it);
old_it = 0;
}
-
if (old_it && comm==NREAD_ADD) {
item_update(old_it);
out_string(c, "NOT_STORED");
break;
}
-
if (!old_it && comm == NREAD_REPLACE) {
out_string(c, "NOT_STORED");
break;
}
-
if (old_it && (old_it->it_flags & ITEM_DELETED) && (comm == NREAD_REPLACE || comm == NREAD_ADD)) {
out_string(c, "NOT_STORED");
break;
}
-
if (old_it) {
item_replace(old_it, it);
} else item_link(it);
-
c->item = 0;
out_string(c, "STORED");
return;
}
-
- item_free(it);
- c->item = 0;
+ item_free(it);
+ c->item = 0;
return;
}
-
void process_stat(conn *c, char *command) {
rel_time_t now = current_time;
-
if (strcmp(command, "stats") == 0) {
char temp[1024];
pid_t pid = getpid();
char *pos = temp;
struct rusage usage;
-
getrusage(RUSAGE_SELF, &usage);
-
pos += sprintf(pos, "STAT pid %u\r\n", pid);
pos += sprintf(pos, "STAT uptime %u\r\n", now);
pos += sprintf(pos, "STAT time %ld\r\n", now + stats.started);
@@ -627,20 +534,17 @@
out_string(c, temp);
return;
}
-
if (strcmp(command, "stats reset") == 0) {
stats_reset();
out_string(c, "RESET");
return;
}
-
#ifdef HAVE_MALLOC_H
#ifdef HAVE_STRUCT_MALLINFO
if (strcmp(command, "stats malloc") == 0) {
char temp[512];
struct mallinfo info;
char *pos = temp;
-
info = mallinfo();
pos += sprintf(pos, "STAT arena_size %d\r\n", info.arena);
pos += sprintf(pos, "STAT free_chunks %d\r\n", info.ordblks);
@@ -657,26 +561,22 @@
}
#endif /* HAVE_STRUCT_MALLINFO */
#endif /* HAVE_MALLOC_H */
-
if (strcmp(command, "stats maps") == 0) {
char *wbuf;
int wsize = 8192; /* should be enough */
int fd;
int res;
-
wbuf = (char *)malloc(wsize);
if (wbuf == 0) {
out_string(c, "SERVER_ERROR out of memory");
return;
}
-
fd = open("/proc/self/maps", O_RDONLY);
if (fd == -1) {
out_string(c, "SERVER_ERROR cannot open the maps file");
free(wbuf);
return;
}
-
res = read(fd, wbuf, wsize - 6); /* 6 = END\r\n\0 */
if (res == wsize - 6) {
out_string(c, "SERVER_ERROR buffer overflow");
@@ -697,7 +597,6 @@
close(fd);
return;
}
-
if (strncmp(command, "stats cachedump", 15) == 0) {
char *buf;
unsigned int bytes, id, limit = 0;
@@ -706,13 +605,11 @@
out_string(c, "CLIENT_ERROR bad command line");
return;
}
-
buf = item_cachedump(id, limit, &bytes);
if (buf == 0) {
out_string(c, "SERVER_ERROR out of memory");
return;
}
-
c->write_and_free = buf;
c->wcurr = buf;
c->wbytes = bytes;
@@ -720,7 +617,6 @@
c->write_and_go = conn_read;
return;
}
-
if (strcmp(command, "stats slabs")==0) {
int bytes = 0;
char *buf = slabs_stats(&bytes);
@@ -735,14 +631,12 @@
c->write_and_go = conn_read;
return;
}
-
if (strcmp(command, "stats items")==0) {
char buffer[4096];
item_stats(buffer, 4096);
out_string(c, buffer);
return;
}
-
if (strcmp(command, "stats sizes")==0) {
int bytes = 0;
char *buf = item_stats_sizes(&bytes);
@@ -750,7 +644,6 @@
out_string(c, "SERVER_ERROR out of memory");
return;
}
-
c->write_and_free = buf;
c->wcurr = buf;
c->wbytes = bytes;
@@ -758,23 +651,17 @@
c->write_and_go = conn_read;
return;
}
-
out_string(c, "ERROR");
}
-
void process_command(conn *c, char *command) {
-
int comm = 0;
int incr = 0;
-
- /*
+ /*
* for commands set/add/replace, we build an item and read the data
* directly into it, then continue in nread_complete().
- */
-
+ */
if (settings.verbose > 1)
fprintf(stderr, "<%d %s\n", c->sfd, command);
-
c->msgcurr = 0;
c->msgused = 0;
c->iovused = 0;
@@ -782,23 +669,19 @@
out_string(c, "SERVER_ERROR out of memory");
return;
}
-
- if ((strncmp(command, "add ", 4) == 0 && (comm = NREAD_ADD)) ||
+ if ((strncmp(command, "add ", 4) == 0 && (comm = NREAD_ADD)) ||
(strncmp(command, "set ", 4) == 0 && (comm = NREAD_SET)) ||
(strncmp(command, "replace ", 8) == 0 && (comm = NREAD_REPLACE))) {
-
char key[251];
int flags;
time_t expire;
int len, res;
item *it;
-
res = sscanf(command, "%*s %250s %u %ld %d\n", key, &flags, &expire, &len);
if (res!=4 || strlen(key)==0 ) {
out_string(c, "CLIENT_ERROR bad command line format");
return;
}
-
if (settings.managed) {
int bucket = c->bucket;
if (bucket == -1) {
@@ -811,10 +694,8 @@
return;
}
}
-
expire = realtime(expire);
it = item_alloc(key, flags, expire, len+2);
-
if (it == 0) {
if (! item_size_ok(key, flags, len + 2))
out_string(c, "SERVER_ERROR object too large for cache");
@@ -825,7 +706,6 @@
c->sbytes = len+2;
return;
}
-
c->item_comm = comm;
c->item = it;
c->ritem = ITEM_data(it);
@@ -833,7 +713,6 @@
conn_set_state(c, conn_nread);
return;
}
-
if ((strncmp(command, "incr ", 5) == 0 && (incr = 1)) ||
(strncmp(command, "decr ", 5) == 0)) {
char temp[32];
@@ -844,13 +723,11 @@
int res;
char *ptr;
rel_time_t now = current_time;
-
res = sscanf(command, "%*s %250s %u\n", key, &delta);
if (res!=2 || strlen(key)==0 ) {
out_string(c, "CLIENT_ERROR bad command line format");
return;
}
-
if (settings.managed) {
int bucket = c->bucket;
if (bucket == -1) {
@@ -863,7 +740,6 @@
return;
}
}
-
it = assoc_find(key);
if (it && (it->it_flags & ITEM_DELETED)) {
it = 0;
@@ -872,24 +748,19 @@
item_unlink(it);
it = 0;
}
-
if (!it) {
out_string(c, "NOT_FOUND");
return;
}
-
ptr = ITEM_data(it);
while (*ptr && (*ptr<'0' && *ptr>'9')) ptr++; // BUG: can't be true
-
value = atoi(ptr);
-
if (incr)
value+=delta;
else {
if (delta >= value) value = 0;
else value-=delta;
}
-
sprintf(temp, "%u", value);
res = strlen(temp);
if (res + 2 > it->nbytes) { /* need to realloc */
@@ -909,13 +780,11 @@
out_string(c, temp);
return;
}
-
if (strncmp(command, "bget ", 5) == 0) {
c->binary = 1;
goto get;
}
if (strncmp(command, "get ", 4) == 0) {
-
char *start = command + 4;
char key[251];
int next;
@@ -925,7 +794,6 @@
get:
now = current_time;
i = 0;
-
if (settings.managed) {
int bucket = c->bucket;
if (bucket == -1) {
@@ -938,7 +806,6 @@
return;
}
}
-
while(sscanf(start, " %250s%n", key, &next) >= 1) {
start+=next;
stats.get_cmds++;
@@ -955,7 +822,6 @@
item_unlink(it);
it = 0;
}
-
if (it) {
if (i >= c->isize) {
item **new_list = realloc(c->ilist, sizeof(item *)*c->isize*2);
@@ -964,7 +830,6 @@
c->ilist = new_list;
} else break;
}
-
/*
* Construct the response. Each hit adds three elements to the
* outgoing data list:
@@ -981,7 +846,6 @@
}
if (settings.verbose > 1)
fprintf(stderr, ">%d sending key %s\n", c->sfd, ITEM_key(it));
-
stats.get_hits++;
it->refcount++;
item_update(it);
@@ -989,14 +853,11 @@
i++;
} else stats.get_misses++;
}
-
c->icurr = c->ilist;
c->ileft = i;
-
if (settings.verbose > 1)
fprintf(stderr, ">%d END\n", c->sfd);
add_iov(c, "END\r\n", 5);
-
if (c->udp && build_udp_headers(c)) {
out_string(c, "SERVER_ERROR out of memory");
}
@@ -1006,13 +867,11 @@
}
return;
}
-
if (strncmp(command, "delete ", 7) == 0) {
char key[251];
item *it;
int res;
time_t exptime = 0;
-
if (settings.managed) {
int bucket = c->bucket;
if (bucket == -1) {
@@ -1025,27 +884,24 @@
return;
}
}
-
res = sscanf(command, "%*s %250s %ld", key, &exptime);
it = assoc_find(key);
if (!it) {
out_string(c, "NOT_FOUND");
return;
}
-
if (exptime == 0) {
item_unlink(it);
out_string(c, "DELETED");
return;
}
-
if (delcurr >= deltotal) {
item **new_delete = realloc(todelete, sizeof(item *) * deltotal * 2);
if (new_delete) {
todelete = new_delete;
deltotal *= 2;
- } else {
- /*
+ } else {
+ /*
* can't delete it immediately, user wants a delay,
* but we ran out of memory for the delete queue
*/
@@ -1053,7 +909,6 @@
return;
}
}
-
it->refcount++;
/* use its expiration time as its deletion time now */
it->exptime = realtime(exptime);
@@ -1062,7 +917,6 @@
out_string(c, "DELETED");
return;
}
-
if (strncmp(command, "own ", 4) == 0) {
int bucket, gen;
char *start = command+4;
@@ -1083,7 +937,6 @@
return;
}
}
-
if (strncmp(command, "disown ", 7) == 0) {
int bucket;
char *start = command+7;
@@ -1104,7 +957,6 @@
return;
}
}
-
if (strncmp(command, "bg ", 3) == 0) {
int bucket, gen;
char *start = command+3;
@@ -1127,43 +979,35 @@
return;
}
}
-
if (strncmp(command, "stats", 5) == 0) {
process_stat(c, command);
return;
}
-
if (strncmp(command, "flush_all", 9) == 0) {
time_t exptime = 0;
int res;
-
if (strcmp(command, "flush_all") == 0) {
settings.oldest_live = current_time;
out_string(c, "OK");
return;
}
-
res = sscanf(command, "%*s %ld", &exptime);
if (res != 1) {
out_string(c, "ERROR");
return;
}
-
settings.oldest_live = realtime(exptime);
out_string(c, "OK");
return;
}
-
if (strcmp(command, "version") == 0) {
out_string(c, "VERSION " VERSION);
return;
}
-
if (strcmp(command, "quit") == 0) {
conn_set_state(c, conn_closing);
return;
}
-
if (strncmp(command, "slabs reassign ", 15) == 0) {
#ifdef ALLOW_SLABS_REASSIGN
int src, dst;
@@ -1189,17 +1033,14 @@
#endif
return;
}
-
out_string(c, "ERROR");
return;
}
-
-/*
+/*
* if we have a complete line in the buffer, process it.
*/
int try_read_command(conn *c) {
char *el, *cont;
-
if (!c->rbytes)
return 0;
el = memchr(c->rcurr, '\n', c->rbytes);
@@ -1210,51 +1051,41 @@
el--;
}
*el = '\0';
-
process_command(c, c->rcurr);
-
c->rbytes -= (cont - c->rcurr);
c->rcurr = cont;
-
return 1;
}
-
/*
* read a UDP request.
* return 0 if there's nothing to read.
*/
int try_read_udp(conn *c) {
int res;
-
c->request_addr_size = sizeof(c->request_addr);
res = recvfrom(c->sfd, c->rbuf + c->rbytes, c->rsize - c->rbytes,
0, &c->request_addr, &c->request_addr_size);
if (res > 8) {
unsigned char *buf = (unsigned char *)c->rbuf + c->rbytes;
stats.bytes_read += res;
-
/* Beginning of UDP packet is the request ID; save it. */
c->request_id = buf[0] * 256 + buf[1];
-
/* If this is a multi-packet request, drop it. */
if (buf[4] != 0 || buf[5] != 1) {
out_string(c, "SERVER_ERROR multi-packet request not supported");
return 0;
}
-
/* Don't care about any of the rest of the header. */
res -= 8;
memmove(c->rbuf, c->rbuf + 8, res);
-
c->rbytes += res;
return 1;
}
return 0;
}
-
/*
* read from network as much as we can, handle buffer overflow and connection
- * close.
+ * close.
* before reading, move the remaining incomplete fragment of a command
* (if any) to the beginning of the buffer.
* return 0 if there's nothing to read on the first read.
@@ -1262,13 +1093,11 @@
int try_read_network(conn *c) {
int gotdata = 0;
int res;
-
if (c->rcurr != c->rbuf) {
if (c->rbytes != 0) /* otherwise there's nothing to copy */
memmove(c->rbuf, c->rcurr, c->rbytes);
c->rcurr = c->rbuf;
}
-
while (1) {
if (c->rbytes >= c->rsize) {
char *new_rbuf = realloc(c->rbuf, c->rsize*2);
@@ -1283,7 +1112,6 @@
c->rcurr = c->rbuf = new_rbuf;
c->rsize *= 2;
}
-
/* unix socket mode doesn't need this, so zeroed out. but why
* is this done for every command? presumably for UDP
* mode. */
@@ -1292,7 +1120,6 @@
} else {
c->request_addr_size = 0;
}
-
res = read(c->sfd, c->rbuf + c->rbytes, c->rsize - c->rbytes);
if (res > 0) {
stats.bytes_read += res;
@@ -1312,7 +1139,6 @@
}
return gotdata;
}
-
int update_event(conn *c, int new_flags) {
if (c->ev_flags == new_flags)
return 1;
@@ -1322,7 +1148,6 @@
if (event_add(&c->event, 0) == -1) return 0;
return 1;
}
-
/*
* Transmit the next chunk of data from our list of msgbuf structures.
*
@@ -1334,7 +1159,6 @@
*/
int transmit(conn *c) {
int res;
-
if (c->msgcurr < c->msgused &&
c->msglist[c->msgcurr].msg_iovlen == 0) {
/* Finished writing the current msg; advance to the next. */
@@ -1345,7 +1169,6 @@
res = sendmsg(c->sfd, m, 0);
if (res > 0) {
stats.bytes_written += res;
-
/* We've written some of the data. Remove the completed
iovec entries from the list of pending writes. */
while (m->msg_iovlen > 0 && res >= m->msg_iov->iov_len) {
@@ -1353,7 +1176,6 @@
m->msg_iovlen--;
m->msg_iov++;
}
-
/* Might have written just part of the last iovec entry;
adjust it so the next write will do the rest. */
if (res > 0) {
@@ -1375,7 +1197,6 @@
we have a real error, on which we close the connection */
if (settings.verbose > 0)
perror("Failed to write, and not due to blocking");
-
if (c->udp)
conn_set_state(c, conn_read);
else
@@ -1385,16 +1206,13 @@
return TRANSMIT_COMPLETE;
}
}
-
void drive_machine(conn *c) {
-
int exit = 0;
int sfd, flags = 1;
socklen_t addrlen;
struct sockaddr addr;
conn *newc;
int res;
-
while (!exit) {
switch(c->state) {
case conn_listening:
@@ -1422,9 +1240,7 @@
close(sfd);
break;
}
-
break;
-
case conn_read:
if (try_read_command(c)) {
continue;
@@ -1441,7 +1257,6 @@
}
exit = 1;
break;
-
case conn_nread:
/* we are reading rlbytes into ritem; */
if (c->rlbytes == 0) {
@@ -1458,7 +1273,6 @@
c->rbytes -= tocopy;
break;
}
-
/* now try reading from the socket */
res = read(c->sfd, c->ritem, c->rlbytes);
if (res > 0) {
@@ -1473,7 +1287,7 @@
}
if (res == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
if (!update_event(c, EV_READ | EV_PERSIST)) {
- if (settings.verbose > 0)
+ if (settings.verbose > 0)
fprintf(stderr, "Couldn't update event\n");
conn_set_state(c, conn_closing);
break;
@@ -1486,14 +1300,12 @@
fprintf(stderr, "Failed to read, and not due to blocking\n");
conn_set_state(c, conn_closing);
break;
-
case conn_swallow:
/* we are reading sbytes and throwing them away */
if (c->sbytes == 0) {
conn_set_state(c, conn_read);
break;
}
-
/* first check if we have leftovers in the conn_read buffer */
if (c->rbytes > 0) {
int tocopy = c->rbytes > c->sbytes ? c->sbytes : c->rbytes;
@@ -1502,7 +1314,6 @@
c->rbytes -= tocopy;
break;
}
-
/* now try reading from the socket */
res = read(c->sfd, c->rbuf, c->rsize > c->sbytes ? c->sbytes : c->rsize);
if (res > 0) {
@@ -1529,7 +1340,6 @@
fprintf(stderr, "Failed to read, and not due to blocking\n");
conn_set_state(c, conn_closing);
break;
-
case conn_write:
/*
* We want to write out a simple response. If we haven't already,
@@ -1545,9 +1355,7 @@
break;
}
}
-
/* fall through... */
-
case conn_mwrite:
switch (transmit(c)) {
case TRANSMIT_COMPLETE:
@@ -1572,17 +1380,14 @@
conn_set_state(c, conn_closing);
}
break;
-
case TRANSMIT_INCOMPLETE:
case TRANSMIT_HARD_ERROR:
break; /* Continue in state machine. */
-
case TRANSMIT_SOFT_ERROR:
exit = 1;
break;
}
break;
-
case conn_closing:
if (c->udp)
conn_cleanup(c);
@@ -1591,18 +1396,13 @@
exit = 1;
break;
}
-
}
-
return;
}
-
void event_handler(int fd, short which, void *arg) {
conn *c;
-
c = (conn *)arg;
c->which = which;
-
/* sanity */
if (fd != c->sfd) {
if (settings.verbose > 0)
@@ -1610,23 +1410,18 @@
conn_close(c);
return;
}
-
/* do as much I/O as possible until we block */
drive_machine(c);
-
/* wait for next event */
return;
}
-
int new_socket(int is_udp) {
int sfd;
int flags;
-
if ((sfd = socket(AF_INET, is_udp ? SOCK_DGRAM : SOCK_STREAM, 0)) == -1) {
perror("socket()");
return -1;
}
-
if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 ||
fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) {
perror("setting O_NONBLOCK");
@@ -1635,8 +1430,6 @@
}
return sfd;
}
-
-
/*
* Sets a socket's send buffer size to the maximum allowed by the system.
*/
@@ -1645,18 +1438,15 @@
int last_good;
int min, max, avg;
int old_size;
-
/* Start with the default size. */
if (getsockopt(sfd, SOL_SOCKET, SO_SNDBUF, &old_size, &intsize)) {
if (settings.verbose > 0)
perror("getsockopt(SO_SNDBUF)");
return;
}
-
/* Binary-search for the real maximum. */
min = old_size;
max = MAX_SENDBUF_SIZE;
-
while (min <= max) {
avg = ((unsigned int) min + max) / 2;
if (setsockopt(sfd, SOL_SOCKET, SO_SNDBUF, &avg, intsize) == 0) {
@@ -1666,22 +1456,17 @@
max = avg - 1;
}
}
-
if (settings.verbose > 1)
fprintf(stderr, "<%d send buffer was %d, now %d\n", sfd, old_size, last_good);
}
-
-
int server_socket(int port, int is_udp) {
int sfd;
struct linger ling = {0, 0};
struct sockaddr_in addr;
int flags =1;
-
if ((sfd = new_socket(is_udp)) == -1) {
return -1;
}
-
setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
if (is_udp) {
maximize_sndbuf(sfd);
@@ -1690,13 +1475,11 @@
setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling));
setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags));
}
-
/*
* the memset call clears nonstandard fields in some impementations
* that otherwise mess things up.
*/
memset(&addr, 0, sizeof(addr));
-
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr = settings.interface;
@@ -1712,16 +1495,13 @@
}
return sfd;
}
-
int new_socket_unix(void) {
int sfd;
int flags;
-
if ((sfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
perror("socket()");
return -1;
}
-
if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 ||
fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) {
perror("setting O_NONBLOCK");
@@ -1730,40 +1510,33 @@
}
return sfd;
}
-
int server_socket_unix(char *path) {
int sfd;
struct linger ling = {0, 0};
struct sockaddr_un addr;
struct stat tstat;
int flags =1;
-
if (!path) {
return -1;
}
-
if ((sfd = new_socket_unix()) == -1) {
return -1;
}
-
- /*
+ /*
* Clean up a previous socket file if we left it around
*/
if (!lstat(path, &tstat)) {
if (S_ISSOCK(tstat.st_mode))
unlink(path);
}
-
setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags));
setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling));
-
/*
* the memset call clears nonstandard fields in some impementations
* that otherwise mess things up.
*/
memset(&addr, 0, sizeof(addr));
-
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, path);
if (bind(sfd, (struct sockaddr *) &addr, sizeof(addr)) == -1) {
@@ -1778,8 +1551,6 @@
}
return sfd;
}
-
-
/* invoke right before gdb is called, on assert */
void pre_gdb () {
int i = 0;
@@ -1788,7 +1559,6 @@
for (i=3; i<=500; i++) close(i); /* so lame */
kill(getpid(), SIGABRT);
}
-
/*
* We keep the current time of day in a global variable that's updated by a
* timer event. This saves us a bunch of time() system calls (we really only
@@ -1799,32 +1569,25 @@
*/
volatile rel_time_t current_time;
struct event clockevent;
-
void clock_handler(int fd, short which, void *arg) {
struct timeval t;
static int initialized = 0;
-
if (initialized) {
/* only delete the event if it's actually there. */
evtimer_del(&clockevent);
} else {
initialized = 1;
}
-
evtimer_set(&clockevent, clock_handler, 0);
t.tv_sec = 1;
t.tv_usec = 0;
evtimer_add(&clockevent, &t);
-
current_time = (rel_time_t) (time(0) - stats.started);
}
-
struct event deleteevent;
-
void delete_handler(int fd, short which, void *arg) {
struct timeval t;
static int initialized = 0;
-
if (initialized) {
/* some versions of libevent don't like deleting events that don't exist,
so only delete once we know this event has been added. */
@@ -1832,11 +1595,9 @@
} else {
initialized = 1;
}
-
evtimer_set(&deleteevent, delete_handler, 0);
t.tv_sec = 5; t.tv_usec=0;
evtimer_add(&deleteevent, &t);
-
{
int i, j=0;
rel_time_t now = current_time;
@@ -1854,7 +1615,6 @@
delcurr = j;
}
}
-
void usage(void) {
printf(PACKAGE " " VERSION "\n");
printf("-p <num> port number to listen on\n");
@@ -1877,7 +1637,6 @@
printf("-n <bytes> minimum space allocated for key+value+flags, default 48\n");
return;
}
-
void usage_license(void) {
printf(PACKAGE " " VERSION "\n\n");
printf(
@@ -1945,45 +1704,35 @@
"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n"
"THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
);
-
return;
}
-
void save_pid(pid_t pid,char *pid_file) {
FILE *fp;
if (!pid_file)
return;
-
if (!(fp = fopen(pid_file,"w"))) {
fprintf(stderr,"Could not open the pid file %s for writing\n",pid_file);
return;
}
-
fprintf(fp,"%ld\n",(long) pid);
if (fclose(fp) == -1) {
fprintf(stderr,"Could not close the pid file %s.\n",pid_file);
return;
}
}
-
void remove_pidfile(char *pid_file) {
if (!pid_file)
return;
-
if (unlink(pid_file)) {
fprintf(stderr,"Could not remove the pid file %s.\n",pid_file);
}
-
}
-
int l_socket=0;
int u_socket=-1;
-
void sig_handler(int sig) {
printf("SIGINT handled.\n");
exit(0);
}
-
int main (int argc, char **argv) {
int c;
conn *l_conn;
@@ -1997,16 +1746,12 @@
struct sigaction sa;
struct rlimit rlim;
char *pid_file = NULL;
-
/* handle SIGINT */
signal(SIGINT, sig_handler);
-
/* init settings */
settings_init();
-
/* set stderr non-buffering (for running under, say, daemontools) */
setbuf(stderr, NULL);
-
/* process arguments */
while ((c = getopt(argc, argv, "bp:s:U:m:Mc:khirvdl:u:P:f:s:")) != -1) {
switch (c) {
@@ -2082,45 +1827,41 @@
return 1;
}
}
-
if (maxcore) {
struct rlimit rlim_new;
- /*
+ /*
* First try raising to infinity; if that fails, try bringing
- * the soft limit to the hard.
+ * the soft limit to the hard.
*/
if (getrlimit(RLIMIT_CORE, &rlim)==0) {
rlim_new.rlim_cur = rlim_new.rlim_max = RLIM_INFINITY;
if (setrlimit(RLIMIT_CORE, &rlim_new)!=0) {
/* failed. try raising just to the old max */
- rlim_new.rlim_cur = rlim_new.rlim_max =
+ rlim_new.rlim_cur = rlim_new.rlim_max =
rlim.rlim_max;
(void) setrlimit(RLIMIT_CORE, &rlim_new);
}
}
- /*
- * getrlimit again to see what we ended up with. Only fail if
- * the soft limit ends up 0, because then no core files will be
+ /*
+ * getrlimit again to see what we ended up with. Only fail if
+ * the soft limit ends up 0, because then no core files will be
* created at all.
*/
-
if ((getrlimit(RLIMIT_CORE, &rlim)!=0) || rlim.rlim_cur==0) {
fprintf(stderr, "failed to ensure corefile creation\n");
exit(1);
}
}
-
- /*
+ /*
* If needed, increase rlimits to allow as many connections
* as needed.
*/
-
if (getrlimit(RLIMIT_NOFILE, &rlim) != 0) {
fprintf(stderr, "failed to getrlimit number of files\n");
exit(1);
} else {
int maxfiles = settings.maxconns;
- if (rlim.rlim_cur < maxfiles)
+ if (rlim.rlim_cur < maxfiles)
rlim.rlim_cur = maxfiles + 3;
if (rlim.rlim_max < rlim.rlim_cur)
rlim.rlim_max = rlim.rlim_cur;
@@ -2129,14 +1870,12 @@
exit(1);
}
}
-
- /*
+ /*
* initialization order: first create the listening sockets
* (may need root on low ports), then drop root if needed,
* then daemonise if needed, then init libevent (in some cases
* descriptors created by libevent wouldn't survive forking).
*/
-
/* create the listening socket and bind it */
if (!settings.socketpath) {
l_socket = server_socket(settings.port, 0);
@@ -2145,7 +1884,6 @@
exit(1);
}
}
-
if (settings.udpport > 0 && ! settings.socketpath) {
/* create the UDP listening socket and bind it */
u_socket = server_socket(settings.udpport, 1);
@@ -2154,7 +1892,6 @@
exit(1);
}
}
-
/* lose root privileges if we have them */
if (getuid()== 0 || geteuid()==0) {
if (username==0 || *username=='\0') {
@@ -2170,7 +1907,6 @@
return 1;
}
}
-
/* create unix mode sockets after dropping privileges */
if (settings.socketpath) {
l_socket = server_socket_unix(settings.socketpath);
@@ -2179,7 +1915,6 @@
exit(1);
}
}
-
/* daemonize if requested */
/* if we want to ensure our ability to dump core, don't chdir to / */
if (daemonize) {
@@ -2190,8 +1925,6 @@
return 1;
}
}
-
-
/* initialize other stuff */
item_init();
event_init();
@@ -2199,7 +1932,6 @@
assoc_init();
conn_init();
slabs_init(settings.maxbytes, settings.factor);
-
/* managed instance? alloc and zero a bucket array */
if (settings.managed) {
buckets = malloc(sizeof(int)*MAX_BUCKETS);
@@ -2209,7 +1941,6 @@
}
memset(buckets, 0, sizeof(int)*MAX_BUCKETS);
}
-
/* lock paged memory if needed */
if (lock_memory) {
#ifdef HAVE_MLOCKALL
@@ -2218,7 +1949,6 @@
fprintf(stderr, "warning: mlockall() not supported on this platform. proceeding without.\n");
#endif
}
-
/*
* ignore SIGPIPE signals; we can use errno==EPIPE if we
* need that information
@@ -2228,40 +1958,32 @@
if (sigemptyset(&sa.sa_mask) == -1 ||
sigaction(SIGPIPE, &sa, 0) == -1) {
perror("failed to ignore SIGPIPE; sigaction");
- exit(1);
+ exit(1);
}
-
/* create the initial listening connection */
if (!(l_conn = conn_new(l_socket, conn_listening, EV_READ | EV_PERSIST, 1, 0))) {
fprintf(stderr, "failed to create listening connection");
exit(1);
}
-
/* create the initial listening udp connection */
if (u_socket > -1 &&
!(u_conn = conn_new(u_socket, conn_read, EV_READ | EV_PERSIST, UDP_READ_BUFFER_SIZE, 1))) {
fprintf(stderr, "failed to create udp connection");
exit(1);
}
-
/* initialise clock event */
clock_handler(0,0,0);
-
/* initialise deletion array and timer event */
deltotal = 200; delcurr = 0;
todelete = malloc(sizeof(item *)*deltotal);
delete_handler(0,0,0); /* sets up the event */
-
/* save the PID in if we're a daemon */
if (daemonize)
save_pid(getpid(),pid_file);
-
/* enter the loop */
event_loop(0);
-
/* remove the PID file if we're a daemon */
if (daemonize)
remove_pidfile(pid_file);
-
return 0;
-}
+}
\ No newline at end of file
Modified: trunk/server/memcached.h
===================================================================
--- trunk/server/memcached.h 2006-09-04 02:20:45 UTC (rev 328)
+++ trunk/server/memcached.h 2006-09-04 02:23:19 UTC (rev 329)
@@ -5,25 +5,19 @@
#define UDP_MAX_PAYLOAD_SIZE 1400
#define UDP_HEADER_SIZE 8
#define MAX_SENDBUF_SIZE (256 * 1024 * 1024)
-
/* Initial size of list of items being returned by "get". */
#define ITEM_LIST_INITIAL 200
-
/* Initial size of the sendmsg() scatter/gather array. */
#define IOV_LIST_INITIAL 400
-
/* Initial number of sendmsg() argument structures to allocate. */
#define MSG_LIST_INITIAL 10
-
/* High water marks for buffer shrinking */
#define READ_BUFFER_HIGHWAT 8192
#define ITEM_LIST_HIGHWAT 400
#define IOV_LIST_HIGHWAT 600
#define MSG_LIST_HIGHWAT 100
-
/* Time relative to server start. Smaller than time_t on 64-bit systems. */
typedef unsigned int rel_time_t;
-
struct stats {
unsigned int curr_items;
unsigned int total_items;
@@ -39,7 +33,6 @@
unsigned long long bytes_read;
unsigned long long bytes_written;
};
-
struct settings {
size_t maxbytes;
int maxconns;
@@ -54,16 +47,12 @@
double factor; /* chunk size growth factor */
int chunk_size;
};
-
extern struct stats stats;
extern struct settings settings;
-
#define ITEM_LINKED 1
#define ITEM_DELETED 2
-
/* temp */
#define ITEM_SLABBED 4
-
typedef struct _stritem {
struct _stritem *next;
struct _stritem *prev;
@@ -71,7 +60,7 @@
rel_time_t time; /* least recent access */
rel_time_t exptime; /* expire time */
int nbytes; /* size of data */
- unsigned short refcount;
+ unsigned short refcount;
unsigned char nsuffix; /* length of flags-and-length string */
unsigned char it_flags; /* ITEM_* above */
unsigned char slabs_clsid;/* which slab class we're in */
@@ -81,14 +70,11 @@
/* then " flags length\r\n" (no terminating null) */
/* then data with terminating \r\n (no terminating null; it's binary!) */
} item;
-
#define ITEM_key(item) ((char*)&((item)->end[0]))
-
/* warning: don't use these macros with a function, as it evals its arg twice */
#define ITEM_suffix(item) ((char*) &((item)->end[0]) + (item)->nkey)
#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey + (item)->nsuffix)
#define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + (item)->nsuffix + (item)->nbytes)
-
enum conn_states {
conn_listening, /* the socket which listens for connections */
conn_read, /* reading in a command line */
@@ -98,63 +84,50 @@
conn_closing, /* closing this connection */
conn_mwrite /* writing out many items sequentially */
};
-
#define NREAD_ADD 1
#define NREAD_SET 2
#define NREAD_REPLACE 3
-
typedef struct {
int sfd;
int state;
struct event event;
short ev_flags;
short which; /* which events were just triggered */
-
char *rbuf; /* buffer to read commands into */
char *rcurr; /* but if we parsed some already, this is where we stopped */
int rsize; /* total allocated size of rbuf */
int rbytes; /* how much data, starting from rcur, do we have unparsed */
-
char *wbuf;
char *wcurr;
int wsize;
- int wbytes;
+ int wbytes;
int write_and_go; /* which state to go into after finishing current write */
void *write_and_free; /* free this memory after finishing writing */
-
char *ritem; /* when we read in an item's value, it goes here */
int rlbytes;
-
/* data for the nread state */
-
- /*
+ /*
* item is used to hold an item structure created after reading the command
- * line of set/add/replace commands, but before we finished reading the actual
+ * line of set/add/replace commands, but before we finished reading the actual
* data. The data is read into ITEM_data(item) to avoid extra copying.
*/
-
void *item; /* for commands set/add/replace */
int item_comm; /* which one is it: set/add/replace */
-
/* data for the swallow state */
int sbytes; /* how many bytes to swallow */
-
/* data for the mwrite state */
struct iovec *iov;
int iovsize; /* number of elements allocated in iov[] */
int iovused; /* number of elements used in iov[] */
-
struct msghdr *msglist;
int msgsize; /* number of elements allocated in msglist[] */
int msgused; /* number of elements used in msglist[] */
int msgcurr; /* element in msglist[] being transmitted now */
int msgbytes; /* number of bytes in current msg */
-
item **ilist; /* list of items to write out */
int isize;
item **icurr;
int ileft;
-
/* data for UDP clients */
int udp; /* 1 if this is a UDP "connection" */
int request_id; /* Incoming UDP request ID, if this is a UDP "connection" */
@@ -162,48 +135,36 @@
socklen_t request_addr_size;
unsigned char *hdrbuf; /* udp packet headers */
int hdrsize; /* number of headers' worth of space is allocated */
-
int binary; /* are we in binary mode */
int bucket; /* bucket number for the next command, if running as
a managed instance. -1 (_not_ 0) means invalid. */
int gen; /* generation requested for the bucket */
} conn;
-
/* number of virtual buckets for a managed instance */
#define MAX_BUCKETS 32768
-
/* listening socket */
extern int l_socket;
-
/* udp socket */
extern int u_socket;
-
/* current time of day (updated periodically) */
extern volatile rel_time_t current_time;
-
/* temporary hack */
/* #define assert(x) if(!(x)) { printf("assert failure: %s\n", #x); pre_gdb(); }
void pre_gdb (); */
-
/*
* Functions
*/
-
-/*
+/*
* given time value that's either unix time or delta from current unix time, return
- * unix time. Use the fact that delta can't exceed one month (and real time value can't
+ * unix time. Use the fact that delta can't exceed one month (and real time value can't
* be that low).
*/
-
rel_time_t realtime(time_t exptime);
-
/* slabs memory allocation */
-
/* Init the subsystem. 1st argument is the limit on no. of bytes to allocate,
0 if no limit. 2nd argument is the growth factor; each slab will use a chunk
size equal to the previous slab's chunk size times this factor. */
void slabs_init(size_t limit, double factor);
-
/* Preallocate as many slab pages as possible (called from slabs_init)
on start-up, so users don't get confused out-of-memory errors when
they do have free (in-slab) space, but no space to make new slabs.
@@ -211,26 +172,20 @@
slab types can be made. if max memory is less than 18 MB, only the
smaller ones will be made. */
void slabs_preallocate (unsigned int maxslabs);
-
/* Given object size, return id to use when allocating/freeing memory for object */
/* 0 means error: can't store such a large object */
unsigned int slabs_clsid(size_t size);
-
/* Allocate object of given length. 0 on error */
void *slabs_alloc(size_t size);
-
/* Free previously allocated object */
void slabs_free(void *ptr, size_t size);
-
/* Fill buffer with stats */
char* slabs_stats(int *buflen);
-
/* Request some slab be moved between classes
1 = success
0 = fail
-1 = tried. busy. send again shortly. */
int slabs_reassign(unsigned char srcid, unsigned char dstid);
-
/* event handling, network IO */
void event_handler(int fd, short which, void *arg);
conn *conn_new(int sfd, int init_state, int event_flags, int read_buffer_size, int is_udp);
@@ -249,32 +204,25 @@
int ensure_iov_space(conn *c);
int add_iov(conn *c, const void *buf, int len);
int add_msghdr(conn *c);
-
/* stats */
void stats_reset(void);
void stats_init(void);
-
/* defaults */
void settings_init(void);
-
/* associative array */
void assoc_init(void);
item *assoc_find(char *key);
int assoc_insert(char *key, item *item);
void assoc_delete(char *key);
-
-
void item_init(void);
item *item_alloc(char *key, int flags, rel_time_t exptime, int nbytes);
void item_free(item *it);
int item_size_ok(char *key, int flags, int nbytes);
-
int item_link(item *it); /* may fail if transgresses limits */
void item_unlink(item *it);
void item_remove(item *it);
-
void item_update(item *it); /* update LRU time to current and reposition */
int item_replace(item *it, item *new_it);
char *item_cachedump(unsigned int slabs_clsid, unsigned int limit, unsigned int *bytes);
char *item_stats_sizes(int *bytes);
-void item_stats(char *buffer, int buflen);
+void item_stats(char *buffer, int buflen);
\ No newline at end of file
Modified: trunk/server/slabs.c
===================================================================
--- trunk/server/slabs.c 2006-09-04 02:20:45 UTC (rev 328)
+++ trunk/server/slabs.c 2006-09-04 02:23:19 UTC (rev 329)
@@ -24,47 +24,35 @@
#include <errno.h>
#include <event.h>
#include <assert.h>
-
#include "memcached.h"
-
#define POWER_SMALLEST 1
#define POWER_LARGEST 200
#define POWER_BLOCK 1048576
#define CHUNK_ALIGN_BYTES (sizeof(void *))
-
/* powers-of-N allocation structures */
-
typedef struct {
unsigned int size; /* sizes of items */
unsigned int perslab; /* how many items per slab */
-
void **slots; /* list of item ptrs */
unsigned int sl_total; /* size of previous array */
unsigned int sl_curr; /* first free slot */
-
void *end_page_ptr; /* pointer to next free item at end of page, or 0 */
unsigned int end_page_free; /* number of items remaining at end of last alloced page */
-
unsigned int slabs; /* how many slabs were allocated for this class */
-
void **slab_list; /* array of slab pointers */
unsigned int list_size; /* size of prev array */
-
unsigned int killing; /* index+1 of dying slab, or zero if none */
} slabclass_t;
-
static slabclass_t slabclass[POWER_LARGEST+1];
static size_t mem_limit = 0;
static size_t mem_malloced = 0;
static int power_largest;
-
/*
* Figures out which slab class (chunk size) is required to store an item of
* a given size.
*/
unsigned int slabs_clsid(size_t size) {
int res = POWER_SMALLEST;
-
if(size==0)
return 0;
while (size > slabclass[res].size)
@@ -72,7 +60,6 @@
return 0;
return res;
}
-
/*
* Determines the chunk sizes and initializes the slab class descriptors
* accordingly.
@@ -80,19 +67,15 @@
void slabs_init(size_t limit, double factor) {
int i = POWER_SMALLEST - 1;
unsigned int size = sizeof(item) + settings.chunk_size;
-
/* Factor of 2.0 means use the default memcached behavior */
if (factor == 2.0 && size < 128)
size = 128;
-
mem_limit = limit;
memset(slabclass, 0, sizeof(slabclass));
-
while (++i < POWER_LARGEST && size <= POWER_BLOCK / 2) {
/* Make sure items are always n-byte aligned */
if (size % CHUNK_ALIGN_BYTES)
size += CHUNK_ALIGN_BYTES - (size % CHUNK_ALIGN_BYTES);
-
slabclass[i].size = size;
slabclass[i].perslab = POWER_BLOCK / slabclass[i].size;
size *= factor;
@@ -101,35 +84,28 @@
i, slabclass[i].size, slabclass[i].perslab);
}
}
-
power_largest = i;
slabclass[power_largest].size = POWER_BLOCK;
slabclass[power_largest].perslab = 1;
-
#ifndef DONT_PREALLOC_SLABS
slabs_preallocate(limit / POWER_BLOCK);
#endif
}
-
void slabs_preallocate (unsigned int maxslabs) {
int i;
unsigned int prealloc = 0;
-
/* pre-allocate a 1MB slab in every size class so people don't get
confused by non-intuitive "SERVER_ERROR out of memory"
messages. this is the most common question on the mailing
list. if you really don't want this, you can rebuild without
these three lines. */
-
for(i=POWER_SMALLEST; i<=POWER_LARGEST; i++) {
if (++prealloc > maxslabs)
return;
slabs_newslab(i);
}
-
}
-
-static int grow_slab_list (unsigned int id) {
+static int grow_slab_list (unsigned int id) {
slabclass_t *p = &slabclass[id];
if (p->slabs == p->list_size) {
size_t new_size = p->list_size ? p->list_size * 2 : 16;
@@ -140,7 +116,6 @@
}
return 1;
}
-
int slabs_newslab(unsigned int id) {
slabclass_t *p = &slabclass[id];
#ifdef ALLOW_SLABS_REASSIGN
@@ -149,50 +124,38 @@
int len = p->size * p->perslab;
#endif
char *ptr;
-
if (mem_limit && mem_malloced + len > mem_limit && p->slabs > 0)
return 0;
-
if (! grow_slab_list(id)) return 0;
-
ptr = malloc(len);
if (ptr == 0) return 0;
-
memset(ptr, 0, len);
p->end_page_ptr = ptr;
p->end_page_free = p->perslab;
-
p->slab_list[p->slabs++] = ptr;
mem_malloced += len;
return 1;
}
-
void *slabs_alloc(size_t size) {
slabclass_t *p;
-
unsigned char id = slabs_clsid(size);
if (id < POWER_SMALLEST || id > power_largest)
return 0;
-
p = &slabclass[id];
assert(p->sl_curr == 0 || ((item*)p->slots[p->sl_curr-1])->slabs_clsid == 0);
-
#ifdef USE_SYSTEM_MALLOC
if (mem_limit && mem_malloced + size > mem_limit)
return 0;
mem_malloced += size;
return malloc(size);
#endif
-
/* fail unless we have space at the end of a recently allocated page,
we have something on our freelist, or we could allocate a new page */
if (! (p->end_page_ptr || p->sl_curr || slabs_newslab(id)))
return 0;
-
/* return off our freelist, if we have one */
if (p->sl_curr)
return p->slots[--p->sl_curr];
-
/* if we recently allocated a whole page, return from that */
if (p->end_page_ptr) {
void *ptr = p->end_page_ptr;
@@ -203,27 +166,21 @@
}
return ptr;
}
-
return 0; /* shouldn't ever get here */
}
-
void slabs_free(void *ptr, size_t size) {
unsigned char id = slabs_clsid(size);
slabclass_t *p;
-
assert(((item *)ptr)->slabs_clsid==0);
assert(id >= POWER_SMALLEST && id <= power_largest);
if (id < POWER_SMALLEST || id > power_largest)
return;
-
p = &slabclass[id];
-
#ifdef USE_SYSTEM_MALLOC
mem_malloced -= size;
free(ptr);
return;
#endif
-
if (p->sl_curr == p->sl_total) { /* need more space on the free list */
int new_size = p->sl_total ? p->sl_total*2 : 16; /* 16 is arbitrary */
void **new_slots = realloc(p->slots, new_size*sizeof(void *));
@@ -235,24 +192,19 @@
p->slots[p->sl_curr++] = ptr;
return;
}
-
char* slabs_stats(int *buflen) {
int i, total;
char *buf = (char*) malloc(power_largest * 200 + 100);
char *bufcurr = buf;
-
*buflen = 0;
if (!buf) return 0;
-
total = 0;
for(i = POWER_SMALLEST; i <= power_largest; i++) {
slabclass_t *p = &slabclass[i];
if (p->slabs) {
unsigned int perslab, slabs;
-
slabs = p->slabs;
perslab = p->perslab;
-
bufcurr += sprintf(bufcurr, "STAT %d:chunk_size %u\r\n", i, p->size);
bufcurr += sprintf(bufcurr, "STAT %d:chunks_per_page %u\r\n", i, perslab);
bufcurr += sprintf(bufcurr, "STAT %d:total_pages %u\r\n", i, slabs);
@@ -268,7 +220,6 @@
*buflen = bufcurr - buf;
return buf;
}
-
#ifdef ALLOW_SLABS_REASSIGN
/* Blows away all the items in a slab class and moves its slabs to another
class. This is only used by the "slabs reassign" command, for manual tweaking
@@ -283,27 +234,20 @@
slabclass_t *p, *dp;
void *iter;
int was_busy = 0;
-
if (srcid < POWER_SMALLEST || srcid > power_largest ||
dstid < POWER_SMALLEST || dstid > power_largest)
return 0;
-
p = &slabclass[srcid];
dp = &slabclass[dstid];
-
/* fail if src still populating, or no slab to give up in src */
if (p->end_page_ptr || ! p->slabs)
return 0;
-
/* fail if dst is still growing or we can't make room to hold its new one */
if (dp->end_page_ptr || ! grow_slab_list(dstid))
return 0;
-
if (p->killing == 0) p->killing = 1;
-
slab = p->slab_list[p->killing-1];
slab_end = slab + POWER_BLOCK;
-
for (iter=slab; iter<slab_end; iter+=p->size) {
item *it = (item *) iter;
if (it->slabs_clsid) {
@@ -311,7 +255,6 @@
item_unlink(it);
}
}
-
/* go through free list and discard items that are no longer part of this slab */
{
int fi;
@@ -322,9 +265,7 @@
}
}
}
-
if (was_busy) return -1;
-
/* if good, now move it to the dst slab class */
p->slab_list[p->killing-1] = p->slab_list[p->slabs-1];
p->slabs--;
@@ -332,13 +273,11 @@
dp->slab_list[dp->slabs++] = slab;
dp->end_page_ptr = slab;
dp->end_page_free = dp->perslab;
-
/* this isn't too critical, but other parts of the code do asserts to
make sure this field is always 0. */
for (iter=slab; iter<slab_end; iter+=dp->size) {
((item *)iter)->slabs_clsid = 0;
}
-
return 1;
}
-#endif
+#endif
\ No newline at end of file
More information about the memcached-commits
mailing list