From 8d323c74fa60fd1eb411336753ef4052faf7b309 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 6 Apr 2017 18:30:11 -0500
Subject: [PATCH] sorcery.c: Speed up ast_sorcery_retrieve_by_id()
Return early if ast_sorcery_retrieve_by_id() is not passed an id to find.
Also eliminated the RAII_VAR() usage in the function.
Change-Id: I871dbe162a301b5ced8b4393cec27180c7c6b218
---
main/sorcery.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/main/sorcery.c b/main/sorcery.c
index 51b0b22bec..0bb2826c81 100644
--- a/main/sorcery.c
+++ b/main/sorcery.c
@@ -1877,12 +1877,17 @@ static int sorcery_cache_create(void *obj, void *arg, int flags)
void *ast_sorcery_retrieve_by_id(const struct ast_sorcery *sorcery, const char *type, const char *id)
{
- RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup);
+ struct ast_sorcery_object_type *object_type;
void *object = NULL;
int i;
unsigned int cached = 0;
- if (!object_type || ast_strlen_zero(id)) {
+ if (ast_strlen_zero(id)) {
+ return NULL;
+ }
+
+ object_type = ao2_find(sorcery->types, type, OBJ_SEARCH_KEY);
+ if (!object_type) {
return NULL;
}
@@ -1910,6 +1915,7 @@ void *ast_sorcery_retrieve_by_id(const struct ast_sorcery *sorcery, const char *
}
AST_VECTOR_RW_UNLOCK(&object_type->wizards);
+ ao2_ref(object_type, -1);
return object;
}
--
GitLab