diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 22:46:31 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 22:46:31 +0000 |
| commit | c7776916251e958e39a2fefd6a28a92fda4db23a (patch) | |
| tree | 13789be06a91f943c067cfb42b6a1219d6328d6f /channels/chan_alsa.c | |
| parent | 2fca1655a1f427219d3a65e2c403a76bde344352 (diff) | |
Update channel drivers to use module referencing so that unloading them while in use will not result in crashes. (issue #8897 reported by junky)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51788 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
| -rw-r--r-- | channels/chan_alsa.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index e74df21cb..83900a3de 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -113,11 +113,9 @@ static char outdevname[50] = ALSA_OUTDEV; static struct timeval lasttime; #endif -static int usecnt; static int silencesuppression = 0; static int silencethreshold = 1000; -AST_MUTEX_DEFINE_STATIC(usecnt_lock); AST_MUTEX_DEFINE_STATIC(alsalock); static const char tdesc[] = "ALSA Console Channel Driver"; @@ -573,9 +571,7 @@ static int alsa_hangup(struct ast_channel *c) c->tech_pvt = NULL; alsa.owner = NULL; ast_verbose(" << Hangup on console >> \n"); - ast_mutex_lock(&usecnt_lock); - usecnt--; - ast_mutex_unlock(&usecnt_lock); + ast_module_unref(ast_module_info->self); if (hookstate) { hookstate = 0; if (!autoanswer) { @@ -800,10 +796,7 @@ static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state) if (!ast_strlen_zero(language)) ast_string_field_set(tmp, language, language); p->owner = tmp; - ast_mutex_lock(&usecnt_lock); - usecnt++; - ast_mutex_unlock(&usecnt_lock); - ast_update_use_count(); + ast_module_ref(ast_module_info->self); ast_jb_configure(tmp, &global_jbconf); if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { |