#define DCHAN_AVAILABLE (DCHAN_NOTINALARM | DCHAN_UP)
-#define PRI_DEADLOCK_AVOIDANCE(p) \
- do { \
- sig_pri_unlock_private(p); \
- usleep(1); \
- sig_pri_lock_private(p); \
- } while (0)
-
static int pri_active_dchan_index(struct sig_pri_span *pri);
static const char *sig_pri_call_level2str(enum sig_pri_call_level level)
p->calls->deadlock_avoidance_private(p->chan_pvt);
} else {
/* Fallback to the old way if callback not present. */
- PRI_DEADLOCK_AVOIDANCE(p);
+ sig_pri_unlock_private(p);
+ sched_yield();
+ sig_pri_lock_private(p);
}
}
static void pri_grab(struct sig_pri_chan *p, struct sig_pri_span *pri)
{
- int res;
-
/* Grab the lock first */
- do {
- res = ast_mutex_trylock(&pri->lock);
- if (res) {
- sig_pri_deadlock_avoidance_private(p);
- }
- } while (res);
+ while (ast_mutex_trylock(&pri->lock)) {
+ /* Avoid deadlock */
+ sig_pri_deadlock_avoidance_private(p);
+ }
/* Then break the poll */
- pthread_kill(pri->master, SIGURG);
+ if (pri->master != AST_PTHREADT_NULL) {
+ pthread_kill(pri->master, SIGURG);
+ }
}
/*!
/* We got the lock */
break;
}
- /* We must unlock the PRI to avoid the possibility of a deadlock */
- ast_mutex_unlock(&pri->lock);
- sig_pri_deadlock_avoidance_private(pri->pvts[chanpos]);
- ast_mutex_lock(&pri->lock);
+
+ /* Avoid deadlock */
+ sig_pri_unlock_private(pri->pvts[chanpos]);
+ DEADLOCK_AVOIDANCE(&pri->lock);
+ sig_pri_lock_private(pri->pvts[chanpos]);
}
}
return "Unknown";
}
-#define SIG_SS7_DEADLOCK_AVOIDANCE(p) \
- do { \
- sig_ss7_unlock_private(p); \
- usleep(1); \
- sig_ss7_lock_private(p); \
- } while (0)
-
static void sig_ss7_unlock_private(struct sig_ss7_chan *p)
{
if (p->calls->unlock_private) {
p->calls->deadlock_avoidance_private(p->chan_pvt);
} else {
/* Fallback to the old way if callback not present. */
- SIG_SS7_DEADLOCK_AVOIDANCE(p);
+ sig_ss7_unlock_private(p);
+ sched_yield();
+ sig_ss7_lock_private(p);
}
}
/* We got the lock */
break;
}
- /* We must unlock the SS7 to avoid the possibility of a deadlock */
- ast_mutex_unlock(&ss7->lock);
- sig_ss7_deadlock_avoidance_private(ss7->pvts[chanpos]);
- ast_mutex_lock(&ss7->lock);
+
+ /* Avoid deadlock */
+ sig_ss7_unlock_private(ss7->pvts[chanpos]);
+ DEADLOCK_AVOIDANCE(&ss7->lock);
+ sig_ss7_lock_private(ss7->pvts[chanpos]);
}
}
static void ss7_grab(struct sig_ss7_chan *pvt, struct sig_ss7_linkset *ss7)
{
- int res;
/* Grab the lock first */
- do {
- res = ast_mutex_trylock(&ss7->lock);
- if (res) {
- sig_ss7_deadlock_avoidance_private(pvt);
- }
- } while (res);
+ while (ast_mutex_trylock(&ss7->lock)) {
+ /* Avoid deadlock */
+ sig_ss7_deadlock_avoidance_private(pvt);
+ }
/* Then break the poll */
- if (ss7->master != AST_PTHREADT_NULL)
+ if (ss7->master != AST_PTHREADT_NULL) {
pthread_kill(ss7->master, SIGURG);
+ }
}
/*!