summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Norbye <trond.norbye@gmail.com>2011-07-18 16:14:15 +0200
committerTrond Norbye <trond.norbye@gmail.com>2011-07-18 16:14:15 +0200
commit7aed1faec4ce74b4e7a6db9dd3de724ebdaa8be9 (patch)
treef284116eba7123164769d25fb117cf2088068f79
parentc8f5e90ff432d2f3b4db1991c403b8fa9824d284 (diff)
downloadmemcached-7aed1faec4ce74b4e7a6db9dd3de724ebdaa8be9.tar.gz
Issue 200: Don't fire dtrace probe as the last thing in a function
Some compilers (at least gcc 4.6.1) may optimize away the code when using certain optimization levels
-rw-r--r--daemon/memcached.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/memcached.c b/daemon/memcached.c
index 07ea5bd..441551d 100644
--- a/daemon/memcached.c
+++ b/daemon/memcached.c
@@ -852,11 +852,11 @@ void conn_set_state(conn *c, STATE_FUNC state) {
state_text(state));
}
- c->state = state;
-
if (state == conn_write || state == conn_mwrite) {
MEMCACHED_PROCESS_COMMAND_END(c->sfd, c->wbuf, c->wbytes);
}
+
+ c->state = state;
}
}