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

cdr: Minor optimizations.

Browse Source 
* bridge_candidate_process: remove SCOPED_AO2LOCK and return value.
* handle_standard_bridge_enter_message: replace recursive call with goto
  statement.

ASTERISK-24297

Change-Id: Id2eaa0822fb8dc799f63422bb3aa89de9d4ee2a2
This commit is contained in:
Corey Farrell
2017-12-15 11:26:36 -05:00
parent b0f054cb2d
commit e6768c0f81
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/cdr.c
View File

@@ -2457,12 +2457,12 @@ static void bridge_candidate_add_to_cdr(struct cdr_object *cdr,
* \param cand_cdr The \ref cdr_object that is a candidate * \param cand_cdr The \ref cdr_object that is a candidate
* *
*/ */
static int bridge_candidate_process(struct cdr_object *cdr, struct cdr_object *base_cand_cdr) static void bridge_candidate_process(struct cdr_object *cdr, struct cdr_object *base_cand_cdr)
{ {
struct cdr_object_snapshot *party_a; struct cdr_object_snapshot *party_a;
struct cdr_object *cand_cdr; struct cdr_object *cand_cdr;
SCOPED_AO2LOCK(lock, base_cand_cdr); ao2_lock(base_cand_cdr);
for (cand_cdr = base_cand_cdr; cand_cdr; cand_cdr = cand_cdr->next) { for (cand_cdr = base_cand_cdr; cand_cdr; cand_cdr = cand_cdr->next) {
/* Skip any records that are not in this bridge */ /* Skip any records that are not in this bridge */
@@ -2474,7 +2474,7 @@ static int bridge_candidate_process(struct cdr_object *cdr, struct cdr_object *b
if (!strcasecmp(cdr->party_a.snapshot->name, cand_cdr->party_a.snapshot->name) if (!strcasecmp(cdr->party_a.snapshot->name, cand_cdr->party_a.snapshot->name)
|| (cdr->party_b.snapshot || (cdr->party_b.snapshot
&& !strcasecmp(cdr->party_b.snapshot->name, cand_cdr->party_a.snapshot->name))) { && !strcasecmp(cdr->party_b.snapshot->name, cand_cdr->party_a.snapshot->name))) {
return 0; break;
} }
party_a = cdr_object_pick_party_a(&cdr->party_a, &cand_cdr->party_a); party_a = cdr_object_pick_party_a(&cdr->party_a, &cand_cdr->party_a);
@@ -2482,7 +2482,7 @@ static int bridge_candidate_process(struct cdr_object *cdr, struct cdr_object *b
* Party B */ * Party B */
if (!strcasecmp(party_a->snapshot->name, cdr->party_a.snapshot->name)) { if (!strcasecmp(party_a->snapshot->name, cdr->party_a.snapshot->name)) {
bridge_candidate_add_to_cdr(cdr, &cand_cdr->party_a); bridge_candidate_add_to_cdr(cdr, &cand_cdr->party_a);
return 0; break;
} }
/* We're Party B. Check if we can add ourselves immediately or if we need /* We're Party B. Check if we can add ourselves immediately or if we need
@@ -2502,9 +2502,11 @@ static int bridge_candidate_process(struct cdr_object *cdr, struct cdr_object *b
*/ */
memset(&cand_cdr->end, 0, sizeof(cand_cdr->end)); memset(&cand_cdr->end, 0, sizeof(cand_cdr->end));
} }
return 0;
break;
} }
return 0;
ao2_unlock(base_cand_cdr);
} }
/*! /*!
@@ -2587,6 +2589,7 @@ static void handle_standard_bridge_enter_message(struct cdr_object *cdr,
ao2_lock(cdr); ao2_lock(cdr);
try_again:
for (it_cdr = cdr; it_cdr; it_cdr = it_cdr->next) { for (it_cdr = cdr; it_cdr; it_cdr = it_cdr->next) {
if (it_cdr->fn_table->process_party_a) { if (it_cdr->fn_table->process_party_a) {
CDR_DEBUG("%p - Updating Party A %s snapshot\n", it_cdr, CDR_DEBUG("%p - Updating Party A %s snapshot\n", it_cdr,
@@ -2639,7 +2642,7 @@ static void handle_standard_bridge_enter_message(struct cdr_object *cdr,
/* This is guaranteed to succeed: the new CDR is created in the single state /* This is guaranteed to succeed: the new CDR is created in the single state
* and will be able to handle the bridge enter message * and will be able to handle the bridge enter message
*/ */
handle_standard_bridge_enter_message(cdr, bridge, channel); goto try_again;
} }
} }
ao2_unlock(cdr); ao2_unlock(cdr);