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

pjsip: Fix deadlock with suspend taskprocessor on masquerade

Browse Source 
If both channels which should be masqueraded
are in the same serializer:
1st channel will be locked waiting condition 'complete'
2nd channel will be locked waiting condition 'suspended'

On heavy load system a chance that both channels will be in
the same serializer 'pjsip/distibutor' is very high.

To reproduce compile res_pjsip/pjsip_distributor.c with
DISTRIBUTOR_POOL_SIZE=1

Steps to reproduce:
1. Party A calls Party B (bridged call 'AB')
2. Party B places Party A on hold
3. Party B calls Voicemail app (non-bridged call 'BV')
4. Party B attended transfers Party A to voicemail using REFER.
5. When asterisk masquerades calls 'AB' and 'BV',
   a deadlock is happened.

This patch adds a suspension indicator to the taskprocessor.
When a session suspends/unsuspends the serializer
it sets the indicator to the appropriate state.
The session checks the suspension indicator before
suspend the serializer.

ASTERISK-26145 #close

Change-Id: Iaaebee60013a58c942ba47b1b4930a63e686663b
This commit is contained in:
Alexei Gradinari
2016-08-06 11:57:08 -04:00
parent d78fe8fed0
commit 820879415f
3 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/asterisk/taskprocessor.h
View File

@@ -241,6 +241,38 @@ struct ast_taskprocessor_local {
int ast_taskprocessor_push_local(struct ast_taskprocessor *tps,
int (*task_exe)(struct ast_taskprocessor_local *local), void *datap);
/*!
* \brief Indicate the taskprocessor is suspended.
*
* \since 13.12.0
*
* \param tps Task processor.
* \retval 0 success
* \retval -1 failure
*/
int ast_taskprocessor_suspend(struct ast_taskprocessor *tps);
/*!
* \brief Indicate the taskprocessor is unsuspended.
*
* \since 13.12.0
*
* \param tps Task processor.
* \retval 0 success
* \retval -1 failure
*/
int ast_taskprocessor_unsuspend(struct ast_taskprocessor *tps);
/*!
* \brief Get the task processor suspend status
*
* \since 13.12.0
*
* \param tps Task processor.
* \retval non-zero if the task processor is suspended
*/
int ast_taskprocessor_is_suspended(struct ast_taskprocessor *tps);
/*!
* \brief Pop a task off the taskprocessor and execute it.
*