From 9668a1acb56f07c3d69296268986eae90767b1ad Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 17 Jun 2015 09:00:21 -0300 Subject: res_sorcery_memory_cache: Remove 'prefetch' option. To prevent confusion I am removing the prefetch option until such time as it is implemented. All other functionality, however, has been implemented. ASTERISK-25067 Change-Id: I9ce6aa3e5c6c5bc3c5baa8ff90fa036d73939895 --- res/res_sorcery_memory_cache.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'res/res_sorcery_memory_cache.c') diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c index 26df12a69..dae760633 100644 --- a/res/res_sorcery_memory_cache.c +++ b/res/res_sorcery_memory_cache.c @@ -118,8 +118,6 @@ struct sorcery_memory_cache { unsigned int object_lifetime_maximum; /*! \brief The amount of time (in seconds) before an object is marked as stale, 0 if disabled */ unsigned int object_lifetime_stale; - /*! \brief Whether objects are prefetched from normal storage at load time, 0 if disabled */ - unsigned int prefetch; /** \brief Whether all objects are expired when the object type is reloaded, 0 if disabled */ unsigned int expire_on_reload; /*! \brief Heap of cached objects. Oldest object is at the top. */ @@ -866,7 +864,7 @@ static void *sorcery_memory_cache_retrieve_id(const struct ast_sorcery *sorcery, /*! * \internal - * \brief Callback function to finish configuring the memory cache and to prefetch objects + * \brief Callback function to finish configuring the memory cache * * \param data The sorcery memory cache * \param sorcery The sorcery instance @@ -984,8 +982,6 @@ static void *sorcery_memory_cache_open(const char *data) value); return NULL; } - } else if (!strcasecmp(name, "prefetch")) { - cache->prefetch = ast_true(value); } else if (!strcasecmp(name, "expire_on_reload")) { cache->expire_on_reload = ast_true(value); } else { @@ -1153,7 +1149,6 @@ static char *sorcery_memory_cache_show(struct ast_cli_entry *e, int cmd, struct } else { ast_cli(a->fd, "Object staleness is not enabled - cached objects will not go stale\n"); } - ast_cli(a->fd, "Prefetch: %s\n", AST_CLI_ONOFF(cache->prefetch)); ast_cli(a->fd, "Expire all objects on reload: %s\n", AST_CLI_ONOFF(cache->expire_on_reload)); ao2_ref(cache, -1); -- cgit v1.2.3