From a3e80e9416f74205d5956db1fd1e2cf063b57437 Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Tue, 28 Jan 2025 23:23:40 +0100 Subject: [PATCH] cleanup: move task creation to a function --- lib/workers/create | 145 +++++++++++++++++++++++++++++++++++++++++++++ lib/workers/master | 144 +------------------------------------------- 2 files changed, 146 insertions(+), 143 deletions(-) create mode 100644 lib/workers/create diff --git a/lib/workers/create b/lib/workers/create new file mode 100644 index 0000000..f4c9cff --- /dev/null +++ b/lib/workers/create @@ -0,0 +1,145 @@ +#!/usr/bin/env bash + +createworker() { + (( ++active )) + read -u4 line + taskid=${line%%::AtOM:SQL:Sep::*} + rest="${line#*::AtOM:SQL:Sep::}::AtOM:SQL:Sep::" + sourcefileid=${rest%%::AtOM:SQL:Sep::*} + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") + rest=${rest#*::AtOM:SQL:Sep::} + cleanup=${rest%%::AtOM:SQL:Sep::*} + rest=${rest#*::AtOM:SQL:Sep::} + destfileid=${rest%%::AtOM:SQL:Sep::*} + rest=${rest#*::AtOM:SQL:Sep::} + destfilename=${rest%%::AtOM:SQL:Sep::*} + rest=${rest#*::AtOM:SQL:Sep::} + for key in ${!cmd_arg[@]} + do + [ -z "${cmd_arg[key]}" ] && unset cmd_arg[key] + done + workerid=$(getworkerid) + workertasks[workerid]=$taskid + Update tasks status 1 <<<"id = $taskid" + worker $workerid & + workers[$workerid]=$! +} \ No newline at end of file diff --git a/lib/workers/master b/lib/workers/master index efe0155..831fcdc 100644 --- a/lib/workers/master +++ b/lib/workers/master @@ -120,149 +120,7 @@ master() { then sleep 0.1 else - (( ++active )) - read -u4 line - taskid=${line%%::AtOM:SQL:Sep::*} - rest="${line#*::AtOM:SQL:Sep::}::AtOM:SQL:Sep::" - sourcefileid=${rest%%::AtOM:SQL:Sep::*} - rest=${rest#*::AtOM:SQL:Sep::} - required=${rest%%::AtOM:SQL:Sep::*} - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cmd_arg+=("${rest%%::AtOM:SQL:Sep::*}") - rest=${rest#*::AtOM:SQL:Sep::} - cleanup=${rest%%::AtOM:SQL:Sep::*} - rest=${rest#*::AtOM:SQL:Sep::} - destfileid=${rest%%::AtOM:SQL:Sep::*} - rest=${rest#*::AtOM:SQL:Sep::} - destfilename=${rest%%::AtOM:SQL:Sep::*} - rest=${rest#*::AtOM:SQL:Sep::} - for key in ${!cmd_arg[@]} - do - [ -z "${cmd_arg[key]}" ] && unset cmd_arg[key] - done - workerid=$(getworkerid) - workertasks[workerid]=$taskid - Update tasks status 1 <<<"id = $taskid" - worker $workerid & - workers[$workerid]=$! + createworker fi fi }