diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
| commit | e43bc6634dc60ca897a848ca3301f52c74330279 (patch) | |
| tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /include/asterisk/translate.h | |
| parent | 33a3a7375a4917455495c08c8602bfe453580fd1 (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: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/translate.h')
| -rw-r--r-- | include/asterisk/translate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h index 8f1a86759..a83cfa41e 100644 --- a/include/asterisk/translate.h +++ b/include/asterisk/translate.h @@ -33,7 +33,7 @@ extern "C" { #include "asterisk/frame.h" #include "asterisk/plc.h" #include "asterisk/linkedlists.h" -#include "asterisk/module.h" +// XXX #include "asterisk/module.h" #endif struct ast_trans_pvt; /* declared below */ @@ -98,7 +98,7 @@ struct ast_translator { int plc_samples; /* set to the plc block size if used, 0 otherwise */ int useplc; /* current status of plc, changed at runtime */ - struct ast_module_lock *lockp; + void *module; /* opaque reference to the parent module */ int cost; /*! Cost in milliseconds for encoding/decoding 1 second of sound */ AST_LIST_ENTRY(ast_translator) list; /*! link field */ @@ -147,7 +147,7 @@ struct ast_trans_pvt; * This registers a codec translator with asterisk * Returns 0 on success, -1 on failure */ -int ast_register_translator(struct ast_translator *t); +int ast_register_translator(struct ast_translator *t, void *module); /*! * \brief Unregister a translator |