diff options
| -rw-r--r-- | BUILD | 20 | ||||
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | memcached.c | 2 | ||||
| -rw-r--r-- | memcached.h | 2 |
5 files changed, 26 insertions, 3 deletions
@@ -0,0 +1,20 @@ +Ideally, you want to make a static binary, otherwise the dynamic +linker pollutes your address space with shared libs right in the +middle. + +Make sure your libevent has epoll (Linux) or kqueue (BSD) support. +Using poll or select only is slow, and works for testing, but +shouldn't be used for high-traffice memcache installations. + +To build libevent with epoll on Linux, you need: + +#define __NR_epoll_create 254 +#define __NR_epoll_ctl 255 +#define __NR_epoll_wait 256 + +One okay (but not ideal) place to shove them is /usr/include/asm/unistd.h + +BSD users are luckier, and will get kqueue support by default. + + + @@ -1,3 +1,6 @@ +2003-06-18 + * changing maxsize back to an unsigned int + 2003-06-16 * adding PHP support * added CONTRIBUTORS file diff --git a/configure.ac b/configure.ac index 1f22bfe..07aa3ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.52) -AC_INIT(memcached, 1.0.4, brad@danga.com) +AC_INIT(memcached, 1.0.5, brad@danga.com) AC_CONFIG_SRCDIR(memcached.c) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) diff --git a/memcached.c b/memcached.c index 69e78b5..a366312 100644 --- a/memcached.c +++ b/memcached.c @@ -310,7 +310,7 @@ void process_stat(conn *c, char *command) { pos += sprintf(pos, "STAT get_misses %u\r\n", stats.get_misses); pos += sprintf(pos, "STAT bytes_read %llu\r\n", stats.bytes_read); pos += sprintf(pos, "STAT bytes_written %llu\r\n", stats.bytes_written); - pos += sprintf(pos, "STAT limit_maxbytes %llu\r\n", settings.maxbytes); + pos += sprintf(pos, "STAT limit_maxbytes %u\r\n", settings.maxbytes); pos += sprintf(pos, "END"); out_string(c, temp); return; diff --git a/memcached.h b/memcached.h index 5559d3d..7b36236 100644 --- a/memcached.h +++ b/memcached.h @@ -19,7 +19,7 @@ struct stats { }; struct settings { - unsigned long long maxbytes; + unsigned int maxbytes; int maxconns; int port; struct in_addr interface; |