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

This rather large commit changes the way modules are loaded.

Browse Source 
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
This commit is contained in:
Luigi Rizzo
2006-04-14 14:08:19 +00:00
parent 33a3a7375a
commit e43bc6634d
162 changed files with 1273 additions and 2386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
translate.c
View File

@@ -31,6 +31,7 @@
#include <string.h>
#include <stdio.h>
#define MOD_LOADER /* not really a module */
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -39,6 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/channel.h"
#include "asterisk/logger.h"
#include "asterisk/translate.h"
#include "asterisk/module.h"
#include "asterisk/options.h"
#include "asterisk/frame.h"
#include "asterisk/sched.h"
@@ -94,6 +96,8 @@ static void *newpvt(struct ast_translator *t)
int len;
int useplc = t->plc_samples > 0 && t->useplc; /* cache, because it can change on the fly */
char *ofs;
struct module_symbols *ms = t->module;
/*
* compute the required size adding private descriptor,
* plc, buffer, AST_FRIENDLY_OFFSET.
@@ -123,9 +127,7 @@ static void *newpvt(struct ast_translator *t)
free(pvt);
return NULL;
}
ast_mutex_lock(&t->lockp->lock);
t->lockp->usecnt++;
ast_mutex_unlock(&t->lockp->lock);
ast_atomic_fetchadd_int(&ms->usecnt, +1);
ast_update_use_count();
return pvt;
}
@@ -133,13 +135,12 @@ static void *newpvt(struct ast_translator *t)
static void destroy(struct ast_trans_pvt *pvt)
{
struct ast_translator *t = pvt->t;
struct module_symbols *ms = t->module;
if (t->destroy)
t->destroy(pvt);
free(pvt);
ast_mutex_lock(&t->lockp->lock);
t->lockp->usecnt--;
ast_mutex_unlock(&t->lockp->lock);
ast_atomic_fetchadd_int(&ms->usecnt, -1);
ast_update_use_count();
}
@@ -519,14 +520,15 @@ static char show_trans_usage[] =
static struct ast_cli_entry show_trans =
{ { "show", "translation", NULL }, show_translation, "Display translation matrix", show_trans_usage };
int ast_register_translator(struct ast_translator *t)
int ast_register_translator(struct ast_translator *t, void *module)
{
static int added_cli = 0;
if (t->lockp == NULL) {
ast_log(LOG_WARNING, "Missing lock pointer, you need to supply one\n");
if (module == NULL) {
ast_log(LOG_WARNING, "Missing module pointer, you need to supply one\n");
return -1;
}
t->module = module;
if (t->buf_size == 0) {
ast_log(LOG_WARNING, "empty buf size, you need to supply one\n");
return -1;
@@ -561,10 +563,6 @@ int ast_register_translator(struct ast_translator *t)
int align = (char *)&p.b - (char *)&p.a;
t->buf_size = ((t->buf_size + align - 1)/align)*align;
}
if (t->lockp->usecnt < 0) { /* XXX need to initialize the lock */
ast_mutex_init(&t->lockp->lock);
t->lockp->usecnt = 0;
}
if (t->frameout == NULL)
t->frameout = default_frameout;