kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

media_index.c: Refactored so it doesn't cache the index

Browse Source 
Testing revealed that the cache added no benefit but that it could
consume excessive memory.

Two new index related functions were created:
ast_sounds_get_index_for_file() and ast_media_index_update_for_file()
which restrict index updating to specific sound files.

The original ast_sounds_get_index() and ast_media_index_update()
calls are still available but since they no longer cache the results
internally, developers should re-use an index they may already have
instead of calling ast_sounds_get_index() repeatedly.  If information
for only a single file is needed, ast_sounds_get_index_for_file()
should be called instead of ast_sounds_get_index().

The media_index directory scan code was elimininated in favor of
using the existing ast_file_read_dirs() function.

Since there's no more cache, ast_sounds_index_init now only
registers the sounds cli commands instead of generating the
initial index and subscribing to stasis format register/unregister
messages.

"sounds" is no longer a valid target for the "module reload"
command.

Both the sounds cli commands and the sounds ari resources were
refactored to only call ast_sounds_get_index() once per invocation
and to use ast_sounds_get_index_for_file() when a specific sound
file is requested.

Change-Id: I1cef327ba1b0648d85d218b70ce469ad07f4aa8d
This commit is contained in:
George Joseph
2019-01-22 08:02:06 -07:00
parent 6118b65a5a
commit 7071e9d64c
6 changed files with 277 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/ari/resource_sounds.c
View File

@@ -40,13 +40,13 @@ struct lang_format_info {
};
/*! \brief Add format/lang pairs to the array embedded in the sound object */
static int add_format_information_cb(void *obj, void *arg, int flags)
static int add_format_information_cb(void *obj, void *arg, void *data, int flags)
{
char *language = obj;
struct lang_format_info *args = arg;
int idx;
RAII_VAR(struct ast_format_cap *, cap, NULL, ao2_cleanup);
RAII_VAR(struct ast_media_index *, sounds_index, ast_sounds_get_index(), ao2_cleanup);
struct ast_media_index *sounds_index = data;
if (!sounds_index) {
return CMP_STOP;
@@ -95,14 +95,13 @@ static int filter_langs_cb(void *obj, void *arg, int flags)
/*! \brief Generate a Sound structure as documented in sounds.json for the specified filename */
static struct ast_json *create_sound_blob(const char *filename,
struct ast_ari_sounds_list_args *args)
struct ast_ari_sounds_list_args *args, struct ast_media_index *sounds_index)
{
RAII_VAR(struct ast_json *, sound, NULL, ast_json_unref);
RAII_VAR(struct ao2_container *, languages, NULL, ao2_cleanup);
const char *description;
struct ast_json *format_lang_list;
struct lang_format_info info;
RAII_VAR(struct ast_media_index *, sounds_index, ast_sounds_get_index(), ao2_cleanup);
if (!sounds_index) {
return NULL;
@@ -148,7 +147,7 @@ static struct ast_json *create_sound_blob(const char *filename,
if (args) {
info.format_filter = args->format;
}
ao2_callback(languages, OBJ_NODATA, add_format_information_cb, &info);
ao2_callback_data(languages, OBJ_NODATA, add_format_information_cb, &info, sounds_index);
/* no format/lang pairs for this sound so nothing to return */
if (!ast_json_array_size(format_lang_list)) {
@@ -158,13 +157,18 @@ static struct ast_json *create_sound_blob(const char *filename,
return ast_json_ref(sound);
}
struct sounds_cb_data {
struct ast_ari_sounds_list_args *args;
struct ast_media_index *index;
};
/*! \brief Generate a Sound structure and append it to the output blob */
static int append_sound_cb(void *obj, void *arg, void *data, int flags)
{
struct ast_json *sounds_array = arg;
char *filename = obj;
struct ast_ari_sounds_list_args *args = data;
struct ast_json *sound_blob = create_sound_blob(filename, args);
struct sounds_cb_data *cb_data = data;
struct ast_json *sound_blob = create_sound_blob(filename, cb_data->args, cb_data->index);
if (!sound_blob) {
return 0;
}
@@ -180,6 +184,10 @@ void ast_ari_sounds_list(struct ast_variable *headers,
RAII_VAR(struct ao2_container *, sound_files, NULL, ao2_cleanup);
struct ast_json *sounds_blob;
RAII_VAR(struct ast_media_index *, sounds_index, ast_sounds_get_index(), ao2_cleanup);
struct sounds_cb_data cb_data = {
.args = args,
.index = sounds_index,
};
if (!sounds_index) {
ast_ari_response_error(response, 500, "Internal Error", "Sounds index not available");
@@ -198,7 +206,7 @@ void ast_ari_sounds_list(struct ast_variable *headers,
return;
}
ao2_callback_data(sound_files, OBJ_NODATA, append_sound_cb, sounds_blob, args);
ao2_callback_data(sound_files, OBJ_NODATA, append_sound_cb, sounds_blob, &cb_data);
if (!ast_json_array_size(sounds_blob)) {
ast_ari_response_error(response, 404, "Not Found", "No sounds found that matched the query");
@@ -214,8 +222,10 @@ void ast_ari_sounds_get(struct ast_variable *headers,
struct ast_ari_response *response)
{
struct ast_json *sound_blob;
struct ast_media_index *sounds_index = ast_sounds_get_index_for_file(args->sound_id);
sound_blob = create_sound_blob(args->sound_id, NULL);
sound_blob = create_sound_blob(args->sound_id, NULL, sounds_index);
ao2_cleanup(sounds_index);
if (!sound_blob) {
ast_ari_response_error(response, 404, "Not Found", "Sound not found");
return;