memcached_dtrace.d memcached_dtrace.h @@ -3,8 +3,22 @@ bin_PROGRAMS = memcached memcached-debug memcached_SOURCES = memcached.c slabs.c slabs.h items.c items.h assoc.c assoc.h memcached.h thread.c stats.c stats.h memcached_debug_SOURCES = $(memcached_SOURCES) memcached_CPPFLAGS = -DNDEBUG -memcached_LDADD = @LIBOBJS@ -memcached_debug_LDADD = $(memcached_LDADD) +memcached_LDADD = @DTRACE_OBJ@ @DAEMON_OBJ@ +memcached_debug_LDADD = @DTRACE_DEBUG_OBJ@ @DAEMON_OBJ@ +memcached_DEPENDENCIES = @DTRACE_OBJ@ @DAEMON_OBJ@ +memcached_debug_DEPENDENCIES = @DTRACE_DEBUG_OBJ@ @DAEMON_OBJ@ + +memcached_dtrace.h: + ${DTRACE} -h -s memcached_dtrace.d + sed -e s,_DTRACE_VERSION,ENABLE_DTRACE,g memcached_dtrace.h | \ + tr '\t' ' ' | grep -v unistd.h > memcached_dtrace.tmp + mv memcached_dtrace.tmp memcached_dtrace.h + +memcached_dtrace.o: $(memcached_OBJECTS) + $(DTRACE) $(DTRACEFLAGS) -G -o memcached_dtrace.o -s ${srcdir}/memcached_dtrace.d $(memcached_OBJECTS) + +memcached_debug_dtrace.o: $(memcached_debug_OBJECTS) + $(DTRACE) $(DTRACEFLAGS) -G -o memcached_debug_dtrace.o -s ${srcdir}/memcached_dtrace.d $(memcached_debug_OBJECTS) SUBDIRS = doc DIST_DIRS = scripts Makefile.am @@ -496,14 +496,18 @@ item *assoc_find(const char *key, const size_t nkey) { it = primary_hashtable[hv & hashmask(hashpower)]; } + item *ret = NULL; + int depth = 0; while (it) { - if ((nkey == it->nkey) && - (memcmp(key, ITEM_key(it), nkey) == 0)) { - return it; + if ((nkey == it->nkey) && (memcmp(key, ITEM_key(it), nkey) == 0)) { + ret = it; + break; } it = it->h_next; + ++depth; } - return 0; + MEMCACHED_ASSOC_FIND(key, depth); + return ret; } /* returns the address of the item pointer before the key. if *item == 0, @@ -595,6 +599,7 @@ int assoc_insert(item *it) { assoc_expand(); } + MEMCACHED_ASSOC_INSERT(ITEM_key(it), hash_items); return 1; } @@ -602,10 +607,15 @@ void assoc_delete(const char *key, const size_t nkey) { item **before = _hashitem_before(key, nkey); if (*before) { - item *nxt = (*before)->h_next; + item *nxt; + hash_items--; + /* The DTrace probe cannot be triggered as the last instruction + * due to possible tail-optimization by the compiler + */ + MEMCACHED_ASSOC_DELETE(key, hash_items); + nxt = (*before)->h_next; (*before)->h_next = 0; /* probably pointless, but whatever. */ *before = nxt; - hash_items--; return; } /* Note: we never actually get here. the callers don't delete things assoc.c @@ -9,6 +9,25 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL +AC_ARG_ENABLE(dtrace, + [AS_HELP_STRING([--enable-dtrace],[Enable dtrace probes])]) +if test "x$enable_dtrace" == "xyes"; then + AC_PATH_PROG([DTRACE], [dtrace], "no", [/usr/sbin:$PATH]) + if test "x$DTRACE" != "xno"; then + AC_DEFINE([ENABLE_DTRACE],1,[Set to nonzero if you want to include DTRACE]) + DTRACE_OBJ=memcached_dtrace.o + DTRACE_DEBUG_OBJ=memcached_debug_dtrace.o + else + AC_MSG_ERROR([Need dtrace binary and OS support.]) + fi +else + AC_DEFINE([ENABLE_DTRACE],0,[Set to nonzero if you want to include DTRACE]) +fi +AC_SUBST(DTRACE) +AC_SUBST(DTRACE_OBJ) +AC_SUBST(DTRACE_DEBUG_OBJ) +AC_SUBST(DTRACEFLAGS) + AC_ARG_ENABLE(64bit, [AS_HELP_STRING([--enable-64bit],[build 64bit verison])]) if test "x$enable_64bit" == "xyes" @@ -113,7 +132,8 @@ AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(mallinfo, malloc) -AC_CHECK_FUNC(daemon,AC_DEFINE([HAVE_DAEMON],,[Define this if you have daemon()]),[AC_LIBOBJ(daemon)]) +AC_CHECK_FUNC(daemon,AC_DEFINE([HAVE_DAEMON],,[Define this if you have daemon()]),[DAEMON_OBJ=daemon.o]) +AC_SUBST(DAEMON_OBJ) AC_HEADER_STDBOOL AC_C_CONST configure.ac @@ -229,6 +229,7 @@ static void item_unlink_q(item *it) { } int do_item_link(item *it) { + MEMCACHED_ITEM_LINK(ITEM_key(it), it->nbytes); assert((it->it_flags & (ITEM_LINKED|ITEM_SLABBED)) == 0); assert(it->nbytes < (1024 * 1024)); /* 1MB max size */ it->it_flags |= ITEM_LINKED; @@ -250,6 +251,7 @@ int do_item_link(item *it) { } void do_item_unlink(item *it) { + MEMCACHED_ITEM_UNLINK(ITEM_key(it), it->nbytes); if ((it->it_flags & ITEM_LINKED) != 0) { it->it_flags &= ~ITEM_LINKED; STATS_LOCK(); @@ -263,6 +265,7 @@ void do_item_unlink(item *it) { } void do_item_remove(item *it) { + MEMCACHED_ITEM_REMOVE(ITEM_key(it), it->nbytes); assert((it->it_flags & ITEM_SLABBED) == 0); if (it->refcount != 0) { it->refcount--; @@ -275,6 +278,7 @@ void do_item_remove(item *it) { } void do_item_update(item *it) { + MEMCACHED_ITEM_UPDATE(ITEM_key(it), it->nbytes); if (it->time < current_time - ITEM_UPDATE_INTERVAL) { assert((it->it_flags & ITEM_SLABBED) == 0); @@ -287,6 +291,8 @@ void do_item_update(item *it) { } int do_item_replace(item *it, item *new_it) { + MEMCACHED_ITEM_REPLACE(ITEM_key(it), it->nbytes, + ITEM_key(new_it), new_it->nbytes); assert((it->it_flags & ITEM_SLABBED) == 0); do_item_unlink(it); items.c @@ -301,6 +301,8 @@ conn *conn_new(const int sfd, const int init_state, const int event_flags, fprintf(stderr, "calloc()\n"); return NULL; } + MEMCACHED_CONN_CREATE(c); + c->rbuf = c->wbuf = 0; c->ilist = 0; c->suffixlist = 0; @@ -325,13 +327,7 @@ conn *conn_new(const int sfd, const int init_state, const int event_flags, if (c->rbuf == 0 || c->wbuf == 0 || c->ilist == 0 || c->iov == 0 || c->msglist == 0 || c->suffixlist == 0) { - if (c->rbuf != 0) free(c->rbuf); - if (c->wbuf != 0) free(c->wbuf); - if (c->ilist !=0) free(c->ilist); - if (c->suffixlist != 0) free(c->suffixlist); - if (c->iov != 0) free(c->iov); - if (c->msglist != 0) free(c->msglist); - free(c); + conn_free(c); fprintf(stderr, "malloc()\n"); return NULL; } @@ -391,6 +387,8 @@ conn *conn_new(const int sfd, const int init_state, const int event_flags, stats.total_conns++; STATS_UNLOCK(); + MEMCACHED_CONN_ALLOCATE(c->sfd); + return c; } @@ -427,6 +425,7 @@ static void conn_cleanup(conn *c) { */ void conn_free(conn *c) { if (c) { + MEMCACHED_CONN_DESTROY(c); if (c->hdrbuf) free(c->hdrbuf); if (c->msglist) @@ -454,6 +453,7 @@ static void conn_close(conn *c) { if (settings.verbose > 1) fprintf(stderr, "<%d connection closed.\n", c->sfd); + MEMCACHED_CONN_RELEASE(c->sfd); close(c->sfd); accept_new_conns(true); conn_cleanup(c); @@ -543,6 +543,10 @@ static void conn_set_state(conn *c, int state) { assoc_move_next_bucket(); } c->state = state; + + if (state == conn_write) { + MEMCACHED_PROCESS_COMMAND_END(c->sfd, c->wbuf, c->wbytes); + } } } @@ -784,9 +788,32 @@ static void complete_nread(conn *c) { out_string(c, "CLIENT_ERROR bad data chunk"); } else { ret = store_item(it, comm); - if (ret == 1) + if (ret == 1) { out_string(c, "STORED"); - else if(ret == 2) +#ifdef HAVE_DTRACE + switch (comm) { + case NREAD_ADD: + MEMCACHED_COMMAND_ADD(c->sfd, ITEM_key(it), it->nbytes); + break; + case NREAD_REPLACE: + MEMCACHED_COMMAND_REPLACE(c->sfd, ITEM_key(it), it->nbytes); + break; + case NREAD_APPEND: + MEMCACHED_COMMAND_APPEND(c->sfd, ITEM_key(it), it->nbytes); + break; + case NREAD_PREPEND: + MEMCACHED_COMMAND_PREPEND(c->sfd, ITEM_key(it), it->nbytes); + break; + case NREAD_SET: + MEMCACHED_COMMAND_SET(c->sfd, ITEM_key(it), it->nbytes); + break; + case NREAD_CAS: + MEMCACHED_COMMAND_CAS(c->sfd, ITEM_key(it), it->nbytes, + it->cas_id); + break; + } +#endif + } else if(ret == 2) out_string(c, "EXISTS"); else if(ret == 3) out_string(c, "NOT_FOUND"); @@ -1268,6 +1295,8 @@ static inline void process_get_command(conn *c, token_t *tokens, size_t ntokens, if(return_cas == true) { + MEMCACHED_COMMAND_GETS(c->sfd, ITEM_key(it), it->nbytes, + it->cas_id); /* Goofy mid-flight realloc. */ if (i >= c->suffixsize) { char **new_suffix_list = realloc(c->suffixlist, @@ -1306,6 +1335,8 @@ static inline void process_get_command(conn *c, token_t *tokens, size_t ntokens, } else { + MEMCACHED_COMMAND_GET(c->sfd, ITEM_key(it), it->nbytes); + if (add_iov(c, "VALUE ", 6) != 0 || add_iov(c, ITEM_key(it), it->nkey) != 0 || add_iov(c, ITEM_suffix(it), it->nsuffix + it->nbytes) != 0) @@ -1327,6 +1358,11 @@ static inline void process_get_command(conn *c, token_t *tokens, size_t ntokens, } else { stats_get_misses++; + if (return_cas) { + MEMCACHED_COMMAND_GETS(c->sfd, key, -1, 0); + } else { + MEMCACHED_COMMAND_GET(c->sfd, key, -1); + } } key_token++; @@ -1508,13 +1544,14 @@ static void process_arithmetic_command(conn *c, token_t *tokens, const size_t nt return; } - out_string(c, add_delta(it, incr, delta, temp)); + out_string(c, add_delta(c, it, incr, delta, temp)); item_remove(it); /* release our reference */ } /* * adds a delta value to a numeric item. * + * c connection requesting the operation * it item to adjust * incr true to increment value, false to decrement * delta amount to adjust value by @@ -1522,7 +1559,7 @@ static void process_arithmetic_command(conn *c, token_t *tokens, const size_t nt * * returns a response string to send back to the client. */ -char *do_add_delta(item *it, const bool incr, const int64_t delta, char *buf) { +char *do_add_delta(conn *c, item *it, const bool incr, const int64_t delta, char *buf) { char *ptr; int64_t value; int res; @@ -1536,11 +1573,13 @@ char *do_add_delta(item *it, const bool incr, const int64_t delta, char *buf) { return "CLIENT_ERROR cannot increment or decrement non-numeric value"; } - if (incr) + if (incr) { value += delta; - else { + MEMCACHED_COMMAND_INCR(c->sfd, ITEM_key(it), value); + } else { if (delta >= value) value = 0; else value -= delta; + MEMCACHED_COMMAND_DECR(c->sfd, ITEM_key(it), value); } sprintf(buf, "%llu", value); res = strlen(buf); @@ -1608,6 +1647,7 @@ static void process_delete_command(conn *c, token_t *tokens, const size_t ntoken it = item_get(key, nkey); if (it) { + MEMCACHED_COMMAND_DELETE(c->sfd, ITEM_key(it), exptime); if (exptime == 0) { item_unlink(it); item_remove(it); /* release our reference */ @@ -1672,6 +1712,8 @@ static void process_command(conn *c, char *command) { assert(c != NULL); + MEMCACHED_PROCESS_COMMAND_START(c->sfd, c->rcurr, c->rbytes); + if (settings.verbose > 1) fprintf(stderr, "<%d %s\n", c->sfd, command); memcached.c @@ -240,7 +240,8 @@ char *do_suffix_from_freelist(); bool do_suffix_add_to_freelist(char *s); char *do_defer_delete(item *item, time_t exptime); void do_run_deferred_deletes(void); -char *do_add_delta(item *item, const bool incr, const int64_t delta, char *buf); +char *do_add_delta(conn *c, item *item, const bool incr, const int64_t delta, + char *buf); int do_store_item(item *item, int comm); conn *conn_new(const int sfd, const int init_state, const int event_flags, const int read_buffer_size, const bool is_udp, struct event_base *base); @@ -249,7 +250,7 @@ conn *conn_new(const int sfd, const int init_state, const int event_flags, const #include "slabs.h" #include "assoc.h" #include "items.h" - +#include "memcached_dtrace.h" /* * In multithreaded mode, we wrap certain functions with lock management and @@ -271,7 +272,8 @@ int dispatch_event_add(int thread, conn *c); void dispatch_conn_new(int sfd, int init_state, int event_flags, int read_buffer_size, int is_udp); /* Lock wrappers for cache functions that are called from main loop. */ -char *mt_add_delta(item *item, const int incr, const int64_t delta, char *buf); +char *mt_add_delta(conn *c, item *item, const int incr, const int64_t delta, + char *buf); void mt_assoc_move_next_bucket(void); conn *mt_conn_from_freelist(void); bool mt_conn_add_to_freelist(conn *c); @@ -300,7 +302,7 @@ void mt_stats_unlock(void); int mt_store_item(item *item, int comm); -# define add_delta(x,y,z,a) mt_add_delta(x,y,z,a) +# define add_delta(c,x,y,z,a) mt_add_delta(c,x,y,z,a) # define assoc_move_next_bucket() mt_assoc_move_next_bucket() # define conn_from_freelist() mt_conn_from_freelist() # define conn_add_to_freelist(x) mt_conn_add_to_freelist(x) @@ -331,7 +333,7 @@ int mt_store_item(item *item, int comm); #else /* !USE_THREADS */ -# define add_delta(x,y,z,a) do_add_delta(x,y,z,a) +# define add_delta(c,x,y,z,a) do_add_delta(c,x,y,z,a) # define assoc_move_next_bucket() do_assoc_move_next_bucket() # define conn_from_freelist() do_conn_from_freelist() # define conn_add_to_freelist(x) do_conn_add_to_freelist(x) memcached.h @@ -200,13 +200,13 @@ static int do_slabs_newslab(const unsigned int id) { #endif char *ptr; - if (mem_limit && mem_malloced + len > mem_limit && p->slabs > 0) - return 0; - - if (grow_slab_list(id) == 0) return 0; + if ((mem_limit && mem_malloced + len > mem_limit && p->slabs > 0) || + (grow_slab_list(id) == 0) || + ((ptr = memory_allocate((size_t)len)) == 0)) { - ptr = memory_allocate((size_t)len); - if (ptr == 0) return 0; + MEMCACHED_SLABS_SLABCLASS_ALLOCATE_FAILED(id); + return 0; + } memset(ptr, 0, (size_t)len); p->end_page_ptr = ptr; @@ -214,47 +214,62 @@ static int do_slabs_newslab(const unsigned int id) { p->slab_list[p->slabs++] = ptr; mem_malloced += len; + + MEMCACHED_SLABS_SLABCLASS_ALLOCATE(id); return 1; } /*@null@*/ void *do_slabs_alloc(const size_t size, unsigned int id) { slabclass_t *p; + void *ret = NULL; - if (id < POWER_SMALLEST || id > power_largest) + if (id < POWER_SMALLEST || id > power_largest) { + MEMCACHED_SLABS_ALLOCATE_FAILED(size, 0); return NULL; + } 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) + if (mem_limit && mem_malloced + size > mem_limit) { + MEMCACHED_SLABS_ALLOCATE_FAILED(size, id); return 0; + } mem_malloced += size; - return malloc(size); + ret = malloc(size); + MEMCACHED_SLABS_ALLOCATE(size, id, 0, ret); + return ret; #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 != 0 || p->sl_curr != 0 || do_slabs_newslab(id) != 0)) - return 0; - - /* return off our freelist, if we have one */ - if (p->sl_curr != 0) - 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; + if (! (p->end_page_ptr != 0 || p->sl_curr != 0 || + do_slabs_newslab(id) != 0)) { + /* We don't have more memory available */ + ret = NULL; + } else if (p->sl_curr != 0) { + /* return off our freelist */ + ret = p->slots[--p->sl_curr]; + } else { + /* if we recently allocated a whole page, return from that */ + assert(p->end_page_ptr != NULL); + ret = p->end_page_ptr; if (--p->end_page_free != 0) { p->end_page_ptr += p->size; } else { p->end_page_ptr = 0; } - return ptr; } - return NULL; /* shouldn't ever get here */ + if (ret) { + MEMCACHED_SLABS_ALLOCATE(size, id, p->size, ret); + } else { + MEMCACHED_SLABS_ALLOCATE_FAILED(size, id); + } + + return ret; } void do_slabs_free(void *ptr, const size_t size, unsigned int id) { @@ -265,6 +280,7 @@ void do_slabs_free(void *ptr, const size_t size, unsigned int id) { if (id < POWER_SMALLEST || id > power_largest) return; + MEMCACHED_SLABS_FREE(size, id, ptr); p = &slabclass[id]; #ifdef USE_SYSTEM_MALLOC slabs.c @@ -381,6 +381,8 @@ void dispatch_conn_new(int sfd, int init_state, int event_flags, item->is_udp = is_udp; cq_push(&threads[thread].new_conn_queue, item); + + MEMCACHED_CONN_DISPATCH(sfd, threads[thread].thread_id); if (write(threads[thread].notify_send_fd, "", 1) != 1) { perror("Writing to thread notify pipe"); } @@ -495,11 +497,12 @@ char *mt_defer_delete(item *item, time_t exptime) { /* * Does arithmetic on a numeric item value. */ -char *mt_add_delta(item *item, int incr, const int64_t delta, char *buf) { +char *mt_add_delta(conn *c, item *item, int incr, const int64_t delta, + char *buf) { char *ret; pthread_mutex_lock(&cache_lock); - ret = do_add_delta(item, incr, delta, buf); + ret = do_add_delta(c, item, incr, delta, buf); pthread_mutex_unlock(&cache_lock); return ret; } thread.c 846ddb6a311f25c3f1ef17207eef6b338f0d7c79 Trond Norbye Trond.Norbye@Sun.COM http://github.com/dustin/memcached/commit/e4534c8552cc53ad4fd2bf431ee169b3667970aa e4534c8552cc53ad4fd2bf431ee169b3667970aa 2008-12-22T12:35:53-08:00 2008-07-23T11:38:29-07:00 Add DTrace probes for Solaris/etc. 8ecc591b3667284620f3c3a0482096cb797038ce Dustin Sallings dustin@spy.net