kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

This is the 1.6.1 version of trunk commit 156883.

Browse Source 
It is functionally equivalent to the 1.6.0 commit



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-11-14 16:57:04 +00:00
parent 786b83aa69
commit 2831947109
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app_queue.c
View File

@@ -67,6 +67,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/time.h>
#include <sys/signal.h>
#include <netinet/in.h>
#include <ctype.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -589,7 +590,8 @@ static int strat2int(const char *strategy)
static int queue_hash_cb(const void *obj, const int flags)
{
const struct call_queue *q = obj;
return ast_str_hash(q->name);
return ast_str_case_hash(q->name);
}
static int queue_cmp_cb(void *obj, void *arg, int flags)
@@ -1483,7 +1485,6 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
/* Delete if unused (else will be deleted when last caller leaves). */
ao2_unlink(queues, q);
ao2_unlock(q);
queue_unref(q);
}
return NULL;
}
@@ -2019,8 +2020,6 @@ static void leave_queue(struct queue_ent *qe)
if (q->dead) {
/* It's dead and nobody is in it, so kill it */
ao2_unlink(queues, q);
/* unref the container's reference to the queue */
queue_unref(q);
}
/* unref the explicit ref earlier in the function */
queue_unref(q);
@@ -2075,11 +2074,10 @@ static int compare_weight(struct call_queue *rq, struct member *member)
}
}
ao2_unlock(q);
queue_unref(q);
if (found) {
queue_unref(q);
break;
}
queue_unref(q);
}
return found;
}
@@ -4043,6 +4041,8 @@ static int remove_from_queue(const char *queuename, const char *interface)
if (!mem->dynamic) {
ao2_ref(mem, -1);
ao2_unlock(q);
queue_unref(q);
ao2_unlock(queues);
return RES_NOT_DYNAMIC;
}
q->membercount--;
@@ -5619,13 +5619,15 @@ static char *__queues_show(struct mansession *s, int fd, int argc, char **argv)
}
}
queue_iter = ao2_iterator_init(queues, 0);
queue_iter = ao2_iterator_init(queues, F_AO2I_DONTLOCK);
ao2_lock(queues);
while ((q = ao2_iterator_next(&queue_iter))) {
float sl;
ao2_lock(q);
if (argc == 3 && strcasecmp(q->name, argv[2])) {
ao2_unlock(q);
queue_unref(q);
continue;
}
found = 1;
@@ -5696,6 +5698,7 @@ static char *__queues_show(struct mansession *s, int fd, int argc, char **argv)
}
queue_unref(q); /* Unref the iterator's reference */
}
ao2_unlock(queues);
if (!found) {
if (argc == 3)
ast_str_set(&out, 0, "No such queue: %s.", argv[2]);

19
include/asterisk/strings.h
View File

@@ -23,6 +23,8 @@
#ifndef _ASTERISK_STRINGS_H
#define _ASTERISK_STRINGS_H
#include <ctype.h>
#include "asterisk/inline_api.h"
#include "asterisk/utils.h"
#include "asterisk/threadstorage.h"
@@ -723,4 +725,21 @@ static force_inline int ast_str_hash(const char *str)
return abs(hash);
}
/*!
* \brief Compute a hash value on a case-insensitive string
*
* Uses the same hash algorithm as ast_str_hash, but converts
* all characters to lowercase prior to computing a hash. This
* allows for easy case-insensitive lookups in a hash table.
*/
static force_inline int ast_str_case_hash(const char *str)
{
int hash = 5381;
while (*str) {
hash = hash * 33 ^ tolower(*str++);
}
return abs(hash);
}
#endif /* _ASTERISK_STRINGS_H */