mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-02 19:16:15 +00:00
bridge_roles: Use a non-locking linked list where appropriate
Also explicitly initialize with the AST_LIST_HEAD_NOLOCK_INIT macro for clarity. Change-Id: I4bc39ec33bc3ff77e1a971a01ace87deb965be3f
This commit is contained in:
@@ -51,12 +51,12 @@ struct bridge_role_option {
|
||||
|
||||
struct bridge_role {
|
||||
AST_LIST_ENTRY(bridge_role) list;
|
||||
AST_LIST_HEAD(, bridge_role_option) options;
|
||||
AST_LIST_HEAD_NOLOCK(, bridge_role_option) options;
|
||||
char role[AST_ROLE_LEN];
|
||||
};
|
||||
|
||||
struct bridge_roles_datastore {
|
||||
AST_LIST_HEAD(, bridge_role) role_list;
|
||||
AST_LIST_HEAD_NOLOCK(, bridge_role) role_list;
|
||||
};
|
||||
|
||||
/*!
|
||||
@@ -128,6 +128,8 @@ static struct bridge_roles_datastore *setup_bridge_roles_datastore(struct ast_ch
|
||||
return NULL;
|
||||
}
|
||||
|
||||
AST_LIST_HEAD_INIT_NOLOCK(&roles_datastore->role_list);
|
||||
|
||||
datastore->data = roles_datastore;
|
||||
ast_channel_datastore_add(chan, datastore);
|
||||
return roles_datastore;
|
||||
@@ -264,6 +266,8 @@ static int setup_bridge_role(struct bridge_roles_datastore *roles_datastore, con
|
||||
return -1;
|
||||
}
|
||||
|
||||
AST_LIST_HEAD_INIT_NOLOCK(&role->options);
|
||||
|
||||
ast_copy_string(role->role, role_name, sizeof(role->role));
|
||||
|
||||
AST_LIST_INSERT_TAIL(&roles_datastore->role_list, role, list);
|
||||
|
Reference in New Issue
Block a user