diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
commit | 3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d (patch) | |
tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /res/res_clioriginate.c | |
parent | f9d382fc079246930a99640d7835d6ae3e4149db (diff) |
This rather large commit changes the way modules are loaded.
As partly documented in loader.c and include/asterisk/module.h,
modules are now expected to return all of their methods and flags
into a structure 'mod_data', and are normally loaded with RTLD_NOW
| RTLD_LOCAL, so symbols are resolved immediately and conflicts
should be less likely. Only in a small number of cases (res_*,
typically) modules are loaded RTLD_GLOBAL, so they can export
symbols.
The core of the change is only the two files loader.c and
include/asterisk/module.h, all the rest is simply adaptation of the
existing modules to the new API, a rather mechanical (but believe
me, time and finger-consuming!) process whose detail you can figure
out by svn diff'ing any single module.
Expect some minor compilation issue after this change, please
report it on mantis http://bugs.digium.com/view.php?id=6968
so we collect all the feedback in one place.
I am just sorry that this change missed SVN version number 20000!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_clioriginate.c')
-rw-r--r-- | res/res_clioriginate.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c index 6a26bc23c..a9ebb3647 100644 --- a/res/res_clioriginate.c +++ b/res/res_clioriginate.c @@ -42,7 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); /*! The timeout for originated calls, in seconds */ #define TIMEOUT 30 -STANDARD_USECOUNT_DECL; +static struct module_symbols *me; static char orig_help[] = " There are two ways to use this command. A call can be originated between a\n" @@ -132,7 +132,7 @@ static int handle_orig(int fd, int argc, char *argv[]) if (ast_strlen_zero(argv[1]) || ast_strlen_zero(argv[2])) return RESULT_SHOWUSAGE; - STANDARD_INCREMENT_USECOUNT; + ast_atomic_fetchadd_int(&me->usecnt, +1); if (!strcasecmp("application", argv[2])) { res = orig_app(argv[1], argv[3], argv[4]); @@ -141,7 +141,7 @@ static int handle_orig(int fd, int argc, char *argv[]) } else res = RESULT_SHOWUSAGE; - STANDARD_DECREMENT_USECOUNT; + ast_atomic_fetchadd_int(&me->usecnt, -1); return res; } @@ -154,38 +154,32 @@ static char *complete_orig(const char *line, const char *word, int pos, int stat if (pos != 2) return NULL; - STANDARD_INCREMENT_USECOUNT; - + ast_atomic_fetchadd_int(&me->usecnt, +1); ret = ast_cli_complete(word, choices, state); - - STANDARD_DECREMENT_USECOUNT; + ast_atomic_fetchadd_int(&me->usecnt, -1); return ret; } -int unload_module(void) +static int unload_module(void *mod) { return ast_cli_unregister(&cli_orig); } -int load_module(void) +static int load_module(void *mod) { + me = mod; return ast_cli_register(&cli_orig); } -const char *description(void) +static const char *description(void) { return "Call origination from the CLI"; - -} - -int usecount(void) -{ - return 0; } -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } +STD_MOD(MOD_0 | NO_USECOUNT, NULL, NULL, NULL); |