Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

sorcery.c: Minor optimizations.

Browse Source 
* Remove some unused parameters from internal functions:
sorcery_wizard_create()
sorcery_wizard_update()
sorcery_wizard_delete()

* Created the struct sorcery_observer_invocation ao2 object without a lock
since it is not needed in sorcery_observer_invocation_alloc().

* Cleanup generic ao2 container sorcery object id hash, sort, and cmp
functions.

Change-Id: Iff71d75f52bc1b8cee955456838c149faaa4f92e
changes/93/3493/2
Richard Mudgett 9 years ago
parent 29beb2890c
commit 74a91b9ee5
1 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File

103
main/sorcery.c
Unescape View File

@ -605,7 +605,7 @@ static int sorcery_generic_observer_remove(void *obj, void *arg, int flags)
{ {
const struct sorcery_global_observer *observer = obj; const struct sorcery_global_observer *observer = obj;
return (observer->callbacks == arg) ? CMP_MATCH | CMP_STOP : 0; return (observer->callbacks == arg) ? CMP_MATCH : 0;
} }
int ast_sorcery_global_observer_add(const struct ast_sorcery_global_observer *callbacks) int ast_sorcery_global_observer_add(const struct ast_sorcery_global_observer *callbacks)
@ -1349,8 +1349,10 @@ static void sorcery_observer_invocation_destroy(void *obj)
/*! \brief Allocator function for observer invocation */ /*! \brief Allocator function for observer invocation */
static struct sorcery_observer_invocation *sorcery_observer_invocation_alloc(struct ast_sorcery_object_type *object_type, void *object) static struct sorcery_observer_invocation *sorcery_observer_invocation_alloc(struct ast_sorcery_object_type *object_type, void *object)
{ {
struct sorcery_observer_invocation *invocation = ao2_alloc(sizeof(*invocation), sorcery_observer_invocation_destroy); struct sorcery_observer_invocation *invocation;
invocation = ao2_alloc_options(sizeof(*invocation),
sorcery_observer_invocation_destroy, AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!invocation) { if (!invocation) {
return NULL; return NULL;
} }
@ -1974,11 +1976,8 @@ struct ao2_container *ast_sorcery_retrieve_by_regex(const struct ast_sorcery *so
} }
/*! \brief Internal function which returns if the wizard has created the object */ /*! \brief Internal function which returns if the wizard has created the object */
static int sorcery_wizard_create(void *obj, void *arg, int flags) static int sorcery_wizard_create(const struct ast_sorcery_object_wizard *object_wizard, const struct sorcery_details *details)
{ {
const struct ast_sorcery_object_wizard *object_wizard = obj;
const struct sorcery_details *details = arg;
if (!object_wizard->wizard->callbacks.create) { if (!object_wizard->wizard->callbacks.create) {
ast_debug(5, "Sorcery wizard '%s' does not support creation\n", object_wizard->wizard->callbacks.name); ast_debug(5, "Sorcery wizard '%s' does not support creation\n", object_wizard->wizard->callbacks.name);
return 0; return 0;
@ -2033,7 +2032,8 @@ int ast_sorcery_create(const struct ast_sorcery *sorcery, void *object)
AST_VECTOR_RW_RDLOCK(&object_type->wizards); AST_VECTOR_RW_RDLOCK(&object_type->wizards);
for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) { for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) {
found_wizard = AST_VECTOR_GET(&object_type->wizards, i); found_wizard = AST_VECTOR_GET(&object_type->wizards, i);
if (!found_wizard->caching && sorcery_wizard_create(found_wizard, &sdetails, 0) == CMP_MATCH) { if (!found_wizard->caching
&& sorcery_wizard_create(found_wizard, &sdetails) == CMP_MATCH) {
object_wizard = found_wizard; object_wizard = found_wizard;
} }
} }
@ -2042,14 +2042,14 @@ int ast_sorcery_create(const struct ast_sorcery *sorcery, void *object)
for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) { for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) {
found_wizard = AST_VECTOR_GET(&object_type->wizards, i); found_wizard = AST_VECTOR_GET(&object_type->wizards, i);
if (found_wizard->caching) { if (found_wizard->caching) {
sorcery_wizard_create(found_wizard, &sdetails, 0); sorcery_wizard_create(found_wizard, &sdetails);
} }
} }
if (ao2_container_count(object_type->observers)) { if (ao2_container_count(object_type->observers)) {
struct sorcery_observer_invocation *invocation = sorcery_observer_invocation_alloc( struct sorcery_observer_invocation *invocation;
object_type, object);
invocation = sorcery_observer_invocation_alloc(object_type, object);
if (invocation if (invocation
&& ast_taskprocessor_push(object_type->serializer, sorcery_observers_notify_create, && ast_taskprocessor_push(object_type->serializer, sorcery_observers_notify_create,
invocation)) { invocation)) {
@ -2087,11 +2087,8 @@ static int sorcery_observers_notify_update(void *data)
} }
/*! \brief Internal function which returns if a wizard has updated the object */ /*! \brief Internal function which returns if a wizard has updated the object */
static int sorcery_wizard_update(void *obj, void *arg, int flags) static int sorcery_wizard_update(const struct ast_sorcery_object_wizard *object_wizard, const struct sorcery_details *details)
{ {
const struct ast_sorcery_object_wizard *object_wizard = obj;
const struct sorcery_details *details = arg;
if (!object_wizard->wizard->callbacks.update) { if (!object_wizard->wizard->callbacks.update) {
ast_debug(5, "Sorcery wizard '%s' does not support updating\n", object_wizard->wizard->callbacks.name); ast_debug(5, "Sorcery wizard '%s' does not support updating\n", object_wizard->wizard->callbacks.name);
return 0; return 0;
@ -2123,7 +2120,8 @@ int ast_sorcery_update(const struct ast_sorcery *sorcery, void *object)
AST_VECTOR_RW_RDLOCK(&object_type->wizards); AST_VECTOR_RW_RDLOCK(&object_type->wizards);
for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) { for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) {
found_wizard = AST_VECTOR_GET(&object_type->wizards, i); found_wizard = AST_VECTOR_GET(&object_type->wizards, i);
if (!found_wizard->caching && sorcery_wizard_update(found_wizard, &sdetails, 0) == CMP_MATCH) { if (!found_wizard->caching
&& sorcery_wizard_update(found_wizard, &sdetails) == CMP_MATCH) {
object_wizard = found_wizard; object_wizard = found_wizard;
} }
} }
@ -2132,14 +2130,14 @@ int ast_sorcery_update(const struct ast_sorcery *sorcery, void *object)
for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) { for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) {
found_wizard = AST_VECTOR_GET(&object_type->wizards, i); found_wizard = AST_VECTOR_GET(&object_type->wizards, i);
if (found_wizard->caching) { if (found_wizard->caching) {
sorcery_wizard_update(found_wizard, &sdetails, 0); sorcery_wizard_update(found_wizard, &sdetails);
} }
} }
if (ao2_container_count(object_type->observers)) { if (ao2_container_count(object_type->observers)) {
struct sorcery_observer_invocation *invocation = sorcery_observer_invocation_alloc( struct sorcery_observer_invocation *invocation;
object_type, object);
invocation = sorcery_observer_invocation_alloc(object_type, object);
if (invocation if (invocation
&& ast_taskprocessor_push(object_type->serializer, sorcery_observers_notify_update, && ast_taskprocessor_push(object_type->serializer, sorcery_observers_notify_update,
invocation)) { invocation)) {
@ -2177,11 +2175,8 @@ static int sorcery_observers_notify_delete(void *data)
} }
/*! \brief Internal function which returns if a wizard has deleted the object */ /*! \brief Internal function which returns if a wizard has deleted the object */
static int sorcery_wizard_delete(void *obj, void *arg, int flags) static int sorcery_wizard_delete(const struct ast_sorcery_object_wizard *object_wizard, const struct sorcery_details *details)
{ {
const struct ast_sorcery_object_wizard *object_wizard = obj;
const struct sorcery_details *details = arg;
if (!object_wizard->wizard->callbacks.delete) { if (!object_wizard->wizard->callbacks.delete) {
ast_debug(5, "Sorcery wizard '%s' does not support deletion\n", object_wizard->wizard->callbacks.name); ast_debug(5, "Sorcery wizard '%s' does not support deletion\n", object_wizard->wizard->callbacks.name);
return 0; return 0;
@ -2213,7 +2208,8 @@ int ast_sorcery_delete(const struct ast_sorcery *sorcery, void *object)
AST_VECTOR_RW_RDLOCK(&object_type->wizards); AST_VECTOR_RW_RDLOCK(&object_type->wizards);
for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) { for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) {
found_wizard = AST_VECTOR_GET(&object_type->wizards, i); found_wizard = AST_VECTOR_GET(&object_type->wizards, i);
if (!found_wizard->caching && sorcery_wizard_delete(found_wizard, &sdetails, 0) == CMP_MATCH) { if (!found_wizard->caching
&& sorcery_wizard_delete(found_wizard, &sdetails) == CMP_MATCH) {
object_wizard = found_wizard; object_wizard = found_wizard;
} }
} }
@ -2222,14 +2218,14 @@ int ast_sorcery_delete(const struct ast_sorcery *sorcery, void *object)
for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) { for (i = 0; i < AST_VECTOR_SIZE(&object_type->wizards); i++) {
found_wizard = AST_VECTOR_GET(&object_type->wizards, i); found_wizard = AST_VECTOR_GET(&object_type->wizards, i);
if (found_wizard->caching) { if (found_wizard->caching) {
sorcery_wizard_delete(found_wizard, &sdetails, 0); sorcery_wizard_delete(found_wizard, &sdetails);
} }
} }
if (ao2_container_count(object_type->observers)) { if (ao2_container_count(object_type->observers)) {
struct sorcery_observer_invocation *invocation = sorcery_observer_invocation_alloc( struct sorcery_observer_invocation *invocation;
object_type, object);
invocation = sorcery_observer_invocation_alloc(object_type, object);
if (invocation if (invocation
&& ast_taskprocessor_push(object_type->serializer, sorcery_observers_notify_delete, && ast_taskprocessor_push(object_type->serializer, sorcery_observers_notify_delete,
invocation)) { invocation)) {
@ -2338,7 +2334,7 @@ static int sorcery_observer_remove(void *obj, void *arg, int flags)
{ {
const struct ast_sorcery_object_type_observer *observer = obj; const struct ast_sorcery_object_type_observer *observer = obj;
return (observer->callbacks == arg) ? CMP_MATCH | CMP_STOP : 0; return (observer->callbacks == arg) ? CMP_MATCH : 0;
} }
void ast_sorcery_observer_remove(const struct ast_sorcery *sorcery, const char *type, const struct ast_sorcery_observer *callbacks) void ast_sorcery_observer_remove(const struct ast_sorcery *sorcery, const char *type, const struct ast_sorcery_observer *callbacks)
@ -2360,18 +2356,20 @@ void ast_sorcery_observer_remove(const struct ast_sorcery *sorcery, const char *
int ast_sorcery_object_id_sort(const void *obj, const void *arg, int flags) int ast_sorcery_object_id_sort(const void *obj, const void *arg, int flags)
{ {
const void *object_left = obj;
const void *object_right = arg;
const char *right_key = arg; const char *right_key = arg;
int cmp; int cmp;
switch (flags & OBJ_SEARCH_MASK) { switch (flags & OBJ_SEARCH_MASK) {
case OBJ_SEARCH_OBJECT: case OBJ_SEARCH_OBJECT:
right_key = ast_sorcery_object_get_id(arg); right_key = ast_sorcery_object_get_id(object_right);
/* Fall through */ /* Fall through */
case OBJ_SEARCH_KEY: case OBJ_SEARCH_KEY:
cmp = strcmp(ast_sorcery_object_get_id(obj), right_key); cmp = strcmp(ast_sorcery_object_get_id(object_left), right_key);
break; break;
case OBJ_SEARCH_PARTIAL_KEY: case OBJ_SEARCH_PARTIAL_KEY:
cmp = strncmp(ast_sorcery_object_get_id(obj), right_key, strlen(right_key)); cmp = strncmp(ast_sorcery_object_get_id(object_left), right_key, strlen(right_key));
break; break;
default: default:
cmp = 0; cmp = 0;
@ -2382,37 +2380,32 @@ int ast_sorcery_object_id_sort(const void *obj, const void *arg, int flags)
int ast_sorcery_object_id_compare(void *obj, void *arg, int flags) int ast_sorcery_object_id_compare(void *obj, void *arg, int flags)
{ {
const char *right_key = arg; int cmp;
int cmp = 0;
cmp = ast_sorcery_object_id_sort(obj, arg, flags);
if (cmp) {
return 0;
}
return CMP_MATCH;
}
int ast_sorcery_object_id_hash(const void *obj, int flags)
{
const char *key;
switch (flags & OBJ_SEARCH_MASK) { switch (flags & OBJ_SEARCH_MASK) {
case OBJ_SEARCH_OBJECT:
right_key = ast_sorcery_object_get_id(arg);
/* Fall through */
case OBJ_SEARCH_KEY: case OBJ_SEARCH_KEY:
if (strcmp(ast_sorcery_object_get_id(obj), right_key) == 0) { key = obj;
cmp = CMP_MATCH | CMP_STOP;
}
break; break;
case OBJ_SEARCH_PARTIAL_KEY: case OBJ_SEARCH_OBJECT:
if (strncmp(ast_sorcery_object_get_id(obj), right_key, strlen(right_key)) == 0) { key = ast_sorcery_object_get_id(obj);
cmp = CMP_MATCH;
}
break; break;
default: default:
cmp = 0; /* Hash can only work on something with a full key. */
break; ast_assert(0);
} return 0;
return cmp;
}
int ast_sorcery_object_id_hash(const void *obj, int flags) {
if (flags & OBJ_SEARCH_OBJECT) {
return ast_str_hash(ast_sorcery_object_get_id(obj));
} else if (flags & OBJ_SEARCH_KEY) {
return ast_str_hash(obj);
} }
return -1; return ast_str_hash(key);
} }
struct ast_sorcery_object_type *ast_sorcery_get_object_type(const struct ast_sorcery *sorcery, struct ast_sorcery_object_type *ast_sorcery_get_object_type(const struct ast_sorcery *sorcery,
@ -2429,7 +2422,7 @@ static int is_registered_cb(void *obj, void *arg, int flags)
if (object_field->name_regex if (object_field->name_regex
&& !regexec(object_field->name_regex, name, 0, NULL, 0)) { && !regexec(object_field->name_regex, name, 0, NULL, 0)) {
rc = CMP_MATCH | CMP_STOP; rc = CMP_MATCH;
} }
return rc; return rc;

Write Preview
Loading…
Cancel
Save