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

Use read/write lock based lists for group counting.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-06-13 18:23:12 +00:00
parent c4c732578f
commit 679733c52a
4 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
funcs/func_groupcount.c
View File

@@ -100,7 +100,7 @@ static int group_function_read(struct ast_channel *chan, const char *cmd,
{ {
struct ast_group_info *gi = NULL; struct ast_group_info *gi = NULL;
ast_app_group_list_lock(); ast_app_group_list_rdlock();
gi = ast_app_group_list_head(); gi = ast_app_group_list_head();
while (gi) { while (gi) {
@@ -158,7 +158,7 @@ static int group_list_function_read(struct ast_channel *chan, const char *cmd,
if (!chan) if (!chan)
return -1; return -1;
ast_app_group_list_lock(); ast_app_group_list_rdlock();
gi = ast_app_group_list_head(); gi = ast_app_group_list_head();
while (gi) { while (gi) {

7
include/asterisk/app.h
View File

@@ -236,8 +236,11 @@ int ast_app_group_discard(struct ast_channel *chan);
/*! Update all group counting for a channel to a new one */ /*! Update all group counting for a channel to a new one */
int ast_app_group_update(struct ast_channel *oldchan, struct ast_channel *newchan); int ast_app_group_update(struct ast_channel *oldchan, struct ast_channel *newchan);
/*! Lock the group count list */ /*! Write Lock the group count list */
int ast_app_group_list_lock(void); int ast_app_group_list_wrlock(void);
/*! Read Lock the group count list */
int ast_app_group_list_rdlock(void);
/*! Get the head of the group count list */ /*! Get the head of the group count list */
struct ast_group_info *ast_app_group_list_head(void); struct ast_group_info *ast_app_group_list_head(void);

55
main/app.c
View File

@@ -53,7 +53,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define MAX_OTHER_FORMATS 10 #define MAX_OTHER_FORMATS 10
static AST_LIST_HEAD_STATIC(groups, ast_group_info); static AST_RWLIST_HEAD_STATIC(groups, ast_group_info);
/*! /*!
* \brief This function presents a dialtone and reads an extension into 'collect' * \brief This function presents a dialtone and reads an extension into 'collect'
@@ -874,15 +874,15 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data)
if (!ast_strlen_zero(category)) if (!ast_strlen_zero(category))
len += strlen(category) + 1; len += strlen(category) + 1;
AST_LIST_LOCK(&groups); AST_RWLIST_WRLOCK(&groups);
AST_LIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) { AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) {
if ((gi->chan == chan) && ((ast_strlen_zero(category) && ast_strlen_zero(gi->category)) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) { if ((gi->chan == chan) && ((ast_strlen_zero(category) && ast_strlen_zero(gi->category)) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) {
AST_LIST_REMOVE_CURRENT(&groups, list); AST_RWLIST_REMOVE_CURRENT(&groups, list);
free(gi); free(gi);
break; break;
} }
} }
AST_LIST_TRAVERSE_SAFE_END AST_RWLIST_TRAVERSE_SAFE_END
if ((gi = calloc(1, len))) { if ((gi = calloc(1, len))) {
gi->chan = chan; gi->chan = chan;
@@ -892,12 +892,12 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data)
gi->category = (char *) gi + sizeof(*gi) + strlen(group) + 1; gi->category = (char *) gi + sizeof(*gi) + strlen(group) + 1;
strcpy(gi->category, category); strcpy(gi->category, category);
} }
AST_LIST_INSERT_TAIL(&groups, gi, list); AST_RWLIST_INSERT_TAIL(&groups, gi, list);
} else { } else {
res = -1; res = -1;
} }
AST_LIST_UNLOCK(&groups); AST_RWLIST_UNLOCK(&groups);
return res; return res;
} }
@@ -910,12 +910,12 @@ int ast_app_group_get_count(const char *group, const char *category)
if (ast_strlen_zero(group)) if (ast_strlen_zero(group))
return 0; return 0;
AST_LIST_LOCK(&groups); AST_RWLIST_RDLOCK(&groups);
AST_LIST_TRAVERSE(&groups, gi, list) { AST_RWLIST_TRAVERSE(&groups, gi, list) {
if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category)))
count++; count++;
} }
AST_LIST_UNLOCK(&groups); AST_RWLIST_UNLOCK(&groups);
return count; return count;
} }
@@ -933,12 +933,12 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category)
if (regcomp(&regexbuf, groupmatch, REG_EXTENDED | REG_NOSUB)) if (regcomp(&regexbuf, groupmatch, REG_EXTENDED | REG_NOSUB))
return 0; return 0;
AST_LIST_LOCK(&groups); AST_RWLIST_RDLOCK(&groups);
AST_LIST_TRAVERSE(&groups, gi, list) { AST_RWLIST_TRAVERSE(&groups, gi, list) {
if (!regexec(&regexbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) if (!regexec(&regexbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category)))
count++; count++;
} }
AST_LIST_UNLOCK(&groups); AST_RWLIST_UNLOCK(&groups);
regfree(&regexbuf); regfree(&regexbuf);
@@ -949,12 +949,12 @@ int ast_app_group_update(struct ast_channel *old, struct ast_channel *new)
{ {
struct ast_group_info *gi = NULL; struct ast_group_info *gi = NULL;
AST_LIST_LOCK(&groups); AST_RWLIST_WRLOCK(&groups);
AST_LIST_TRAVERSE(&groups, gi, list) { AST_RWLIST_TRAVERSE(&groups, gi, list) {
if (gi->chan == old) if (gi->chan == old)
gi->chan = new; gi->chan = new;
} }
AST_LIST_UNLOCK(&groups); AST_RWLIST_UNLOCK(&groups);
return 0; return 0;
} }
@@ -963,32 +963,37 @@ int ast_app_group_discard(struct ast_channel *chan)
{ {
struct ast_group_info *gi = NULL; struct ast_group_info *gi = NULL;
AST_LIST_LOCK(&groups); AST_RWLIST_WRLOCK(&groups);
AST_LIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) { AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) {
if (gi->chan == chan) { if (gi->chan == chan) {
AST_LIST_REMOVE_CURRENT(&groups, list); AST_RWLIST_REMOVE_CURRENT(&groups, list);
ast_free(gi); ast_free(gi);
} }
} }
AST_LIST_TRAVERSE_SAFE_END AST_RWLIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&groups); AST_RWLIST_UNLOCK(&groups);
return 0; return 0;
} }
int ast_app_group_list_lock(void) int ast_app_group_list_wrlock(void)
{ {
return AST_LIST_LOCK(&groups); return AST_RWLIST_WRLOCK(&groups);
}
int ast_app_group_list_rdlock(void)
{
return AST_RWLIST_RDLOCK(&groups);
} }
struct ast_group_info *ast_app_group_list_head(void) struct ast_group_info *ast_app_group_list_head(void)
{ {
return AST_LIST_FIRST(&groups); return AST_RWLIST_FIRST(&groups);
} }
int ast_app_group_list_unlock(void) int ast_app_group_list_unlock(void)
{ {
return AST_LIST_UNLOCK(&groups); return AST_RWLIST_UNLOCK(&groups);
} }
unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen) unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen)

2
main/cli.c
View File

@@ -923,7 +923,7 @@ static int group_show_channels(int fd, int argc, char *argv[])
ast_cli(fd, FORMAT_STRING, "Channel", "Group", "Category"); ast_cli(fd, FORMAT_STRING, "Channel", "Group", "Category");
ast_app_group_list_lock(); ast_app_group_list_rdlock();
gi = ast_app_group_list_head(); gi = ast_app_group_list_head();
while (gi) { while (gi) {