Merge multithreaded into trunk, commit #2 (first commit only did the

new files, not the modified ones.)


git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@509 b0b603af-a30f-0410-a34e-baf09ae79d0b

1 files changed, 11 insertions, 7 deletions

diff --git a/items.h b/items.h
index 695804f..db9b7a2 100644
--- a/items.h
+++ b/items.h
@@ -1,15 +1,15 @@
 /* See items.c */
 void item_init(void);
 /*@null@*/
-item *item_alloc(char *key, const size_t nkey, const int flags, const rel_time_t exptime, const int nbytes);
+item *do_item_alloc(char *key, const size_t nkey, const int flags, const rel_time_t exptime, const int nbytes);
 void item_free(item *it);
 bool item_size_ok(const size_t nkey, const int flags, const int nbytes);
 
-int item_link(item *it);    /* may fail if transgresses limits */
-void item_unlink(item *it);
-void item_remove(item *it);
-void item_update(item *it);   /* update LRU time to current and reposition */
-int item_replace(item *it, item *new_it);
+int  do_item_link(item *it);     /* may fail if transgresses limits */
+void do_item_unlink(item *it);
+void do_item_remove(item *it);
+void do_item_update(item *it);   /* update LRU time to current and reposition */
+int  do_item_replace(item *it, item *new_it);
 
 /*@null@*/
 char *item_cachedump(const unsigned int slabs_clsid, const unsigned int limit, unsigned int *bytes);
@@ -17,4 +17,8 @@ void item_stats(char *buffer, const int buflen);
 
 /*@null@*/
 char *item_stats_sizes(int *bytes);
-void item_flush_expired(void);
+void do_item_flush_expired(void);
+item *item_get(char *key, size_t nkey);
+
+item *do_item_get_notedeleted(char *key, size_t nkey, int *delete_locked);
+item *do_item_get_nocheck(char *key, size_t nkey);