Merge branch 'no-pipes'
* no-pipes: small fixes no SQL inside the signal-handler (race-condition) get rid of pipes
This commit is contained in:
Vincent Riquer
commit
44e88068e5
450
atom
450
atom
@ -1267,27 +1267,81 @@ encodeFile::vorbis() {
|
||||
}
|
||||
|
||||
worker() {
|
||||
trap "kill -USR1 $masterpid" EXIT
|
||||
trap - USR1 ALRM PIPE
|
||||
exec 2>>"$tempdir/errors.log"
|
||||
while :
|
||||
do
|
||||
echo work
|
||||
read -t 10 line
|
||||
until [ -n "$line" ] && [[ $line != AtOM:ComFail ]]
|
||||
do
|
||||
echo work
|
||||
read -t 10 line
|
||||
done
|
||||
if [[ $line == AtOM:Die ]]
|
||||
exec 2>>"$tempdir/worker$1.log"
|
||||
(( debug >= 2 )) && echo "${cmd_arg[@]}" >&2
|
||||
"${cmd_arg[@]}" >/dev/null
|
||||
}
|
||||
|
||||
master() {
|
||||
if (( active >= concurrency)) || [ -n "$quit" ]
|
||||
then
|
||||
trap EXIT
|
||||
break
|
||||
elif [[ $line == AtOM:Sleep ]]
|
||||
sleep 0.1
|
||||
else
|
||||
echo '
|
||||
SELECT COUNT(*)
|
||||
FROM tasks
|
||||
WHERE status = 0;
|
||||
|
||||
SELECT COUNT(*)
|
||||
FROM tasks
|
||||
WHERE status = 0
|
||||
AND requires is NULL;
|
||||
|
||||
SELECT
|
||||
id,
|
||||
source_file,
|
||||
required,
|
||||
cmd_arg0,
|
||||
cmd_arg1,
|
||||
cmd_arg2,
|
||||
cmd_arg3,
|
||||
cmd_arg4,
|
||||
cmd_arg5,
|
||||
cmd_arg6,
|
||||
cmd_arg7,
|
||||
cmd_arg8,
|
||||
cmd_arg9,
|
||||
cmd_arg10,
|
||||
cmd_arg11,
|
||||
cmd_arg12,
|
||||
cmd_arg13,
|
||||
cmd_arg14,
|
||||
cmd_arg15,
|
||||
cmd_arg16,
|
||||
cmd_arg17,
|
||||
cmd_arg18,
|
||||
cmd_arg19,
|
||||
cmd_arg20,
|
||||
cmd_arg21,
|
||||
cmd_arg22,
|
||||
cmd_arg23,
|
||||
cmd_arg24,
|
||||
cmd_arg25,
|
||||
cmd_arg26,
|
||||
cmd_arg27,
|
||||
cmd_arg28,
|
||||
cmd_arg29,
|
||||
cleanup,
|
||||
fileid,
|
||||
filename
|
||||
FROM tasks
|
||||
WHERE status = 0
|
||||
AND requires is NULL
|
||||
ORDER BY source_file
|
||||
LIMIT 1;
|
||||
' >&3
|
||||
read -u4 remaining
|
||||
read -u4 ready
|
||||
if (( remaining == 0 ))
|
||||
then
|
||||
sleep 1
|
||||
sleep 0.1
|
||||
continue
|
||||
fi
|
||||
elif (( ready == 0 ))
|
||||
then
|
||||
sleep 0.1
|
||||
else
|
||||
(( ++active ))
|
||||
read -u4 line
|
||||
taskid=${line%%|*}
|
||||
rest="${line#*|}|"
|
||||
sourcefileid=${rest%%|*}
|
||||
@ -1364,198 +1418,95 @@ worker() {
|
||||
do
|
||||
[ -z "${cmd_arg[key]}" ] && unset cmd_arg[key]
|
||||
done
|
||||
(( debug >= 2 )) && echo "${cmd_arg[@]}" >&2
|
||||
if "${cmd_arg[@]}" >/dev/null
|
||||
then
|
||||
echo "finished $taskid|$sourcefileid|$destfileid|$destfilename"
|
||||
read -t 10 line
|
||||
until [[ $line == AtOM:OK ]]
|
||||
do
|
||||
echo "finished $taskid|$sourcefileid|$destfileid|$destfilename"
|
||||
read -t 10 line
|
||||
done
|
||||
else
|
||||
echo "failed $taskid"
|
||||
read -t 10 line
|
||||
until [[ $line == AtOM:OK ]]
|
||||
do
|
||||
echo "failed $taskid"
|
||||
read -t 10 line
|
||||
done
|
||||
[ -n "$filename" ] \
|
||||
&& eval rm -f $filename
|
||||
fi
|
||||
unset cmd_arg
|
||||
if [ -n "$cleanup" -a -n "$required" ]
|
||||
then
|
||||
echo "cleanup $required"
|
||||
read -t 10 answer
|
||||
until [[ $answer != AtOM:ComFail ]]
|
||||
do
|
||||
echo "cleanup $required"
|
||||
read -t 10 answer
|
||||
done
|
||||
if (( answer == 1 ))
|
||||
then
|
||||
eval rm -f $cleanup
|
||||
fi
|
||||
fi
|
||||
done
|
||||
return
|
||||
}
|
||||
|
||||
master() {
|
||||
for workerid in ${!workers[@]}
|
||||
do
|
||||
if read -t0.001 -u$((200+workerid)) workercommand workerquery
|
||||
then
|
||||
break
|
||||
fi
|
||||
done
|
||||
(( ${#workers[@]} == 0 )) && break
|
||||
if [ -n "$workercommand" ]
|
||||
then
|
||||
case $workercommand in
|
||||
'work')
|
||||
if [ -n "$quit" ]
|
||||
then
|
||||
destroyworker $workerid
|
||||
elif [ -n "${workertasks[workerid]}" ]
|
||||
then
|
||||
echo '
|
||||
SELECT
|
||||
id,
|
||||
source_file,
|
||||
required,
|
||||
cmd_arg0,
|
||||
cmd_arg1,
|
||||
cmd_arg2,
|
||||
cmd_arg3,
|
||||
cmd_arg4,
|
||||
cmd_arg5,
|
||||
cmd_arg6,
|
||||
cmd_arg7,
|
||||
cmd_arg8,
|
||||
cmd_arg9,
|
||||
cmd_arg10,
|
||||
cmd_arg11,
|
||||
cmd_arg12,
|
||||
cmd_arg13,
|
||||
cmd_arg14,
|
||||
cmd_arg15,
|
||||
cmd_arg16,
|
||||
cmd_arg17,
|
||||
cmd_arg18,
|
||||
cmd_arg19,
|
||||
cmd_arg20,
|
||||
cmd_arg21,
|
||||
cmd_arg22,
|
||||
cmd_arg23,
|
||||
cmd_arg24,
|
||||
cmd_arg25,
|
||||
cmd_arg26,
|
||||
cmd_arg27,
|
||||
cmd_arg28,
|
||||
cmd_arg29,
|
||||
cleanup,
|
||||
fileid,
|
||||
filename
|
||||
FROM tasks
|
||||
WHERE
|
||||
id='${workertasks[workerid]}';
|
||||
' >&3
|
||||
read -u4 line
|
||||
eval echo '"$line" >&'$((100+workerid))
|
||||
elif (( active < concurrency ))
|
||||
then
|
||||
echo '
|
||||
SELECT COUNT(*)
|
||||
FROM tasks
|
||||
WHERE status = 0;
|
||||
|
||||
SELECT COUNT(*)
|
||||
FROM tasks
|
||||
WHERE status = 0
|
||||
AND requires is NULL;
|
||||
|
||||
SELECT
|
||||
id,
|
||||
source_file,
|
||||
required,
|
||||
cmd_arg0,
|
||||
cmd_arg1,
|
||||
cmd_arg2,
|
||||
cmd_arg3,
|
||||
cmd_arg4,
|
||||
cmd_arg5,
|
||||
cmd_arg6,
|
||||
cmd_arg7,
|
||||
cmd_arg8,
|
||||
cmd_arg9,
|
||||
cmd_arg10,
|
||||
cmd_arg11,
|
||||
cmd_arg12,
|
||||
cmd_arg13,
|
||||
cmd_arg14,
|
||||
cmd_arg15,
|
||||
cmd_arg16,
|
||||
cmd_arg17,
|
||||
cmd_arg18,
|
||||
cmd_arg19,
|
||||
cmd_arg20,
|
||||
cmd_arg21,
|
||||
cmd_arg22,
|
||||
cmd_arg23,
|
||||
cmd_arg24,
|
||||
cmd_arg25,
|
||||
cmd_arg26,
|
||||
cmd_arg27,
|
||||
cmd_arg28,
|
||||
cmd_arg29,
|
||||
cleanup,
|
||||
fileid,
|
||||
filename
|
||||
FROM tasks
|
||||
WHERE status = 0
|
||||
AND requires is NULL
|
||||
ORDER BY source_file
|
||||
LIMIT 1;
|
||||
' >&3
|
||||
read -u4 remaining
|
||||
read -u4 ready
|
||||
if (( remaining == 0 ))
|
||||
then
|
||||
destroyworker $workerid
|
||||
continue
|
||||
elif (( ready == 0 ))
|
||||
then
|
||||
line=AtOM:Sleep
|
||||
else
|
||||
(( ++active ))
|
||||
read -u4 line
|
||||
taskid=${line%%|*}
|
||||
workerid=$(getworkerid)
|
||||
workertasks[workerid]=$taskid
|
||||
Update tasks status 1 <<<"id = $taskid"
|
||||
createworker $workerid
|
||||
fi
|
||||
eval echo '"$line" >&'$((100+workerid))
|
||||
else
|
||||
destroyworker $workerid
|
||||
fi
|
||||
;;
|
||||
'finished')
|
||||
eval 'echo AtOM:OK >&'$((workerid+100))
|
||||
[ -z "${workertasks[workerid]}" ] && continue
|
||||
(( ++ran ))
|
||||
unset workertasks[workerid]
|
||||
(( active-- )) || true
|
||||
taskid=${workerquery%%|*}
|
||||
rest="${workerquery#*|}|"
|
||||
}
|
||||
|
||||
getworkerid() {
|
||||
local i
|
||||
for (( i=0 ; i >= 0 ; i++ ))
|
||||
do
|
||||
if [ -z "${workers[i]}" ]
|
||||
then
|
||||
echo $i
|
||||
return
|
||||
fi
|
||||
done
|
||||
# If we reach this, we have reached the signed long limit
|
||||
# (2^63 - 1 = 9223372036854775807 - Got a supercomputer?)
|
||||
(( concurrency-- ))
|
||||
}
|
||||
|
||||
createworker() {
|
||||
worker $1 &
|
||||
workers[$1]=$!
|
||||
}
|
||||
|
||||
destroyworker() {
|
||||
dyingworker=${workers[$1]}
|
||||
unset workers[$1]
|
||||
wait $dyingworker
|
||||
}
|
||||
|
||||
gettaskinfos() {
|
||||
echo '
|
||||
SELECT
|
||||
id,
|
||||
source_file,
|
||||
required,
|
||||
cleanup,
|
||||
fileid,
|
||||
filename
|
||||
FROM tasks
|
||||
WHERE id='$1';
|
||||
' >&3
|
||||
read -u4 line
|
||||
taskid=${line%%|*}
|
||||
rest="${line#*|}|"
|
||||
sourcefileid=${rest%%|*}
|
||||
rest=${rest#*|}
|
||||
required=${rest%%|*}
|
||||
rest=${rest#*|}
|
||||
cleanup=${rest%%|*}
|
||||
rest=${rest#*|}
|
||||
destfileid=${rest%%|*}
|
||||
rest=${rest#*|}
|
||||
destfilename=${rest%%|*}
|
||||
Delete tasks <<<"id = $taskid"
|
||||
rest=${rest#*|}
|
||||
}
|
||||
|
||||
cleaner() {
|
||||
for key in ${!failedtasks[@]}
|
||||
do
|
||||
taskid=${failedtasks[key]}
|
||||
gettaskinfos $taskid
|
||||
faildepends=$(
|
||||
Select tasks 'COUNT(*)' <<-EOWhere
|
||||
requires = $taskid
|
||||
EOWhere
|
||||
)
|
||||
(( failed+=faildepends ))
|
||||
Update tasks status 2 <<<"id = $taskid"
|
||||
Update tasks status 2 <<<"requires = $taskid"
|
||||
echo "SELECT COUNT(*)
|
||||
FROM tasks
|
||||
WHERE ( status = 0 OR status = 1 )
|
||||
AND required = $taskid;">&3
|
||||
read -u4 count
|
||||
if (( count == 0 ))
|
||||
then
|
||||
rm -f "$cleanup"
|
||||
fi
|
||||
unset failedtasks[key]
|
||||
done
|
||||
for key in ${!finishedtasks[@]}
|
||||
do
|
||||
taskid=${finishedtasks[key]}
|
||||
gettaskinfos $taskid
|
||||
if [ -n "$destfilename" ]
|
||||
then
|
||||
echo \
|
||||
@ -1579,75 +1530,18 @@ master() {
|
||||
"WHERE id=$destfileid;" \
|
||||
>&3
|
||||
fi
|
||||
;;
|
||||
'failed')
|
||||
eval 'echo AtOM:OK >&'$((workerid+100))
|
||||
[ -z "${workertasks[workerid]}" ] && continue
|
||||
unset workertasks[workerid]
|
||||
(( --active )) || true
|
||||
(( ++failed ))
|
||||
(( ++ran ))
|
||||
taskid=$workerquery
|
||||
faildepends=$(
|
||||
Select tasks 'COUNT(*)' <<-EOWhere
|
||||
requires = $taskid
|
||||
EOWhere
|
||||
)
|
||||
(( failed+=faildepends ))
|
||||
Update tasks status 2 <<<"id = $taskid"
|
||||
Update tasks status 2 <<<"requires = $taskid"
|
||||
;;
|
||||
'cleanup')
|
||||
required=$workerquery
|
||||
echo "SELECT COUNT(*)
|
||||
FROM tasks
|
||||
WHERE ( status = 0 OR status = 1 )
|
||||
AND required = $required;">&3
|
||||
AND required = $taskid;">&3
|
||||
read -u4 count
|
||||
if (( count == 0 ))
|
||||
then
|
||||
eval echo 1 '>&'$((100+workerid))
|
||||
else
|
||||
eval echo 0 '>&'$((100+workerid))
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
eval 'echo "AtOM:ComFail" >&'$((100+workerid))
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
getworkerid() {
|
||||
local i
|
||||
for (( i=0 ; i < 100 ; i++ ))
|
||||
do
|
||||
if [ -z "${workers[i]}" ]
|
||||
then
|
||||
echo $i
|
||||
break
|
||||
rm -f "$cleanup"
|
||||
fi
|
||||
Delete tasks <<<"id = $taskid"
|
||||
unset finishedtasks[key]
|
||||
done
|
||||
# If we reach this, we have reached the hardcoded 100 workers limit
|
||||
(( concurrency-- ))
|
||||
}
|
||||
|
||||
createworker() {
|
||||
mkfifo "$tempdir"/worker$1{in,out}
|
||||
worker $1 <"$tempdir"/worker$1in >"$tempdir"/worker$1out &
|
||||
workers[$1]=$!
|
||||
eval exec $((100+$1))'>"$tempdir"/worker$1in'
|
||||
eval exec $((200+$1))'<"$tempdir"/worker$1out'
|
||||
}
|
||||
|
||||
destroyworker() {
|
||||
dyingworker=${workers[$1]}
|
||||
unset workers[$1]
|
||||
[ -z "$2" ] && eval echo AtOM:Die '>&'$((100+$1))
|
||||
wait $dyingworker
|
||||
eval $((100+$1))'>&-'
|
||||
eval $((200+$1))'<&-'
|
||||
rm "$tempdir"/worker$1{in,out}
|
||||
}
|
||||
|
||||
checkworkers() {
|
||||
@ -1655,20 +1549,17 @@ checkworkers() {
|
||||
do
|
||||
if ! kill -0 ${workers[key]} 2>/dev/null
|
||||
then
|
||||
destroyworker $key nokill
|
||||
if [ -n "${workertasks[key]}" ]
|
||||
taskid=${workertasks[key]}
|
||||
(( ++ran ))
|
||||
(( active-- ))
|
||||
if destroyworker $key
|
||||
then
|
||||
faildepends=$(
|
||||
Select tasks 'COUNT(*)' <<-EOWhere
|
||||
requires = ${workertasks[key]}
|
||||
EOWhere
|
||||
)
|
||||
finishedtasks+=($taskid)
|
||||
else
|
||||
failedtasks+=($taskid)
|
||||
(( ++failed ))
|
||||
(( failed+=faildepends ))
|
||||
Update tasks status 2 <<<"id = ${workertasks[key]}"
|
||||
Update tasks status 2 <<<"requires = ${workertasks[key]}"
|
||||
fi
|
||||
createworker $key
|
||||
unset workertasks[key]
|
||||
fi
|
||||
done
|
||||
}
|
||||
@ -2115,23 +2006,21 @@ done
|
||||
echo 'COMMIT;' >&3
|
||||
echo -e "\rCreated ${count:-0} tasks for $filecount files (${copies:-0} immediate copies)"
|
||||
|
||||
masterpid=$$
|
||||
trap checkworkers USR1 ALRM PIPE
|
||||
rm -f "$tempdir"/worker*
|
||||
concurrency=$(( maxload / 2 ))
|
||||
(( concurrency )) || concurrency=1
|
||||
active=0
|
||||
#set -x
|
||||
for (( i=0 ; i < concurrency ; i++ ))
|
||||
do
|
||||
createworker $(getworkerid)
|
||||
master
|
||||
done
|
||||
concurrencychange=$(date +%s)
|
||||
starttime=$concurrencychange
|
||||
taskcount=$count
|
||||
failed=0
|
||||
while :
|
||||
while (( ${#workers[@]} ))
|
||||
do
|
||||
if read -n 1 -t 0.01 userinput
|
||||
if read -n 1 -t 0.1 userinput
|
||||
then
|
||||
case $userinput in
|
||||
'+')
|
||||
@ -2158,9 +2047,10 @@ do
|
||||
then
|
||||
concurrencychange=$(date +%s)
|
||||
(( ++concurrency ))
|
||||
createworker $(getworkerid)
|
||||
fi
|
||||
fi
|
||||
checkworkers
|
||||
cleaner
|
||||
master
|
||||
if ((taskcount - remaining))
|
||||
then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user