diff options
author | Trond Norbye <Trond.Norbye@sun.com> | 2009-01-28 10:49:35 +0100 |
---|---|---|
committer | Dustin Sallings <dustin@spy.net> | 2009-01-29 13:41:02 -0800 |
commit | d675caba17f30709adcc7d0b1e44edfbd1619c1a (patch) | |
tree | 43288323ece206a8dacb5efd8905cd5dd4683e10 /memcached.c | |
parent | 74908abc795f896708764127be8879f7c48e0902 (diff) | |
download | memcached-d675caba17f30709adcc7d0b1e44edfbd1619c1a.tar.gz |
Remove stats malloc and stats maps
Diffstat (limited to 'memcached.c')
-rw-r--r-- | memcached.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/memcached.c b/memcached.c index 2dbdb4f..18f2419 100644 --- a/memcached.c +++ b/memcached.c @@ -2260,55 +2260,6 @@ static void process_stat(conn *c, token_t *tokens, const size_t ntokens) { return; } -#ifdef HAVE_MALLOC_H -#ifdef HAVE_STRUCT_MALLINFO - if (strcmp(subcommand, "malloc") == 0) { - int len = 0; - char *buf = get_stats("malloc", strlen("malloc"), - &append_ascii_stats, (void *)c, &len); - write_and_free(c, buf, len); - return; - } -#endif /* HAVE_STRUCT_MALLINFO */ -#endif /* HAVE_MALLOC_H */ - -#if !defined(WIN32) || !defined(__APPLE__) - if (strcmp(subcommand, "maps") == 0) { - char *wbuf; - int wsize = 8192; /* should be enough */ - int fd; - int res; - - if ((wbuf = (char *)malloc(wsize)) == NULL) { - out_string(c, "SERVER_ERROR out of memory writing stats maps"); - 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"); - free(wbuf); close(fd); - return; - } - if (res == 0 || res == -1) { - out_string(c, "SERVER_ERROR can't read the maps file"); - free(wbuf); close(fd); - return; - } - memcpy(wbuf + res, "END\r\n", 5); - write_and_free(c, wbuf, res + 5); - close(fd); - return; - } -#endif - /* NOTE: how to tackle detail with binary? */ if (strcmp(subcommand, "detail") == 0) { if (ntokens < 4) |