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

core: Don't create snapshots with locks.

Browse Source 
Snapshots are immutable and are never changed. Allocating them
with a lock is wasteful.

Review: https://reviewboard.asterisk.org/r/4469/
........

Merged revisions 432742 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2015-03-10 23:09:49 +00:00
parent 15d266bf85
commit 2889f074a0
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/endpoints.c
View File

@@ -467,9 +467,10 @@ struct ast_endpoint_snapshot *ast_endpoint_snapshot_create(
channel_count = ao2_container_count(endpoint->channel_ids); channel_count = ao2_container_count(endpoint->channel_ids);
snapshot = ao2_alloc( snapshot = ao2_alloc_options(
sizeof(*snapshot) + channel_count * sizeof(char *), sizeof(*snapshot) + channel_count * sizeof(char *),
endpoint_snapshot_dtor); endpoint_snapshot_dtor,
AO2_ALLOC_OPT_LOCK_NOLOCK);
if (ast_string_field_init(snapshot, 80) != 0) { if (ast_string_field_init(snapshot, 80) != 0) {
return NULL; return NULL;

3
main/stasis_bridges.c
View File

@@ -232,7 +232,8 @@ struct ast_bridge_snapshot *ast_bridge_snapshot_create(struct ast_bridge *bridge
RAII_VAR(struct ast_bridge_snapshot *, snapshot, NULL, ao2_cleanup); RAII_VAR(struct ast_bridge_snapshot *, snapshot, NULL, ao2_cleanup);
struct ast_bridge_channel *bridge_channel; struct ast_bridge_channel *bridge_channel;
snapshot = ao2_alloc(sizeof(*snapshot), bridge_snapshot_dtor); snapshot = ao2_alloc_options(sizeof(*snapshot), bridge_snapshot_dtor,
AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!snapshot || ast_string_field_init(snapshot, 128)) { if (!snapshot || ast_string_field_init(snapshot, 128)) {
return NULL; return NULL;
} }

6
main/stasis_channels.c
View File

@@ -209,7 +209,8 @@ struct ast_channel_snapshot *ast_channel_snapshot_create(struct ast_channel *cha
return NULL; return NULL;
} }
snapshot = ao2_alloc(sizeof(*snapshot), channel_snapshot_dtor); snapshot = ao2_alloc_options(sizeof(*snapshot), channel_snapshot_dtor,
AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!snapshot || ast_string_field_init(snapshot, 1024)) { if (!snapshot || ast_string_field_init(snapshot, 1024)) {
ao2_cleanup(snapshot); ao2_cleanup(snapshot);
return NULL; return NULL;
@@ -617,7 +618,8 @@ void ast_multi_channel_blob_add_channel(struct ast_multi_channel_blob *obj, cons
return; return;
} }
role_snapshot = ao2_alloc(sizeof(*role_snapshot) + role_len, channel_role_snapshot_dtor); role_snapshot = ao2_alloc_options(sizeof(*role_snapshot) + role_len, channel_role_snapshot_dtor,
AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!role_snapshot) { if (!role_snapshot) {
return; return;
} }