Changeset 740 for vendor/current/source3/lib/memcache.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/memcache.c (modified) (6 diffs)

vendor/current/source3/lib/memcache.c

@@ -32 +32 @@
 
 struct memcache {
-        struct memcache_element *mru, *lru;
+        struct memcache_element *mru;
         struct rb_root tree;
         size_t size;
@@ -162 +162 @@
 
         if (cache->size != 0) {
-                /*
-                 * Do LRU promotion only when we will ever shrink
-                 */
-                if (e == cache->lru) {
-                        cache->lru = e->prev;
-                }
                 DLIST_PROMOTE(cache->mru, e);
-                if (cache->mru == NULL) {
-                        cache->mru = e;
-                }
         }
 
@@ -202 +193 @@
         rb_erase(&e->rb_node, &cache->tree);
 
-        if (e == cache->lru) {
-                cache->lru = e->prev;
-        }
         DLIST_REMOVE(cache->mru, e);
 
@@ -228 +216 @@
         }
 
-        while ((cache->size > cache->max_size) && (cache->lru != NULL)) {
-                memcache_delete_element(cache, cache->lru);
+        while ((cache->size > cache->max_size) && DLIST_TAIL(cache->mru)) {
+                memcache_delete_element(cache, DLIST_TAIL(cache->mru));
         }
 }
@@ -332 +320 @@
 
         DLIST_ADD(cache->mru, e);
-        if (cache->lru == NULL) {
-                cache->lru = e;
-        }
 
         cache->size += element_size;
@@ -401 +386 @@
         }
 
-        if (node == NULL) {
-                return;
-        }
-
         /*
          * Then, find the leftmost element with number n