@@ -224,6 +224,32 @@ AC_CHECK_FUNCS(mlockall) AC_CHECK_FUNCS(getpagesizes) AC_CHECK_FUNCS(memcntl) +AC_DEFUN([AC_C_ALIGNMENT], +[AC_CACHE_CHECK(for alignment, ac_cv_c_alignment, +[ + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([ +#include <stdlib.h> +#include <inttypes.h> + ], [ + char *buf = malloc(32); + uint64_t *ptr = (uint64_t*)(buf+2); + *ptr = 0x1; + return 0; + ]) + ],[ + ac_cv_c_alignment=none + ],[ + ac_cv_c_endian=need + ]) +]) +if test $ac_cv_c_endian = need; then + AC_DEFINE(NEED_ALIGN, 1, [Machine need alignment]) +fi +]) + +AC_C_ALIGNMENT + dnl Let the compiler be a bit more picky. Please note that you cannot dnl specify these flags to the compiler before AC_CHECK_FUNCS, because dnl the test program will generate a compilation warning and hence fail configure.ac @@ -881,6 +881,8 @@ static void* binary_get_request(conn *c) { char *ret = c->rcurr; ret -= (sizeof(c->binary_header) + c->binary_header.request.keylen + c->binary_header.request.extlen); + + assert(ret >= c->rbuf); return ret; } @@ -2848,6 +2850,16 @@ static int try_read_command(conn *c) { /* need more data! */ return 0; } else { +#ifdef NEED_ALIGN + if (((long)(c->rcurr)) % 8 != 0) { + /* must realign input buffer */ + memmove(c->rbuf, c->rcurr, c->rbytes); + c->rcurr = c->rbuf; + if (settings.verbose) { + fprintf(stderr, "%d: Realign input buffer\n", c->sfd); + } + } +#endif protocol_binary_request_header* req; req = (protocol_binary_request_header*)c->rcurr; @@ -3247,6 +3259,9 @@ static void drive_machine(conn *c) { STATS_LOCK(); stats.bytes_read += res; STATS_UNLOCK(); + if (c->rcurr == c->ritem) { + c->rcurr += res; + } c->ritem += res; c->rlbytes -= res; break; memcached.c d9d315f6dddda9099998da7119b723206a13001b Trond Norbye Trond.Norbye@sun.com http://github.com/trondn/memcached/commit/4c3797b1d4fe9088ef96c9f7d571b1221cb40fef 4c3797b1d4fe9088ef96c9f7d571b1221cb40fef 2008-12-04T02:52:45-08:00 2008-12-04T02:52:45-08:00 Realign command input buffer (binary protocol) 1a116c74cc7ac5d20036112d513b435f4c3d053e Trond Norbye Trond.Norbye@sun.com