diff options
author | George Joseph <george.joseph@fairview5.com> | 2014-02-20 20:45:30 +0000 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2014-02-20 20:45:30 +0000 |
commit | a94c8562fd70bc5b317a434db36f19fd34c70f8c (patch) | |
tree | 33079e3ce84fd9b653bbaf2e448d28b2fed06a4d /tests/test_sorcery.c | |
parent | 8e1c5b62be1a4e33d4ec0167fdba9596f213baaa (diff) |
sorcery: Create sorcery instance registry.
In order to retrieve an arbitrary sorcery instance from a dialplan function
(or any place else) there needs to be a registry of sorcery instances.
ast_sorcery_init now creates a hashtab as a registry.
ast_sorcery_open now checks the hashtab for an existing sorcery instance
matching the caller's module name. If it finds one, it bumps the
refcount and returns it. If not, it creates a new sorcery instance,
adds it to the hashtab, then returns it.
ast_sorcery_retrieve_by_module_name is a new function that does a hashtab
lookup by module name. It can be called by the future dialplan function.
res_pjsip/config_system needed a small change to share the main res_pjsip
sorcery instance.
tests/test_sorcery was updated to include a test for the registry.
(closes issue ASTERISK-22537)
Review: http://reviewboard.asterisk.org/r/3184/
........
Merged revisions 408518 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@408519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_sorcery.c')
-rw-r--r-- | tests/test_sorcery.c | 55 |
1 files changed, 53 insertions, 2 deletions
diff --git a/tests/test_sorcery.c b/tests/test_sorcery.c index d2cd97c78..fe1992bc0 100644 --- a/tests/test_sorcery.c +++ b/tests/test_sorcery.c @@ -35,6 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "") #include "asterisk/test.h" #include "asterisk/module.h" +#include "asterisk/astobj2.h" #include "asterisk/sorcery.h" #include "asterisk/logger.h" #include "asterisk/json.h" @@ -294,24 +295,74 @@ AST_TEST_DEFINE(wizard_registration) AST_TEST_DEFINE(sorcery_open) { RAII_VAR(struct ast_sorcery *, sorcery, NULL, ast_sorcery_unref); + RAII_VAR(struct ast_sorcery *, sorcery2, NULL, ast_sorcery_unref); + int refcount; switch (cmd) { case TEST_INIT: info->name = "open"; info->category = "/main/sorcery/"; - info->summary = "sorcery open unit test"; + info->summary = "sorcery open/close unit test"; info->description = - "Test opening of sorcery"; + "Test opening of sorcery and registry operations"; return AST_TEST_NOT_RUN; case TEST_EXECUTE: break; } + if ((sorcery = ast_sorcery_retrieve_by_module_name(AST_MODULE))) { + ast_test_status_update(test, "There should NOT have been an existing sorcery instance\n"); + return AST_TEST_FAIL; + } + if (!(sorcery = ast_sorcery_open())) { ast_test_status_update(test, "Failed to open new sorcery structure\n"); return AST_TEST_FAIL; } + if (!(sorcery2 = ast_sorcery_retrieve_by_module_name(AST_MODULE))) { + ast_test_status_update(test, "Failed to find sorcery structure in registry\n"); + return AST_TEST_FAIL; + } + + if (sorcery2 != sorcery) { + ast_test_status_update(test, "Should have gotten same sorcery on retrieve\n"); + return AST_TEST_FAIL; + } + ast_sorcery_unref(sorcery2); + + if ((refcount = ao2_ref(sorcery, 0)) != 2) { + ast_test_status_update(test, "Should have been 2 references to sorcery instead of %d\n", refcount); + return AST_TEST_FAIL; + } + + if (!(sorcery2 = ast_sorcery_open())) { + ast_test_status_update(test, "Failed to open second sorcery structure\n"); + return AST_TEST_FAIL; + } + + if (sorcery2 != sorcery) { + ast_test_status_update(test, "Should have gotten same sorcery on 2nd open\n"); + return AST_TEST_FAIL; + } + + if ((refcount = ao2_ref(sorcery, 0)) != 3) { + ast_test_status_update(test, "Should have been 3 references to sorcery instead of %d\n", refcount); + return AST_TEST_FAIL; + } + + ast_sorcery_unref(sorcery); + ast_sorcery_unref(sorcery2); + + sorcery2 = NULL; + + if ((sorcery = ast_sorcery_retrieve_by_module_name(AST_MODULE))) { + ast_sorcery_unref(sorcery); + sorcery = NULL; + ast_test_status_update(test, "Should NOT have found sorcery structure in registry\n"); + return AST_TEST_FAIL; + } + return AST_TEST_PASS; } |