From ebfeebd468551fa5e024b36dd218042cc5b7597e Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Wed, 27 Jan 2016 11:07:19 -0500 Subject: Expose the maximum cache size setting as a flag Allow the user to customize the size of the sshfs cache by adding a new max_cache_size flag and turning the hardcoded constant into a variable. --- cache.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cache.c') diff --git a/cache.c b/cache.c index 86978c7..5a5af89 100644 --- a/cache.c +++ b/cache.c @@ -15,7 +15,7 @@ #include #define DEFAULT_CACHE_TIMEOUT_SECS 20 -#define MAX_CACHE_SIZE 10000 +#define DEFAULT_MAX_CACHE_SIZE 10000 #define MIN_CACHE_CLEAN_INTERVAL 5 #define CACHE_CLEAN_INTERVAL 60 @@ -24,6 +24,7 @@ struct cache { unsigned stat_timeout_secs; unsigned dir_timeout_secs; unsigned link_timeout_secs; + unsigned max_size; struct fuse_cache_operations *next_oper; GHashTable *table; pthread_mutex_t lock; @@ -71,7 +72,7 @@ static void cache_clean(void) { time_t now = time(NULL); if (now > cache.last_cleaned + MIN_CACHE_CLEAN_INTERVAL && - (g_hash_table_size(cache.table) > MAX_CACHE_SIZE || + (g_hash_table_size(cache.table) > cache.max_size || now > cache.last_cleaned + CACHE_CLEAN_INTERVAL)) { g_hash_table_foreach_remove(cache.table, (GHRFunc) cache_clean_entry, &now); @@ -576,6 +577,7 @@ static const struct fuse_opt cache_opts[] = { { "cache_stat_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 }, { "cache_dir_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 }, { "cache_link_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 }, + { "cache_max_size=%u", offsetof(struct cache, max_size), 0 }, FUSE_OPT_END }; @@ -584,6 +586,7 @@ int cache_parse_options(struct fuse_args *args) cache.stat_timeout_secs = DEFAULT_CACHE_TIMEOUT_SECS; cache.dir_timeout_secs = DEFAULT_CACHE_TIMEOUT_SECS; cache.link_timeout_secs = DEFAULT_CACHE_TIMEOUT_SECS; + cache.max_size = DEFAULT_MAX_CACHE_SIZE; cache.on = 1; return fuse_opt_parse(args, &cache, cache_opts, NULL); -- cgit v1.2.3