kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert some changes that accidentally got committed as a part of another fix.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@53134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-02-03 20:39:45 +00:00
parent 8c161f55e4
commit fed5b6a9b4
3 changed files with 16 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
apps/app_meetme.c
View File

@@ -139,7 +139,6 @@ static struct ast_conference {
struct ast_conf_user *firstuser; /* Pointer to the first user struct */ struct ast_conf_user *firstuser; /* Pointer to the first user struct */
struct ast_conf_user *lastuser; /* Pointer to the last user struct */ struct ast_conf_user *lastuser; /* Pointer to the last user struct */
time_t start; /* Start time (s) */ time_t start; /* Start time (s) */
int refcount;
int recording; /* recording status */ int recording; /* recording status */
int isdynamic; /* Created on the fly? */ int isdynamic; /* Created on the fly? */
int locked; /* Is the conference locked? */ int locked; /* Is the conference locked? */
@@ -439,7 +438,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int
ast_autoservice_stop(chan); ast_autoservice_stop(chan);
} }
static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic, int refcount) static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic)
{ {
struct ast_conference *cnf; struct ast_conference *cnf;
struct zt_confinfo ztc; struct zt_confinfo ztc;
@@ -502,8 +501,6 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin
ast_log(LOG_WARNING, "Out of memory\n"); ast_log(LOG_WARNING, "Out of memory\n");
} }
cnfout: cnfout:
if (cnf)
ast_atomic_fetchadd_int(&cnf->refcount, refcount);
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
return cnf; return cnf;
} }
@@ -838,8 +835,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (!user) { if (!user) {
ast_log(LOG_ERROR, "Out of memory\n"); ast_log(LOG_ERROR, "Out of memory\n");
if (ast_atomic_dec_and_test(&conf->refcount))
conf_free(conf);
return ret; return ret;
} }
@@ -1606,10 +1601,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
"Usernum: %d\r\n", "Usernum: %d\r\n",
chan->name, chan->uniqueid, conf->confno, user->user_no); chan->name, chan->uniqueid, conf->confno, user->user_no);
conf->users--; conf->users--;
ast_atomic_fetchadd_int(&conf->refcount, -1);
if (confflags & CONFFLAG_MARKEDUSER) if (confflags & CONFFLAG_MARKEDUSER)
conf->markedusers--; conf->markedusers--;
if (!conf->users && !conf->refcount) { if (!conf->users) {
/* No more users -- close this one out */ /* No more users -- close this one out */
conf_free(conf); conf_free(conf);
} else { } else {
@@ -1652,7 +1646,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
} }
static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, int make, int dynamic, char *dynamic_pin, static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, int make, int dynamic, char *dynamic_pin,
int refcount, struct ast_flags *confflags) struct ast_flags *confflags)
{ {
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
@@ -1664,8 +1658,6 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
if (!strcmp(confno, cnf->confno)) if (!strcmp(confno, cnf->confno))
break; break;
} }
if (cnf)
ast_atomic_fetchadd_int(&cnf->refcount, refcount);
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
if (!cnf) { if (!cnf) {
@@ -1678,9 +1670,9 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0) if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0)
return NULL; return NULL;
} }
cnf = build_conf(confno, dynamic_pin, "", make, dynamic, refcount); cnf = build_conf(confno, dynamic_pin, "", make, dynamic);
} else { } else {
cnf = build_conf(confno, "", "", make, dynamic, refcount); cnf = build_conf(confno, "", "", make, dynamic);
} }
} else { } else {
/* Check the config */ /* Check the config */
@@ -1702,14 +1694,14 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
/* Bingo it's a valid conference */ /* Bingo it's a valid conference */
if (pin) if (pin)
if (pinadmin) if (pinadmin)
cnf = build_conf(confno, pin, pinadmin, make, dynamic, refcount); cnf = build_conf(confno, pin, pinadmin, make, dynamic);
else else
cnf = build_conf(confno, pin, "", make, dynamic, refcount); cnf = build_conf(confno, pin, "", make, dynamic);
else else
if (pinadmin) if (pinadmin)
cnf = build_conf(confno, "", pinadmin, make, dynamic, refcount); cnf = build_conf(confno, "", pinadmin, make, dynamic);
else else
cnf = build_conf(confno, "", "", make, dynamic, refcount); cnf = build_conf(confno, "", "", make, dynamic);
break; break;
} }
} }
@@ -1772,11 +1764,10 @@ static int count_exec(struct ast_channel *chan, void *data)
} }
confnum = strsep(&localdata,"|"); confnum = strsep(&localdata,"|");
conf = find_conf(chan, confnum, 0, 0, NULL, 1, NULL); conf = find_conf(chan, confnum, 0, 0, NULL, NULL);
if (conf) { if (conf)
count = conf->users; count = conf->users;
ast_atomic_fetchadd_int(&conf->refcount, -1); else
} else
count = 0; count = 0;
if (!ast_strlen_zero(localdata)){ if (!ast_strlen_zero(localdata)){
@@ -1961,7 +1952,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
} }
if (!ast_strlen_zero(confno)) { if (!ast_strlen_zero(confno)) {
/* Check the validity of the conference */ /* Check the validity of the conference */
cnf = find_conf(chan, confno, 1, dynamic, the_pin, 1, &confflags); cnf = find_conf(chan, confno, 1, dynamic, the_pin, &confflags);
if (!cnf) { if (!cnf) {
res = ast_streamfile(chan, "conf-invalid", chan->language); res = ast_streamfile(chan, "conf-invalid", chan->language);
if (!res) if (!res)
@@ -2007,13 +1998,8 @@ static int conf_exec(struct ast_channel *chan, void *data)
ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n"); ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n");
break; break;
} }
if (res < 0) { if (res < 0)
ast_mutex_lock(&conflock);
if (ast_atomic_dec_and_test(&cnf->refcount))
conf_free(cnf);
ast_mutex_unlock(&conflock);
break; break;
}
pin[0] = res; pin[0] = res;
pin[1] = '\0'; pin[1] = '\0';
res = -1; res = -1;
@@ -2026,8 +2012,9 @@ static int conf_exec(struct ast_channel *chan, void *data)
allowretry = 0; allowretry = 0;
/* see if we need to get rid of the conference */ /* see if we need to get rid of the conference */
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
if (ast_atomic_dec_and_test(&cnf->refcount)) if (!cnf->users) {
conf_free(cnf); conf_free(cnf);
}
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
break; break;
} }

27
include/asterisk/lock.h
View File

@@ -666,31 +666,4 @@ static inline int ast_cond_timedwait(ast_cond_t *cond, ast_mutex_t *t, const str
#define pthread_create __use_ast_pthread_create_instead__ #define pthread_create __use_ast_pthread_create_instead__
#endif #endif
int ast_atomic_fetchadd_int_slow(volatile int *p, int v);
#include "asterisk/inline_api.h"
#if defined (__i386__)
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
{
__asm __volatile (
" lock xaddl %0, %1 ; "
: "+r" (v), /* 0 (result) */
"=m" (*p) /* 1 */
: "m" (*p)); /* 2 */
return (v);
})
#else /* low performance version in utils.c */
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
{
return ast_atomic_fetchadd_int_slow(p, v);
})
#endif
AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
{
int a = ast_atomic_fetchadd_int(p, -1);
return a == 1; /* true if the value is 0 now (so it was 1 previously) */
})
#endif /* _ASTERISK_LOCK_H */ #endif /* _ASTERISK_LOCK_H */

11
utils.c
View File

@@ -907,14 +907,3 @@ void ast_enable_packet_fragmentation(int sock)
#endif #endif
} }
AST_MUTEX_DEFINE_STATIC(fetchadd_m); /* used for all fetc&add ops */
int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
{
int ret;
ast_mutex_lock(&fetchadd_m);
ret = *p;
*p += v;
ast_mutex_unlock(&fetchadd_m);
return ret;
}