From 9f44a1f6d224c0647df17d533e3a500cac2913ba Mon Sep 17 00:00:00 2001
From: Vincent Riquer <vincent+gitorious@riquer.fr>
Date: Fri, 31 May 2013 13:54:10 +0200
Subject: [PATCH] Better progress and time estimation

---
 atom                | 4 ++--
 lib/workers/cleaner | 1 +
 lib/workers/worker  | 9 ---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/atom b/atom
index 7d21def..31775ae 100755
--- a/atom
+++ b/atom
@@ -544,13 +544,13 @@ do
 	checkworkers
 	cleaner
 	master
-	if (( ran ))
+	if (( ran - failed ))
 	then
 		currenttime=$(date +%s)
 		avgduration=$((
 			((currenttime - starttime) * 1000)
 			/
-			ran
+			( ran - failed )
 		))
 		secsremaining=$(( remaining * avgduration / 1000 ))
 		(( days =
diff --git a/lib/workers/cleaner b/lib/workers/cleaner
index 3db4e0a..56071ea 100644
--- a/lib/workers/cleaner
+++ b/lib/workers/cleaner
@@ -10,6 +10,7 @@ cleaner() {
 			EOWhere
 		)
 		(( failed+=faildepends ))
+		(( ran+=faildepends ))
 		Update tasks status 2 <<<"id = $taskid"
 		Update tasks status 2 <<<"requires = $taskid"
 		echo "SELECT	COUNT(*)
diff --git a/lib/workers/worker b/lib/workers/worker
index c4b5954..5df3376 100644
--- a/lib/workers/worker
+++ b/lib/workers/worker
@@ -4,12 +4,3 @@ worker() {
 	(( debug >= 2 )) && echo "${cmd_arg[@]}" >&2
 	"${cmd_arg[@]}" >/dev/null
 }
-createworker() {
-	worker $1 &
-	workers[$1]=$!
-}
-destroyworker() {
-	dyingworker=${workers[$1]}
-	unset workers[$1]
-	wait $dyingworker
-}