@@ -1572,7 +1572,7 @@ int do_store_item(item *it, int comm, conn *c) { } else if(it->cas_id == old_it->cas_id) { // cas validates - do_item_replace(old_it, it); + item_replace(old_it, it); stored = 1; } else { if(settings.verbose > 1) { @@ -1634,7 +1634,7 @@ int do_store_item(item *it, int comm, conn *c) { old_it = do_item_get_nocheck(key, it->nkey); if (old_it != NULL) - do_item_replace(old_it, it); + item_replace(old_it, it); else do_item_link(it); @@ -2281,7 +2281,7 @@ char *do_add_delta(item *it, const bool incr, const int64_t delta, char *buf) { } memcpy(ITEM_data(new_it), buf, res); memcpy(ITEM_data(new_it) + res, "\r\n", 3); - do_item_replace(it, new_it); + item_replace(it, new_it); do_item_remove(new_it); /* release our reference */ } else { /* replace in-place */ memcpy(ITEM_data(it), buf, res); memcached.c @@ -451,14 +451,11 @@ void item_remove(item *item) { /* * Replaces one item with another in the hashtable. + * Unprotected by a mutex lock since the core server does not require + * it to be thread-safe. */ -int item_replace(item *old, item *new) { - int ret; - - pthread_mutex_lock(&cache_lock); - ret = do_item_replace(old, new); - pthread_mutex_unlock(&cache_lock); - return ret; +int item_replace(item *old_it, item *new_it) { + return do_item_replace(old_it, new_it); } /* thread.c 1b7a8118d256b725bc7b5f9a1e888818e483e454 Toru Maesaka dev@torum.net http://github.com/tmaesaka/memcached/commit/ea07c63705b073155c52894941a3df59f60a0268 ea07c63705b073155c52894941a3df59f60a0268 2008-05-09T00:28:52-07:00 2008-05-09T00:28:52-07:00 The core server never called the mutex wrapper for do_item_replace() so "item_replace()" was altered to directly call do_item_replace(). This makes things slightly easier to understand when supporting multiple engines later on since we don't have to worry about deadlocks occuring in item_replace(). c1e532664366b9b8e667d5087ee236931cad847c Toru Maesaka dev@torum.net