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

service: handle input priority better

Browse source 
Ensure, that inputs with higher priorities are preferred.
The decision line is:

1) re-use input if the in-use mux matches
2) use a free input with highest priority
3) cancel the mux/input with smallest weight and use it for new
This commit is contained in:
Jaroslav Kysela 2014-05-26 13:09:23 +02:00
parent 2be0f84f0f
commit 521c49e14b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/service.c
View file

@ -567,14 +567,21 @@ service_find_instance
return si;
}
/* Forced or Idle */
/* Forced */
TAILQ_FOREACH(si, sil, si_link)
if(si->si_weight <= 0 && si->si_error == 0)
if(si->si_weight < 0 && si->si_error == 0)
break;
/* Idle */
if (!si) {
TAILQ_FOREACH_REVERSE(si, sil, service_instance_list, si_link)
if (si->si_weight == 0 && si->si_error == 0)
break;
}
/* Bump someone */
if (!si) {
TAILQ_FOREACH_REVERSE(si, sil, service_instance_list, si_link)
TAILQ_FOREACH(si, sil, si_link)
if (weight > si->si_weight && si->si_error == 0)
break;
}