From 5dfefa5ee6e6a836f61a27d1d9348ff8564fba89 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 29 Aug 2008 17:47:17 +0000
Subject: [PATCH] Merged revisions 140488 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140488 | mmichelson | 2008-08-29 12:34:17 -0500 (Fri, 29 Aug 2008) | 22 lines
After working on the ao2_containers branch, I noticed
something a bit strange. In all cases where we provide
a callback function to ao2_container_alloc, the callback
function would only return 0 or CMP_MATCH. After inspecting
the ao2_callback() code carefully, I found that if you're
only looking for one specific item, then you should return
CMP_MATCH | CMP_STOP. Otherwise, astobj2 will continue
traversing the current bucket until the end searching for
more matches.
In cases like chan_iax2 where in 1.4, all the peers are
shoved into a single bucket, this makes for potentially
terrible performance since the entire bucket will be
traversed even if the peer is one of the first ones come
across in the bucket.
All the changes I have made were for cases where the
callback function defined was passed to ao2_container_alloc
so that calls to ao2_find could find a unique instance
of whatever object was being stored in the container.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140489 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_queue.c | 4 ++--
channels/chan_console.c | 2 +-
channels/chan_iax2.c | 6 +++---
channels/chan_sip.c | 8 ++++----
funcs/func_dialgroup.c | 8 ++++----
main/config.c | 2 +-
main/features.c | 2 +-
main/manager.c | 2 +-
main/taskprocessor.c | 2 +-
res/ais/lck.c | 2 +-
res/res_phoneprov.c | 6 +++---
res/res_timing_pthread.c | 2 +-
utils/hashtest2.c | 2 +-
13 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 1e3a493f53..e619ad91bf 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -582,7 +582,7 @@ static int queue_hash_cb(const void *obj, const int flags)
static int queue_cmp_cb(void *obj, void *arg, int flags)
{
struct call_queue *q = obj, *q2 = arg;
- return !strcasecmp(q->name, q2->name) ? CMP_MATCH : 0;
+ return !strcasecmp(q->name, q2->name) ? CMP_MATCH | CMP_STOP : 0;
}
static inline struct call_queue *queue_ref(struct call_queue *q)
@@ -872,7 +872,7 @@ static int member_hash_fn(const void *obj, const int flags)
static int member_cmp_fn(void *obj1, void *obj2, int flags)
{
struct member *mem1 = obj1, *mem2 = obj2;
- return strcasecmp(mem1->interface, mem2->interface) ? 0 : CMP_MATCH;
+ return strcasecmp(mem1->interface, mem2->interface) ? 0 : CMP_MATCH | CMP_STOP;
}
/*!
diff --git a/channels/chan_console.c b/channels/chan_console.c
index c9a59cab30..92777f5ea0 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -1432,7 +1432,7 @@ static int pvt_cmp_cb(void *obj, void *arg, int flags)
{
struct console_pvt *pvt = obj, *pvt2 = arg;
- return !strcasecmp(pvt->name, pvt2->name) ? CMP_MATCH : 0;
+ return !strcasecmp(pvt->name, pvt2->name) ? CMP_MATCH | CMP_STOP : 0;
}
static void stop_streams(void)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index eb7383db39..d2727f4221 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1312,7 +1312,7 @@ static int peer_cmp_cb(void *obj, void *arg, int flags)
{
struct iax2_peer *peer = obj, *peer2 = arg;
- return !strcmp(peer->name, peer2->name) ? CMP_MATCH : 0;
+ return !strcmp(peer->name, peer2->name) ? CMP_MATCH | CMP_STOP : 0;
}
/*!
@@ -1332,7 +1332,7 @@ static int user_cmp_cb(void *obj, void *arg, int flags)
{
struct iax2_user *user = obj, *user2 = arg;
- return !strcmp(user->name, user2->name) ? CMP_MATCH : 0;
+ return !strcmp(user->name, user2->name) ? CMP_MATCH | CMP_STOP : 0;
}
/*!
@@ -12194,7 +12194,7 @@ static int pvt_cmp_cb(void *obj, void *arg, int flags)
* against a full frame or not ... */
return match(&pvt2->addr, pvt2->peercallno, pvt2->callno, pvt,
- pvt2->frames_received) ? CMP_MATCH : 0;
+ pvt2->frames_received) ? CMP_MATCH | CMP_STOP : 0;
}
/*! \brief Load IAX2 module, load configuraiton ---*/
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 804599c760..351a09782c 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1651,7 +1651,7 @@ static int peer_cmp_cb(void *obj, void *arg, int flags)
{
struct sip_peer *peer = obj, *peer2 = arg;
- return !strcasecmp(peer->name, peer2->name) ? CMP_MATCH : 0;
+ return !strcasecmp(peer->name, peer2->name) ? CMP_MATCH | CMP_STOP : 0;
}
/*!
@@ -1683,11 +1683,11 @@ static int peer_ipcmp_cb(void *obj, void *arg, int flags)
if (!ast_test_flag(&peer->flags[0], SIP_INSECURE_PORT) && !ast_test_flag(&peer2->flags[0], SIP_INSECURE_PORT)) {
if (peer->addr.sin_port == peer2->addr.sin_port)
- return CMP_MATCH;
+ return CMP_MATCH | CMP_STOP;
else
return 0;
}
- return CMP_MATCH;
+ return CMP_MATCH | CMP_STOP;
}
/*!
@@ -1707,7 +1707,7 @@ static int dialog_cmp_cb(void *obj, void *arg, int flags)
{
struct sip_pvt *pvt = obj, *pvt2 = arg;
- return !strcasecmp(pvt->callid, pvt2->callid) ? CMP_MATCH : 0;
+ return !strcasecmp(pvt->callid, pvt2->callid) ? CMP_MATCH | CMP_STOP : 0;
}
static int temp_pvt_init(void *);
diff --git a/funcs/func_dialgroup.c b/funcs/func_dialgroup.c
index 6a9596e628..c3674beb93 100644
--- a/funcs/func_dialgroup.c
+++ b/funcs/func_dialgroup.c
@@ -67,9 +67,9 @@ static int group_cmp_fn(void *obj1, void *name2, int flags)
struct group *g1 = obj1, *g2 = name2;
char *name = name2;
if (flags & OBJ_POINTER)
- return strcmp(g1->name, g2->name) ? 0 : CMP_MATCH;
+ return strcmp(g1->name, g2->name) ? 0 : CMP_MATCH | CMP_STOP;
else
- return strcmp(g1->name, name) ? 0 : CMP_MATCH;
+ return strcmp(g1->name, name) ? 0 : CMP_MATCH | CMP_STOP;
}
static int entry_hash_fn(const void *obj, const int flags)
@@ -83,9 +83,9 @@ static int entry_cmp_fn(void *obj1, void *name2, int flags)
struct group_entry *e1 = obj1, *e2 = name2;
char *name = name2;
if (flags & OBJ_POINTER)
- return strcmp(e1->name, e2->name) ? 0 : CMP_MATCH;
+ return strcmp(e1->name, e2->name) ? 0 : CMP_MATCH | CMP_STOP;
else
- return strcmp(e1->name, name) ? 0 : CMP_MATCH;
+ return strcmp(e1->name, name) ? 0 : CMP_MATCH | CMP_STOP;
}
static int dialgroup_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
diff --git a/main/config.c b/main/config.c
index 73f3865f89..40b116a479 100644
--- a/main/config.c
+++ b/main/config.c
@@ -170,7 +170,7 @@ static int hash_string(const void *obj, const int flags)
static int hashtab_compare_strings(void *a, void *b, int flags)
{
const struct inclfile *ae = a, *be = b;
- return !strcmp(ae->fname, be->fname) ? CMP_MATCH : 0;
+ return !strcmp(ae->fname, be->fname) ? CMP_MATCH | CMP_STOP : 0;
}
static struct ast_config_map {
diff --git a/main/features.c b/main/features.c
index dd56f9bd35..9d228acc2f 100644
--- a/main/features.c
+++ b/main/features.c
@@ -230,7 +230,7 @@ static int parkinglot_hash_cb(const void *obj, const int flags)
static int parkinglot_cmp_cb(void *obj, void *arg, int flags)
{
struct ast_parkinglot *parkinglot = obj, *parkinglot2 = arg;
- return !strcasecmp(parkinglot->name, parkinglot2->name) ? CMP_MATCH : 0;
+ return !strcasecmp(parkinglot->name, parkinglot2->name) ? CMP_MATCH | CMP_STOP : 0;
}
/*!
diff --git a/main/manager.c b/main/manager.c
index 6d2c47f268..4aa1be631f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3566,7 +3566,7 @@ static int variable_count_cmp_fn(void *obj, void *vstr, int flags)
* the address of both the struct and the string are exactly the same. */
struct variable_count *vc = obj;
char *str = vstr;
- return !strcmp(vc->varname, str) ? CMP_MATCH : 0;
+ return !strcmp(vc->varname, str) ? CMP_MATCH | CMP_STOP : 0;
}
/*! \brief Convert the input into XML or HTML.
diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index d98d97f1c4..450d579c10 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -339,7 +339,7 @@ static int tps_cmp_cb(void *obj, void *arg, int flags)
{
struct ast_taskprocessor *lhs = obj, *rhs = arg;
- return !strcasecmp(lhs->name, rhs->name) ? CMP_MATCH : 0;
+ return !strcasecmp(lhs->name, rhs->name) ? CMP_MATCH | CMP_STOP : 0;
}
/* destroy the taskprocessor */
diff --git a/res/ais/lck.c b/res/ais/lck.c
index 7e7533dc68..04252ff8b0 100644
--- a/res/ais/lck.c
+++ b/res/ais/lck.c
@@ -115,7 +115,7 @@ static int lock_cmp_cb(void *obj, void *arg, int flags)
{
struct lock_resource *lock1 = obj, *lock2 = arg;
- return !strcasecmp(lock1->name, lock2->name) ? CMP_MATCH : 0;
+ return !strcasecmp(lock1->name, lock2->name) ? CMP_MATCH | CMP_STOP : 0;
}
static int lock_resources_init(void *data)
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 3fcc19a19a..54c094294d 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -249,7 +249,7 @@ static int profile_cmp_fn(void *obj, void *arg, int flags)
{
const struct phone_profile *profile1 = obj, *profile2 = arg;
- return !strcasecmp(profile1->name, profile2->name) ? CMP_MATCH : 0;
+ return !strcasecmp(profile1->name, profile2->name) ? CMP_MATCH | CMP_STOP : 0;
}
static void delete_file(struct phoneprov_file *file)
@@ -295,7 +295,7 @@ static int routes_cmp_fn(void *obj, void *arg, int flags)
{
const struct http_route *route1 = obj, *route2 = arg;
- return !strcmp(route1->uri, route2->uri) ? CMP_MATCH : 0;
+ return !strcmp(route1->uri, route2->uri) ? CMP_MATCH | CMP_STOP : 0;
}
static void route_destructor(void *obj)
@@ -784,7 +784,7 @@ static int users_cmp_fn(void *obj, void *arg, int flags)
{
const struct user *user1 = obj, *user2 = arg;
- return !strcasecmp(user1->macaddress, user2->macaddress) ? CMP_MATCH : 0;
+ return !strcasecmp(user1->macaddress, user2->macaddress) ? CMP_MATCH | CMP_STOP : 0;
}
/*! \brief Free all memory associated with a user */
diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index 187fd2bfb6..6e57246a67 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -308,7 +308,7 @@ static int pthread_timer_cmp(void *obj, void *arg, int flags)
{
struct pthread_timer *timer1 = obj, *timer2 = arg;
- return (timer1->pipe[PIPE_READ] == timer2->pipe[PIPE_READ]) ? CMP_MATCH : 0;
+ return (timer1->pipe[PIPE_READ] == timer2->pipe[PIPE_READ]) ? CMP_MATCH | CMP_STOP : 0;
}
/*!
diff --git a/utils/hashtest2.c b/utils/hashtest2.c
index 27ed307220..3b0c626997 100644
--- a/utils/hashtest2.c
+++ b/utils/hashtest2.c
@@ -83,7 +83,7 @@ static int hash_string(const void *obj, const int flags)
static int hashtab_compare_strings(void *a, void *b, int flags)
{
const struct ht_element *ae = a, *be = b;
- return !strcmp(ae->key, be->key) ? CMP_MATCH : 0;
+ return !strcmp(ae->key, be->key) ? CMP_MATCH | CMP_STOP : 0;
}
/* random numbers */
--
GitLab