Changeset 739

Timestamp:

03/03/08 05:08:31 (21 months ago)

Author:

dormando

Message:

Don't re-calculate the slab class id for slabs_free() either.
This + previous patch slightly reduce user CPU time, especially during heavy evictions.

Location:

trunk/server

Files:

• items.c (modified) (2 diffs)
• memcached.h (modified) (3 diffs)
• slabs.c (modified) (1 diff)
• slabs.h (modified) (1 diff)
• thread.c (modified) (1 diff)

trunk/server/items.c

@@ -145 +145 @@
 void item_free(item *it) {
     size_t ntotal = ITEM_ntotal(it);
+    unsigned int clsid;
     assert((it->it_flags & ITEM_LINKED) == 0);
     assert(it != heads[it->slabs_clsid]);
@@ -151 +152 @@
 
     /* so slab size changer can tell later if item is already free or not */
+    clsid = it->slabs_clsid;
     it->slabs_clsid = 0;
     it->it_flags |= ITEM_SLABBED;
     DEBUG_REFCNT(it, 'F');
-    slabs_free(it, ntotal);
+    slabs_free(it, ntotal, clsid);
 }
 

trunk/server/memcached.h

@@ -293 +293 @@
 void  mt_run_deferred_deletes(void);
 void *mt_slabs_alloc(size_t size, unsigned int id);
-void  mt_slabs_free(void *ptr, size_t size);
+void  mt_slabs_free(void *ptr, size_t size, unsigned int id);
 int   mt_slabs_reassign(unsigned char srcid, unsigned char dstid);
 char *mt_slabs_stats(int *buflen);
@@ -322 +322 @@
 # define run_deferred_deletes()      mt_run_deferred_deletes()
 # define slabs_alloc(x,y)            mt_slabs_alloc(x,y)
-# define slabs_free(x,y)             mt_slabs_free(x,y)
+# define slabs_free(x,y,z)           mt_slabs_free(x,y,z)
 # define slabs_reassign(x,y)         mt_slabs_reassign(x,y)
 # define slabs_stats(x)              mt_slabs_stats(x)
@@ -355 +355 @@
 # define run_deferred_deletes()      do_run_deferred_deletes()
 # define slabs_alloc(x,y)            do_slabs_alloc(x,y)
-# define slabs_free(x,y)             do_slabs_free(x,y)
+# define slabs_free(x,y,z)           do_slabs_free(x,y,z)
 # define slabs_reassign(x,y)         do_slabs_reassign(x,y)
 # define slabs_stats(x)              do_slabs_stats(x)

trunk/server/slabs.c

@@ -258 +258 @@
 }
 
-void do_slabs_free(void *ptr, const size_t size) {
-    unsigned char id = slabs_clsid(size);
+void do_slabs_free(void *ptr, const size_t size, unsigned int id) {
     slabclass_t *p;
 

trunk/server/slabs.h

@@ -21 +21 @@
 
 /** Free previously allocated object */
-void do_slabs_free(void *ptr, size_t size);
+void do_slabs_free(void *ptr, size_t size, unsigned int id);
 
 /** Fill buffer with stats */ /*@null@*/

trunk/server/thread.c

@@ -581 +581 @@
 }
 
-void mt_slabs_free(void *ptr, size_t size) {
+void mt_slabs_free(void *ptr, size_t size, unsigned int id) {
     pthread_mutex_lock(&slabs_lock);
-    do_slabs_free(ptr, size);
+    do_slabs_free(ptr, size, id);
     pthread_mutex_unlock(&slabs_lock);
 }