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

Pass the sorcery instance to wizards for CUD operations as well as retrieve.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2013-03-20 14:52:23 +00:00
parent 6aee9178d5
commit 07d01e1c41
4 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/sorcery.h
View File

@@ -203,7 +203,7 @@ struct ast_sorcery_wizard {
void (*reload)(void *data, const struct ast_sorcery *sorcery, const char *type); void (*reload)(void *data, const struct ast_sorcery *sorcery, const char *type);
/*! \brief Callback for creating an object */ /*! \brief Callback for creating an object */
int (*create)(void *data, void *object); int (*create)(const struct ast_sorcery *sorcery, void *data, void *object);
/*! \brief Callback for retrieving an object using an id */ /*! \brief Callback for retrieving an object using an id */
void *(*retrieve_id)(const struct ast_sorcery *sorcery, void *data, const char *type, const char *id); void *(*retrieve_id)(const struct ast_sorcery *sorcery, void *data, const char *type, const char *id);
@@ -218,10 +218,10 @@ struct ast_sorcery_wizard {
void (*retrieve_multiple)(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const struct ast_variable *fields); void (*retrieve_multiple)(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const struct ast_variable *fields);
/*! \brief Callback for updating an object */ /*! \brief Callback for updating an object */
int (*update)(void *data, void *object); int (*update)(const struct ast_sorcery *sorcery, void *data, void *object);
/*! \brief Callback for deleting an object */ /*! \brief Callback for deleting an object */
int (*delete)(void *data, void *object); int (*delete)(const struct ast_sorcery *sorcery, void *data, void *object);
/*! \brief Callback for closing a wizard */ /*! \brief Callback for closing a wizard */
void (*close)(void *data); void (*close)(void *data);

40
main/sorcery.c
View File

@@ -888,16 +888,25 @@ int ast_sorcery_diff(const struct ast_sorcery *sorcery, const void *original, co
} }
} }
/*! \brief Structure used when calling create, update, or delete */
struct sorcery_details {
/*! \brief Pointer to the sorcery instance */
const struct ast_sorcery *sorcery;
/*! \brief Pointer to the object itself */
void *obj;
};
/*! \brief Internal function used to create an object in caching wizards */ /*! \brief Internal function used to create an object in caching wizards */
static int sorcery_cache_create(void *obj, void *arg, int flags) static int sorcery_cache_create(void *obj, void *arg, int flags)
{ {
struct ast_sorcery_object_wizard *object_wizard = obj; const struct ast_sorcery_object_wizard *object_wizard = obj;
const struct sorcery_details *details = arg;
if (!object_wizard->caching || !object_wizard->wizard->create) { if (!object_wizard->caching || !object_wizard->wizard->create) {
return 0; return 0;
} }
object_wizard->wizard->create(object_wizard->data, arg); object_wizard->wizard->create(details->sorcery, object_wizard->data, details->obj);
return 0; return 0;
} }
@@ -1014,8 +1023,9 @@ struct ao2_container *ast_sorcery_retrieve_by_regex(const struct ast_sorcery *so
static int sorcery_wizard_create(void *obj, void *arg, int flags) static int sorcery_wizard_create(void *obj, void *arg, int flags)
{ {
const struct ast_sorcery_object_wizard *object_wizard = obj; const struct ast_sorcery_object_wizard *object_wizard = obj;
const struct sorcery_details *details = arg;
return (!object_wizard->caching && !object_wizard->wizard->create(object_wizard->data, arg)) ? CMP_MATCH | CMP_STOP : 0; return (!object_wizard->caching && !object_wizard->wizard->create(details->sorcery, object_wizard->data, details->obj)) ? CMP_MATCH | CMP_STOP : 0;
} }
int ast_sorcery_create(const struct ast_sorcery *sorcery, void *object) int ast_sorcery_create(const struct ast_sorcery *sorcery, void *object)
@@ -1023,12 +1033,16 @@ int ast_sorcery_create(const struct ast_sorcery *sorcery, void *object)
const struct ast_sorcery_object_details *details = object; const struct ast_sorcery_object_details *details = object;
RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, details->type, OBJ_KEY), ao2_cleanup); RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, details->type, OBJ_KEY), ao2_cleanup);
RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, NULL, ao2_cleanup); RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, NULL, ao2_cleanup);
struct sorcery_details sdetails = {
.sorcery = sorcery,
.obj = object,
};
if (!object_type) { if (!object_type) {
return -1; return -1;
} }
object_wizard = ao2_callback(object_type->wizards, 0, sorcery_wizard_create, object); object_wizard = ao2_callback(object_type->wizards, 0, sorcery_wizard_create, &sdetails);
return object_wizard ? 0 : -1; return object_wizard ? 0 : -1;
} }
@@ -1037,8 +1051,9 @@ int ast_sorcery_create(const struct ast_sorcery *sorcery, void *object)
static int sorcery_wizard_update(void *obj, void *arg, int flags) static int sorcery_wizard_update(void *obj, void *arg, int flags)
{ {
const struct ast_sorcery_object_wizard *object_wizard = obj; const struct ast_sorcery_object_wizard *object_wizard = obj;
const struct sorcery_details *details = arg;
return (object_wizard->wizard->update && !object_wizard->wizard->update(object_wizard->data, arg) && return (object_wizard->wizard->update && !object_wizard->wizard->update(details->sorcery, object_wizard->data, details->obj) &&
!object_wizard->caching) ? CMP_MATCH | CMP_STOP : 0; !object_wizard->caching) ? CMP_MATCH | CMP_STOP : 0;
} }
@@ -1047,12 +1062,16 @@ int ast_sorcery_update(const struct ast_sorcery *sorcery, void *object)
const struct ast_sorcery_object_details *details = object; const struct ast_sorcery_object_details *details = object;
RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, details->type, OBJ_KEY), ao2_cleanup); RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, details->type, OBJ_KEY), ao2_cleanup);
RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, NULL, ao2_cleanup); RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, NULL, ao2_cleanup);
struct sorcery_details sdetails = {
.sorcery = sorcery,
.obj = object,
};
if (!object_type) { if (!object_type) {
return -1; return -1;
} }
object_wizard = ao2_callback(object_type->wizards, 0, sorcery_wizard_update, object); object_wizard = ao2_callback(object_type->wizards, 0, sorcery_wizard_update, &sdetails);
return object_wizard ? 0 : -1; return object_wizard ? 0 : -1;
} }
@@ -1061,8 +1080,9 @@ int ast_sorcery_update(const struct ast_sorcery *sorcery, void *object)
static int sorcery_wizard_delete(void *obj, void *arg, int flags) static int sorcery_wizard_delete(void *obj, void *arg, int flags)
{ {
const struct ast_sorcery_object_wizard *object_wizard = obj; const struct ast_sorcery_object_wizard *object_wizard = obj;
const struct sorcery_details *details = arg;
return (object_wizard->wizard->delete && !object_wizard->wizard->delete(object_wizard->data, arg) && return (object_wizard->wizard->delete && !object_wizard->wizard->delete(details->sorcery, object_wizard->data, details->obj) &&
!object_wizard->caching) ? CMP_MATCH | CMP_STOP : 0; !object_wizard->caching) ? CMP_MATCH | CMP_STOP : 0;
} }
@@ -1071,12 +1091,16 @@ int ast_sorcery_delete(const struct ast_sorcery *sorcery, void *object)
const struct ast_sorcery_object_details *details = object; const struct ast_sorcery_object_details *details = object;
RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, details->type, OBJ_KEY), ao2_cleanup); RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, details->type, OBJ_KEY), ao2_cleanup);
RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, NULL, ao2_cleanup); RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, NULL, ao2_cleanup);
struct sorcery_details sdetails = {
.sorcery = sorcery,
.obj = object,
};
if (!object_type) { if (!object_type) {
return -1; return -1;
} }
object_wizard = ao2_callback(object_type->wizards, 0, sorcery_wizard_delete, object); object_wizard = ao2_callback(object_type->wizards, 0, sorcery_wizard_delete, &sdetails);
return object_wizard ? 0 : -1; return object_wizard ? 0 : -1;
} }

12
res/res_sorcery_memory.c
View File

@@ -42,14 +42,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define OBJECT_BUCKETS 53 #define OBJECT_BUCKETS 53
static void *sorcery_memory_open(const char *data); static void *sorcery_memory_open(const char *data);
static int sorcery_memory_create(void *data, void *object); static int sorcery_memory_create(const struct ast_sorcery *sorcery, void *data, void *object);
static void *sorcery_memory_retrieve_id(const struct ast_sorcery *sorcery, void *data, const char *type, const char *id); static void *sorcery_memory_retrieve_id(const struct ast_sorcery *sorcery, void *data, const char *type, const char *id);
static void *sorcery_memory_retrieve_fields(const struct ast_sorcery *sorcery, void *data, const char *type, const struct ast_variable *fields); static void *sorcery_memory_retrieve_fields(const struct ast_sorcery *sorcery, void *data, const char *type, const struct ast_variable *fields);
static void sorcery_memory_retrieve_multiple(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, static void sorcery_memory_retrieve_multiple(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects,
const struct ast_variable *fields); const struct ast_variable *fields);
static void sorcery_memory_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex); static void sorcery_memory_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex);
static int sorcery_memory_update(void *data, void *object); static int sorcery_memory_update(const struct ast_sorcery *sorcery, void *data, void *object);
static int sorcery_memory_delete(void *data, void *object); static int sorcery_memory_delete(const struct ast_sorcery *sorcery, void *data, void *object);
static void sorcery_memory_close(void *data); static void sorcery_memory_close(void *data);
static struct ast_sorcery_wizard memory_object_wizard = { static struct ast_sorcery_wizard memory_object_wizard = {
@@ -96,7 +96,7 @@ static int sorcery_memory_cmp(void *obj, void *arg, int flags)
return !strcmp(ast_sorcery_object_get_id(obj), flags & OBJ_KEY ? id : ast_sorcery_object_get_id(arg)) ? CMP_MATCH | CMP_STOP : 0; return !strcmp(ast_sorcery_object_get_id(obj), flags & OBJ_KEY ? id : ast_sorcery_object_get_id(arg)) ? CMP_MATCH | CMP_STOP : 0;
} }
static int sorcery_memory_create(void *data, void *object) static int sorcery_memory_create(const struct ast_sorcery *sorcery, void *data, void *object)
{ {
ao2_link(data, object); ao2_link(data, object);
return 0; return 0;
@@ -184,7 +184,7 @@ static void sorcery_memory_retrieve_regex(const struct ast_sorcery *sorcery, voi
regfree(&expression); regfree(&expression);
} }
static int sorcery_memory_update(void *data, void *object) static int sorcery_memory_update(const struct ast_sorcery *sorcery, void *data, void *object)
{ {
RAII_VAR(void *, existing, NULL, ao2_cleanup); RAII_VAR(void *, existing, NULL, ao2_cleanup);
@@ -202,7 +202,7 @@ static int sorcery_memory_update(void *data, void *object)
return 0; return 0;
} }
static int sorcery_memory_delete(void *data, void *object) static int sorcery_memory_delete(const struct ast_sorcery *sorcery, void *data, void *object)
{ {
RAII_VAR(void *, existing, ao2_find(data, ast_sorcery_object_get_id(object), OBJ_KEY | OBJ_UNLINK), ao2_cleanup); RAII_VAR(void *, existing, ao2_find(data, ast_sorcery_object_get_id(object), OBJ_KEY | OBJ_UNLINK), ao2_cleanup);

6
tests/test_sorcery.c
View File

@@ -138,7 +138,7 @@ static void test_apply_handler(const struct ast_sorcery *sorcery, void *obj)
/*! \brief Global scope caching structure for testing */ /*! \brief Global scope caching structure for testing */
static struct sorcery_test_caching cache = { 0, }; static struct sorcery_test_caching cache = { 0, };
static int sorcery_test_create(void *data, void *object) static int sorcery_test_create(const struct ast_sorcery *sorcery, void *data, void *object)
{ {
cache.created = 1; cache.created = 1;
cache.updated = 0; cache.updated = 0;
@@ -151,13 +151,13 @@ static void *sorcery_test_retrieve_id(const struct ast_sorcery *sorcery, void *d
return (cache.created && !cache.deleted) ? ast_sorcery_alloc(sorcery, type, id) : NULL; return (cache.created && !cache.deleted) ? ast_sorcery_alloc(sorcery, type, id) : NULL;
} }
static int sorcery_test_update(void *data, void *object) static int sorcery_test_update(const struct ast_sorcery *sorcery, void *data, void *object)
{ {
cache.updated = 1; cache.updated = 1;
return 0; return 0;
} }
static int sorcery_test_delete(void *data, void *object) static int sorcery_test_delete(const struct ast_sorcery *sorcery, void *data, void *object)
{ {
cache.deleted = 1; cache.deleted = 1;
return 0; return 0;