Logger: Convert 'struct ast_callid' to unsigned int.

Switch logger callid's from AO2 objects to simple integers.
This helps in two ways.  Copying integers is faster than
referencing AO2 objects, so this will result in a small
reduction in logger overhead.  This also erases the possibility
of an infinate loop caused by an invalid callid in
threadstorage.

ASTERISK-24833 #comment Committed callid conversion to trunk. 
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4466/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2015-03-13 01:12:35 +00:00
parent 38ee441ea7
commit c08fd275bf
33 changed files with 182 additions and 373 deletions

View File

@@ -317,7 +317,7 @@ struct jingle_session {
struct ast_format_cap *peercap; /*!< Peer codec capabilities */
unsigned int outgoing:1; /*!< Whether this is an outgoing leg or not */
unsigned int gone:1; /*!< In the eyes of Jingle this session is already gone */
struct ast_callid *callid; /*!< Bound session call-id */
ast_callid callid; /*!< Bound session call-id */
};
static const char desc[] = "Motif Jingle Channel";
@@ -585,10 +585,6 @@ static void jingle_session_destructor(void *obj)
ao2_cleanup(session->jointcap);
ao2_cleanup(session->peercap);
if (session->callid) {
ast_callid_unref(session->callid);
}
ast_string_field_free_memory(session);
}
@@ -704,7 +700,7 @@ static void jingle_enable_video(struct jingle_session *session)
static struct jingle_session *jingle_alloc(struct jingle_endpoint *endpoint, const char *from, const char *sid)
{
struct jingle_session *session;
struct ast_callid *callid;
ast_callid callid;
struct ast_sockaddr tmp;
if (!(session = ao2_alloc(sizeof(*session), jingle_session_destructor))) {