stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

capmt: Fix the mutex deadlock

Browse source
This commit is contained in:
Jaroslav Kysela 2014-06-17 13:53:19 +02:00
parent 627473b8f9
commit c7e812bd6f
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/descrambler/capmt.c
View file

@ -353,6 +353,8 @@ capmt_pid_add(capmt_t *capmt, int adapter, int pid, mpegts_service_t *s)
mpegts_mux_instance_t *mmi; mpegts_mux_instance_t *mmi;
int i = 0; int i = 0;
lock_assert(&capmt->capmt_mutex);
for (i = 0; i < MAX_PIDS; i++) { for (i = 0; i < MAX_PIDS; i++) {
t = &ca->ca_pids[i]; t = &ca->ca_pids[i];
if (t->pid == pid) if (t->pid == pid)
@ -367,9 +369,11 @@ capmt_pid_add(capmt_t *capmt, int adapter, int pid, mpegts_service_t *s)
o->pid_refs = 1; o->pid_refs = 1;
mmi = LIST_FIRST(&capmt->capmt_adapters[adapter].ca_tuner->mi_mux_active); mmi = LIST_FIRST(&capmt->capmt_adapters[adapter].ca_tuner->mi_mux_active);
assert(mmi && mmi->mmi_mux); assert(mmi && mmi->mmi_mux);
pthread_mutex_unlock(&capmt->capmt_mutex);
descrambler_open_pid(mmi->mmi_mux, o, descrambler_open_pid(mmi->mmi_mux, o,
s ? DESCRAMBLER_ECM_PID(pid) : pid, s ? DESCRAMBLER_ECM_PID(pid) : pid,
capmt_table_input, (service_t *)s); capmt_table_input, (service_t *)s);
pthread_mutex_lock(&capmt->capmt_mutex);
} }
} }
@ -381,6 +385,8 @@ capmt_pid_remove(capmt_t *capmt, int adapter, int pid)
mpegts_mux_instance_t *mmi; mpegts_mux_instance_t *mmi;
int i = 0; int i = 0;
lock_assert(&capmt->capmt_mutex);
if (pid <= 0) if (pid <= 0)
return; return;
for (i = 0; i < MAX_PIDS; i++) { for (i = 0; i < MAX_PIDS; i++) {
@ -394,12 +400,15 @@ capmt_pid_remove(capmt_t *capmt, int adapter, int pid)
if (i >= MAX_PIDS) if (i >= MAX_PIDS)
return; return;
mmi = LIST_FIRST(&capmt->capmt_adapters[adapter].ca_tuner->mi_mux_active); mmi = LIST_FIRST(&capmt->capmt_adapters[adapter].ca_tuner->mi_mux_active);
o->pid = -1; /* block for new registrations */
o->pid_refs = 0;
if (mmi) { if (mmi) {
assert(mmi->mmi_mux); assert(mmi->mmi_mux);
pthread_mutex_unlock(&capmt->capmt_mutex);
descrambler_close_pid(mmi->mmi_mux, o, pid); descrambler_close_pid(mmi->mmi_mux, o, pid);
pthread_mutex_lock(&capmt->capmt_mutex);
} }
o->pid = 0; o->pid = 0;
o->pid_refs = 0;
} }
static void static void
@ -420,10 +429,15 @@ capmt_pid_flush(capmt_t *capmt)
for (i = 0; i < MAX_PIDS; i++) { for (i = 0; i < MAX_PIDS; i++) {
o = &ca->ca_pids[i]; o = &ca->ca_pids[i];
if (o->pid) { if (o->pid) {
if (mmi) o->pid = -1; /* block for new registrations */
descrambler_close_pid(mmi->mmi_mux, &ca->ca_pids[i], o->pid);
o->pid = 0;
o->pid_refs = 0; o->pid_refs = 0;
if (mmi) {
assert(mmi->mmi_mux);
pthread_mutex_unlock(&capmt->capmt_mutex);
descrambler_close_pid(mmi->mmi_mux, &ca->ca_pids[i], o->pid);
pthread_mutex_lock(&capmt->capmt_mutex);
}
o->pid = 0;
} }
} }
} }