kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 17:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACN: Add tracing to existing code

Browse Source 
Prior to making any modifications to the pjsip infrastructure
for ACN, I've added the tracing functions to the existing code.
This should make the final commit easier to review, but we can also
now run a "before and after" trace.

No functional changes were made with this commit.

Change-Id: Ia83a1a2687ccb96f2bc8a2a3928a5214c4be775c
This commit is contained in:
George Joseph
2020-07-06 13:23:24 -06:00
parent 2d22e34206
commit 9bd1d686a1
9 changed files with 438 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/bridge.c
View File

@@ -1673,6 +1673,7 @@ int ast_bridge_join(struct ast_bridge *bridge,
{
struct ast_bridge_channel *bridge_channel;
int res = 0;
SCOPE_TRACE(1, "%s Bridge: %s\n", ast_channel_name(chan), bridge->uniqueid);
bridge_channel = bridge_channel_internal_alloc(bridge);
if (flags & AST_BRIDGE_JOIN_PASS_REFERENCE) {
@@ -1921,6 +1922,7 @@ int ast_bridge_impart(struct ast_bridge *bridge,
.done = 0,
};
int res;
SCOPE_TRACE(1, "%s Bridge: %s\n", ast_channel_name(chan), bridge->uniqueid);
ast_mutex_init(&cond.lock);
ast_cond_init(&cond.cond, NULL);
@@ -1942,6 +1944,7 @@ int ast_bridge_depart(struct ast_channel *chan)
{
struct ast_bridge_channel *bridge_channel;
int departable;
SCOPE_TRACE(1, "%s\n", ast_channel_name(chan));
ast_channel_lock(chan);
bridge_channel = ast_channel_internal_bridge_channel(chan);

3
main/channel.c
View File

@@ -2622,6 +2622,7 @@ static void set_channel_answer_time(struct ast_channel *chan)
int ast_raw_answer(struct ast_channel *chan)
{
int res = 0;
SCOPE_TRACE(1, "%s\n", ast_channel_name(chan));
ast_channel_lock(chan);
@@ -2670,6 +2671,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
{
int res = 0;
enum ast_channel_state old_state;
SCOPE_TRACE(1, "%s\n", ast_channel_name(chan));
old_state = ast_channel_state(chan);
if ((res = ast_raw_answer(chan))) {
@@ -2777,6 +2779,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
int ast_answer(struct ast_channel *chan)
{
SCOPE_TRACE(1, "%s\n", ast_channel_name(chan));
return __ast_answer(chan, 0);
}

12
main/channel_internal_api.c
View File

@@ -677,6 +677,10 @@ void *ast_channel_get_stream_topology_change_source(struct ast_channel *chan)
void ast_channel_nativeformats_set(struct ast_channel *chan,
struct ast_format_cap *value)
{
SCOPE_ENTER(2, "%s: %sFormats: %s\n", S_OR(ast_channel_name(chan), "<initializing>"),
S_COR(ast_channel_is_multistream(chan), "Multistream", ""),
ast_str_tmp(128, ast_format_cap_get_names(value, &STR_TMP)));
ast_assert(chan != NULL);
ao2_replace(chan->nativeformats, value);
@@ -685,7 +689,7 @@ void ast_channel_nativeformats_set(struct ast_channel *chan,
* and topology is destroyed.
*/
if (!chan->stream_topology) {
return;
SCOPE_EXIT_RTN("Channel is being initialized or destroyed\n");
}
if (!ast_channel_is_multistream(chan) || !value) {
@@ -693,7 +697,9 @@ void ast_channel_nativeformats_set(struct ast_channel *chan,
new_topology = ast_stream_topology_create_from_format_cap(value);
ast_channel_internal_set_stream_topology(chan, new_topology);
SCOPE_EXIT_RTN("New %stopology set\n", value ? "" : "empty ");
}
SCOPE_EXIT_RTN("Set native formats but not topology\n");
}
struct ast_framehook_list *ast_channel_framehooks(const struct ast_channel *chan)
@@ -1586,6 +1592,8 @@ struct ast_stream_topology *ast_channel_set_stream_topology(struct ast_channel *
struct ast_stream_topology *topology)
{
struct ast_stream_topology *new_topology;
SCOPE_ENTER(1, "%s: %s\n", ast_channel_name(chan),
ast_str_tmp(256, ast_stream_topology_to_str(topology, &STR_TMP)));
ast_assert(chan != NULL);
@@ -1605,7 +1613,7 @@ struct ast_stream_topology *ast_channel_set_stream_topology(struct ast_channel *
ast_channel_internal_set_stream_topology(chan, new_topology);
}
return new_topology;
SCOPE_EXIT_RTN_VALUE(new_topology, "Used %s topology\n", topology ? "provided" : "empty");
}
struct ast_stream *ast_channel_get_default_stream(struct ast_channel *chan,

2
main/features.c
View File

@@ -536,6 +536,7 @@ static int pre_bridge_setup(struct ast_channel *chan, struct ast_channel *peer,
struct ast_bridge_features *chan_features, struct ast_bridge_features *peer_features)
{
int res;
SCOPE_TRACE(1, "%s Peer: %s\n", ast_channel_name(chan), ast_channel_name(peer));
set_bridge_features_on_config(config, pbx_builtin_getvar_helper(chan, "BRIDGE_FEATURES"));
add_features_datastores(chan, peer, config);
@@ -629,6 +630,7 @@ int ast_bridge_call_with_flags(struct ast_channel *chan, struct ast_channel *pee
struct ast_bridge *bridge;
struct ast_bridge_features chan_features;
struct ast_bridge_features *peer_features;
SCOPE_TRACE(1, "%s Peer: %s\n", ast_channel_name(chan), ast_channel_name(peer));
/* Setup features. */
res = ast_bridge_features_init(&chan_features);