kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 00:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_sorcery_memory_cache: Remove 'prefetch' option.

Browse Source 
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
This commit is contained in:
Joshua Colp
2015-06-17 09:00:21 -03:00
parent 8c0b917032
commit 9668a1acb5
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_sorcery_memory_cache.c
View File

@@ -118,8 +118,6 @@ struct sorcery_memory_cache {
unsigned int object_lifetime_maximum; unsigned int object_lifetime_maximum;
/*! \brief The amount of time (in seconds) before an object is marked as stale, 0 if disabled */ /*! \brief The amount of time (in seconds) before an object is marked as stale, 0 if disabled */
unsigned int object_lifetime_stale; 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 */ /** \brief Whether all objects are expired when the object type is reloaded, 0 if disabled */
unsigned int expire_on_reload; unsigned int expire_on_reload;
/*! \brief Heap of cached objects. Oldest object is at the top. */ /*! \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 * \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 data The sorcery memory cache
* \param sorcery The sorcery instance * \param sorcery The sorcery instance
@@ -984,8 +982,6 @@ static void *sorcery_memory_cache_open(const char *data)
value); value);
return NULL; return NULL;
} }
} else if (!strcasecmp(name, "prefetch")) {
cache->prefetch = ast_true(value);
} else if (!strcasecmp(name, "expire_on_reload")) { } else if (!strcasecmp(name, "expire_on_reload")) {
cache->expire_on_reload = ast_true(value); cache->expire_on_reload = ast_true(value);
} else { } else {
@@ -1153,7 +1149,6 @@ static char *sorcery_memory_cache_show(struct ast_cli_entry *e, int cmd, struct
} else { } else {
ast_cli(a->fd, "Object staleness is not enabled - cached objects will not go stale\n"); 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)); ast_cli(a->fd, "Expire all objects on reload: %s\n", AST_CLI_ONOFF(cache->expire_on_reload));
ao2_ref(cache, -1); ao2_ref(cache, -1);