summaryrefslogtreecommitdiff
path: root/src/libdcache/dcache_delete.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libdcache/dcache_delete.c')
-rw-r--r--src/libdcache/dcache_delete.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/libdcache/dcache_delete.c b/src/libdcache/dcache_delete.c
index 92a5fcc..861a30e 100644
--- a/src/libdcache/dcache_delete.c
+++ b/src/libdcache/dcache_delete.c
@@ -1,19 +1,22 @@
/* ISC license. */
-#include <skalibs/alloc.h>
+#include <skalibs/stralloc.h>
#include <skalibs/gensetdyn.h>
#include <skalibs/avltree.h>
#include <shibari/dcache.h>
#include "dcache-internal.h"
-void dcache_delete (dcache_t *z, uint32_t i)
+void dcache_delete (dcache *z, uint32_t i)
{
- dcache_node_t *y = DNODE(z, i) ;
- avltree_delete(&z->by_expire, &y->expire) ;
- avltree_delete(&z->by_entry, &y->entry) ;
- avltree_delete(&z->by_key, &y->key) ;
- alloc_free(y->key.s) ;
- z->size -= DCACHE_NODE_OVERHEAD + y->key.len + y->datalen ;
+ dcache_node *node = DNODE(z, i) ;
+ if (node->sa.len == node->sa.a)
+ {
+ avltree_delete(&z->by_expire, &node->expire) ;
+ avltree_delete(&z->by_entry, &node->entry) ;
+ }
+ avltree_delete(&z->by_key, &node->sa.s) ;
+ z->size -= DCACHE_NODE_OVERHEAD + node->sa.len ;
+ node->sa.len = 0 ;
gensetdyn_delete(&z->storage, i) ;
}