Changeset 736

Timestamp:

03/03/08 05:08:17 (6 months ago)

Author:

dormando

Message:

Give 'SERVER_ERROR out of memory' errors more context.

Files:

• trunk/server/memcached.c (modified) (9 diffs)

trunk/server/memcached.c

@@ -975 +975 @@
-        c->write_and_go = conn_read;
-    } else {
-
+ writing stats
-    }
-}
@@ -1112 +1112 @@
-
-        if ((wbuf = (char *)malloc(wsize)) == NULL) {
-
+ writing stats maps
-            return;
-        }
@@ -1279 +1279 @@
-                    stats.get_misses += stats_get_misses;
-                    STATS_UNLOCK();
-
+ making CAS suffix
-                    return;
-                  }
@@ -1348 +1348 @@
-    if (key_token->value != NULL || add_iov(c, "END\r\n", 5) != 0
-        || (c->udp && build_udp_headers(c) != 0)) {
-
+ writing get response
-    }
-    else {
@@ -1423 +1423 @@
-            out_string(c, "SERVER_ERROR object too large for cache");
-        else
-
+ storing object
-        /* swallow the data line */
-        c->write_and_go = conn_swallow;
@@ -1524 +1524 @@
-        new_it = do_item_alloc(ITEM_key(it), it->nkey, atoi(ITEM_suffix(it) + 1), it->exptime, res + 2 );
-        if (new_it == 0) {
-
+ in incr/decr
-        }
-        memcpy(ITEM_data(new_it), buf, res);
@@ -1615 +1615 @@
-             */
-            item_remove(it);    /* release reference */
-
+ expanding delete queue
-        }
-    }
@@ -1660 +1660 @@
-    c->iovused = 0;
-    if (add_msghdr(c) != 0) {
-
+ preparing response
-        return;
-    }
@@ -1940 +1940 @@
-                    fprintf(stderr, "Couldn't realloc input buffer\n");
-                c->rbytes = 0; /* ignore what we read */
-
+ reading request
-                c->write_and_go = conn_closing;
-                return 1;