jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/functions: fix formatting with THREADCOUNT=0

Browse Source
This commit is contained in:
MilhouseVH 2019-08-08 21:53:27 +01:00
parent 9bd21376be
commit 796a70f4dd
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/functions
View File

@ -1263,7 +1263,7 @@ pkg_lock() {
local pkg="$1" task="$2" parent_pkg="$3" local pkg="$1" task="$2" parent_pkg="$3"
local this_job="${MTJOBID}" local this_job="${MTJOBID}"
local lock_job lock_seq lock_task lock_pkg locked=no local lock_job lock_seq lock_task lock_pkg locked=no idwidth
local fail_seq local fail_seq
exec 98>"${THREAD_CONTROL}/locks/${pkg}.${task}" exec 98>"${THREAD_CONTROL}/locks/${pkg}.${task}"
@ -1274,7 +1274,8 @@ pkg_lock() {
done done
if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then
pkg_lock_status "STALLED" "${parent_pkg}" "${task}" "$(printf "waiting on [%02d] %s %s" ${lock_job} "${lock_task}" "${lock_pkg}")" [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
pkg_lock_status "STALLED" "${parent_pkg}" "${task}" "$(printf "waiting on [%0*d] %s %s" ${idwidth} ${lock_job} "${lock_task}" "${lock_pkg}")"
flock --exclusive 98 flock --exclusive 98
fi fi
@ -1302,13 +1303,15 @@ pkg_lock_status() {
[ "${MTWITHLOCKS}" != "yes" ] && return 0 [ "${MTWITHLOCKS}" != "yes" ] && return 0
local status="$1" pkg="$2" task="$3" msg="$4" local status="$1" pkg="$2" task="$3" msg="$4"
local this_job="${MTJOBID}" line local this_job="${MTJOBID}" line idwidth
[ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
( (
flock --exclusive 94 flock --exclusive 94
printf -v line "%s: <%06d> [%02d/%0*d] %-7s %-7s %-35s" \ printf -v line "%s: <%06d> [%0*d/%0*d] %-7s %-7s %-35s" \
"$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${task}" "${pkg}" "$(date +%Y-%m-%d\ %H:%M:%S.%N)" $$ ${idwidth} ${this_job} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${status}" "${task}" "${pkg}"
[ -n "${msg}" ] && line+=" (${msg})" [ -n "${msg}" ] && line+=" (${msg})"
echo "${line}" >>"${THREAD_CONTROL}/history" echo "${line}" >>"${THREAD_CONTROL}/history"
@ -1334,10 +1337,12 @@ update_dashboard() {
local status="$1" pkg="$2" task="$3" msg="$4" local status="$1" pkg="$2" task="$3" msg="$4"
local line sedline preamble num elapsed projdevarch local line sedline preamble num elapsed projdevarch
local boldred boldgreen boldyellow endcolor local boldred boldgreen boldyellow endcolor idwidth
sedline=$((MTJOBID + 2)) sedline=$((MTJOBID + 2))
[ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
num=$(< "${THREAD_CONTROL}/status.max") num=$(< "${THREAD_CONTROL}/status.max")
if [ ${num} -lt ${sedline} ]; then if [ ${num} -lt ${sedline} ]; then
echo ${sedline} >"${THREAD_CONTROL}/status.max" echo ${sedline} >"${THREAD_CONTROL}/status.max"
@ -1369,7 +1374,7 @@ update_dashboard() {
esac esac
fi fi
printf -v line "[%02d\/%0*d] %b%-7s%b %-7s %-35s" ${MTJOBID} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${color}" "${status//\//\\/}" "${endcolor}" "${task}" "${pkg}" printf -v line "[%0*d\/%0*d] %b%-7s%b %-7s %-35s" ${idwidth} ${MTJOBID} ${#MTMAXJOBS} ${PARALLEL_SEQ:-0} "${color}" "${status//\//\\/}" "${endcolor}" "${task}" "${pkg}"
[ -n "${msg}" ] && line+=" ${msg//\//\\/}" [ -n "${msg}" ] && line+=" ${msg//\//\\/}"
sed -e "1s/.*/${preamble}/;${sedline}s/.*/${line}/" -i "${THREAD_CONTROL}/status" sed -e "1s/.*/${preamble}/;${sedline}s/.*/${line}/" -i "${THREAD_CONTROL}/status"
@ -1382,7 +1387,7 @@ acquire_exclusive_lock() {
local pkg="$1" task="$2" lockfile="${3:-global}" local pkg="$1" task="$2" lockfile="${3:-global}"
local this_job="${MTJOBID}" local this_job="${MTJOBID}"
local lock_job lock_seq lock_task lock_pkg locked=no local lock_job lock_seq lock_task lock_pkg locked=no idwidth
exec 96>"${THREAD_CONTROL}/locks/.mutex.${lockfile}" exec 96>"${THREAD_CONTROL}/locks/.mutex.${lockfile}"
while [ : ]; do while [ : ]; do
@ -1392,7 +1397,8 @@ acquire_exclusive_lock() {
done done
if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then if [ "${locked}" = "no" -a "${lock_job}/${lock_seq}" != "${this_job}/${PARALLEL_SEQ}" ]; then
pkg_lock_status "MUTEX/W" "${pkg}" "${task}" "$(printf "mutex: %s; waiting on [%02d] %s %s" "${lockfile}" ${lock_job} "${lock_task}" "${lock_pkg}")" [ "${THREADCOUNT}" = "0" ] && idwidth=${#MTMAXJOBS} || idwidth=2
pkg_lock_status "MUTEX/W" "${pkg}" "${task}" "$(printf "mutex: %s; waiting on [%0*d] %s %s" "${lockfile}" ${idwidth} ${lock_job} "${lock_task}" "${lock_pkg}")"
flock --exclusive 96 flock --exclusive 96
fi fi