summaryrefslogtreecommitdiff
path: root/src/libdcache/dcache_search.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libdcache/dcache_search.c')
-rw-r--r--src/libdcache/dcache_search.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libdcache/dcache_search.c b/src/libdcache/dcache_search.c
index 0239b88..3d79dd6 100644
--- a/src/libdcache/dcache_search.c
+++ b/src/libdcache/dcache_search.c
@@ -7,9 +7,18 @@
#include <shibari/dcache.h>
#include "dcache-internal.h"
-dcache_node_t *dcache_search (dcache_t *z, char const *key, uint16_t keylen)
+dcache_node_t *dcache_search (dcache_t *z, char const *key, uint16_t keylen, tain const *stamp)
{
uint32_t i ;
dcache_key_t k = { .s = (char *)key, .len = keylen } ;
- return avltree_search(&z->by_key, &k, &i) ? DNODE(z, i) : 0 ;
+ if (avltree_search(&z->by_key, &k, &i))
+ {
+ if (tain_less(&DNODE(z, i)->expire, stamp))
+ {
+ dcache_clean_expired(z, stamp) ;
+ if (!avltree_search(&z->by_key, &k, &i)) return 0 ;
+ }
+ return DNODE(z, i) ;
+ }
+ else return 0 ;
}