From 460081435558725db1144a407142865bf237fa23 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 16 Sep 2018 23:24:25 +0100 Subject: [PATCH 01/10] Add ability to build device tree from source as opposed to deriving from sopcinfo file --- compile/eclipsebuild/eclipseds5build.gsh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index f05603a..2a6fce3 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -4,13 +4,16 @@ def doKillLeftovers() { sh """ # Killing any processes that may interfere with the next build # The build system must be setup to do more than one eclipse build concurrently - ps aux | grep "eclipsews" - ps aux | grep "make" - ps aux | grep "arm-linux" + USER=`whoami` + pgrep -U "${USER}" "eclipse" + pgrep -U "${USER}" "eclipsews" + pgrep -U "${USER}" "make" + pgrep -U "${USER}" "arm-linux" # Don't return an error if the processes don't exist - pkill -9 eclipsews || true - pkill -9 make || true - pkill -9 ".*arm-linux.*" || true + pkill -U "${USER}" -9 eclipse || true + pkill -U "${USER}" -9 eclipsews || true + pkill -U "${USER}" -9 make || true + pkill -U "${USER}" -9 ".*arm-linux.*" || true """ } } From 36dffd80e636a43d25eb0ab7c2a76111a9f0d3c1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 00:22:21 +0100 Subject: [PATCH 02/10] Correct pkill call --- compile/eclipsebuild/eclipseds5build.gsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 2a6fce3..731c6b4 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -5,10 +5,10 @@ def doKillLeftovers() { # Killing any processes that may interfere with the next build # The build system must be setup to do more than one eclipse build concurrently USER=`whoami` - pgrep -U "${USER}" "eclipse" - pgrep -U "${USER}" "eclipsews" - pgrep -U "${USER}" "make" - pgrep -U "${USER}" "arm-linux" + pgrep -U "${USER}" "eclipse" || true + pgrep -U "${USER}" "eclipsews" || true + pgrep -U "${USER}" "make" || true + pgrep -U "${USER}" "arm-linux" || true # Don't return an error if the processes don't exist pkill -U "${USER}" -9 eclipse || true pkill -U "${USER}" -9 eclipsews || true From dc977fe2558012f89c56fa46aa66935ad68d1814 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 09:08:28 +0100 Subject: [PATCH 03/10] Stop builds killing each other on the same slave --- compile/eclipsebuild/eclipseds5build.gsh | 79 ++++++++++++------------ 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 731c6b4..4638179 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -4,15 +4,13 @@ def doKillLeftovers() { sh """ # Killing any processes that may interfere with the next build # The build system must be setup to do more than one eclipse build concurrently - USER=`whoami` - pgrep -U "${USER}" "eclipse" || true - pgrep -U "${USER}" "eclipsews" || true - pgrep -U "${USER}" "make" || true - pgrep -U "${USER}" "arm-linux" || true # Don't return an error if the processes don't exist + USER=`whoami` + ps aux | grep "eclipse" pkill -U "${USER}" -9 eclipse || true - pkill -U "${USER}" -9 eclipsews || true + ps aux | grep "make" pkill -U "${USER}" -9 make || true + ps aux | grep "arm-linux" pkill -U "${USER}" -9 ".*arm-linux.*" || true """ } @@ -106,42 +104,45 @@ def doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, // Build and export files def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, exportfolder = "${WORKSPACE}/bin") { - doKillLeftovers() - addToolchainPath(toolchainfolder) - doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) - for (appInfo in apps ) { - (build, cleanbuild, project, variants, exportpathlist) = appInfo - if (build) { - if (cleanbuild) { - buildtype = "-cleanBuild" - } - else { - buildtype = "-build" - } - for (build_variant in variants) { - retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) - doRegisterToolchain(ds5folder, toolchainfolder) - echo "Build command: ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\'" - if (isUnix()) { - sh """ - echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\' - echo End time: `date` - """ + // The lock is being used because it was being found that the doKillLeftovers was affecting other builds + lock(resource: "eclipsebuild_${env.NODE_NAME}") { + doKillLeftovers() + addToolchainPath(toolchainfolder) + doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) + for (appInfo in apps ) { + (build, cleanbuild, project, variants, exportpathlist) = appInfo + if (build) { + if (cleanbuild) { + buildtype = "-cleanBuild" + } + else { + buildtype = "-build" + } + for (build_variant in variants) { + retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) + doRegisterToolchain(ds5folder, toolchainfolder) + echo "Build command: ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\'" + if (isUnix()) { + sh """ + echo Start time: `date` + ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\' + echo End time: `date` + """ + } + else { + bat """ + "%ds5shellcommand%" "%buildcommand%" ${buildtype} "${project}\\${build_variant}" + """ + } + doExport(exportfolder, exportpathlist, "", build_variant) } - else { - bat """ - "%ds5shellcommand%" "%buildcommand%" ${buildtype} "${project}\\${build_variant}" - """ - } - doExport(exportfolder, exportpathlist, "", build_variant) } } - } - else { - // Only export if the project has no variants - signifying that there are files to export which have been prebuilt - if (!variants) { - doExport(exportfolder, exportpathlist, project) + else { + // Only export if the project has no variants - signifying that there are files to export which have been prebuilt + if (!variants) { + doExport(exportfolder, exportpathlist, project) + } } } } From fc8bf281ae04c7888a7fbaa25f7fed9c5a83aa5c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 09:21:27 +0100 Subject: [PATCH 04/10] Stop builds killing each other on the same slave --- compile/eclipsebuild/eclipseds5build.gsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 4638179..9cf1c57 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -7,11 +7,11 @@ def doKillLeftovers() { # Don't return an error if the processes don't exist USER=`whoami` ps aux | grep "eclipse" - pkill -U "${USER}" -9 eclipse || true + # pkill -U "${USER}" -9 eclipse || true ps aux | grep "make" - pkill -U "${USER}" -9 make || true + # pkill -U "${USER}" -9 make || true ps aux | grep "arm-linux" - pkill -U "${USER}" -9 ".*arm-linux.*" || true + # pkill -U "${USER}" -9 ".*arm-linux.*" || true """ } } From 35cab07aff5d1e5a99acd4b715ef4e7db6e6392d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 13:35:39 +0100 Subject: [PATCH 05/10] Move -no-indexer parameter into a consistent position --- compile/eclipsebuild/eclipseds5build.gsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 9cf1c57..7de42dd 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -121,17 +121,17 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou for (build_variant in variants) { retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) doRegisterToolchain(ds5folder, toolchainfolder) - echo "Build command: ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\'" + echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" if (isUnix()) { sh """ echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\' + ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' echo End time: `date` """ } else { bat """ - "%ds5shellcommand%" "%buildcommand%" ${buildtype} "${project}\\${build_variant}" + "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" """ } doExport(exportfolder, exportpathlist, "", build_variant) From c3b1af3b93893dc7cc1e110ccd7cf371830cae56 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 13:45:37 +0100 Subject: [PATCH 06/10] Kill leftovers after a successful or failed build --- compile/eclipsebuild/eclipseds5build.gsh | 93 ++++++++++++++---------- 1 file changed, 55 insertions(+), 38 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 7de42dd..3444d25 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -1,5 +1,4 @@ - -def doKillLeftovers() { +def doDisplayLeftovers() { if (isUnix()) { sh """ # Killing any processes that may interfere with the next build @@ -7,11 +6,23 @@ def doKillLeftovers() { # Don't return an error if the processes don't exist USER=`whoami` ps aux | grep "eclipse" - # pkill -U "${USER}" -9 eclipse || true ps aux | grep "make" - # pkill -U "${USER}" -9 make || true ps aux | grep "arm-linux" - # pkill -U "${USER}" -9 ".*arm-linux.*" || true + """ + } +} + +def doKillLeftovers() { + if (isUnix()) { + doDisplayLeftovers() + sh """ + # Killing any processes that may interfere with the next build + # The build system must be setup to do more than one eclipse build concurrently + # Don't return an error if the processes don't exist + USER=`whoami` + pkill -U "${USER}" -9 eclipse || true + pkill -U "${USER}" -9 make || true + pkill -U "${USER}" -9 ".*arm-linux.*" || true """ } } @@ -106,45 +117,51 @@ def doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, exportfolder = "${WORKSPACE}/bin") { // The lock is being used because it was being found that the doKillLeftovers was affecting other builds lock(resource: "eclipsebuild_${env.NODE_NAME}") { - doKillLeftovers() - addToolchainPath(toolchainfolder) - doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) - for (appInfo in apps ) { - (build, cleanbuild, project, variants, exportpathlist) = appInfo - if (build) { - if (cleanbuild) { - buildtype = "-cleanBuild" + doDisplayLeftovers() + try { + addToolchainPath(toolchainfolder) + doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) + for (appInfo in apps ) { + (build, cleanbuild, project, variants, exportpathlist) = appInfo + if (build) { + if (cleanbuild) { + buildtype = "-cleanBuild" + } + else { + buildtype = "-build" + } + for (build_variant in variants) { + retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) + doRegisterToolchain(ds5folder, toolchainfolder) + echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" + if (isUnix()) { + sh """ + echo Start time: `date` + ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' + echo End time: `date` + """ + } + else { + bat """ + "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" + """ + } + doExport(exportfolder, exportpathlist, "", build_variant) + } + } } else { - buildtype = "-build" - } - for (build_variant in variants) { - retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) - doRegisterToolchain(ds5folder, toolchainfolder) - echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" - if (isUnix()) { - sh """ - echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' - echo End time: `date` - """ - } - else { - bat """ - "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" - """ - } - doExport(exportfolder, exportpathlist, "", build_variant) + // Only export if the project has no variants - signifying that there are files to export which have been prebuilt + if (!variants) { + doExport(exportfolder, exportpathlist, project) } } } - else { - // Only export if the project has no variants - signifying that there are files to export which have been prebuilt - if (!variants) { - doExport(exportfolder, exportpathlist, project) - } - } + } catch (Exception e) { + error "Build failed - Killing leftovers" + doKillLeftovers() } + doKillLeftovers() } } From 488454ae61eb46aefdff2d570a599b982808790b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 22:15:22 +0100 Subject: [PATCH 07/10] Display leftovers at the beginning of each build --- compile/eclipsebuild/eclipseds5build.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 3444d25..c81e200 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -117,7 +117,6 @@ def doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, exportfolder = "${WORKSPACE}/bin") { // The lock is being used because it was being found that the doKillLeftovers was affecting other builds lock(resource: "eclipsebuild_${env.NODE_NAME}") { - doDisplayLeftovers() try { addToolchainPath(toolchainfolder) doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) @@ -132,6 +131,7 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou } for (build_variant in variants) { retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) + doDisplayLeftovers() doRegisterToolchain(ds5folder, toolchainfolder) echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" if (isUnix()) { From efdae69ce827bb37e602759eee6aa03b35597a31 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 22:28:42 +0100 Subject: [PATCH 08/10] Timeout builds --- compile/eclipsebuild/eclipseds5build.gsh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index c81e200..cd31301 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -8,6 +8,7 @@ def doDisplayLeftovers() { ps aux | grep "eclipse" ps aux | grep "make" ps aux | grep "arm-linux" + ps aux | grep "sh" """ } } @@ -135,11 +136,14 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou doRegisterToolchain(ds5folder, toolchainfolder) echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" if (isUnix()) { - sh """ - echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' - echo End time: `date` - """ + timeout(time: 5, unit: MINUTES) { + sh """ + echo Start time: `date` + ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' + echo End time: `date` + """ + } + sleep(time: 4, unit: SECONDS) } else { bat """ From 3f92a1a0b65cd9cac8a97c61ad39d61180c858f5 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 17 Sep 2018 22:40:33 +0100 Subject: [PATCH 09/10] Timeout builds --- compile/eclipsebuild/eclipseds5build.gsh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index cd31301..5e1c0de 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -51,6 +51,7 @@ def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { if (isUnix()) { result = sh( script: """ cp -r -v "${srcFileExpanded}" "${destFolder}" + if [ \$? -ne 0 ]; then exit 1; fi """, returnStatus: true ) @@ -61,6 +62,7 @@ def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { else { result = bat( script: ''' copy \"%srcFileExpanded%\" \"%destFolder%\" + if errorlevel 1 EXIT /b 1 ''', returnStatus: true ) @@ -136,14 +138,14 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou doRegisterToolchain(ds5folder, toolchainfolder) echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" if (isUnix()) { - timeout(time: 5, unit: MINUTES) { + timeout(time: 5, unit: 'MINUTES') { sh """ echo Start time: `date` ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' echo End time: `date` """ } - sleep(time: 4, unit: SECONDS) + sleep(time: 4, unit: 'SECONDS') } else { bat """ From 9c52e610af9667d69015cf5adcd69fef9a426807 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 18 Sep 2018 00:25:06 +0100 Subject: [PATCH 10/10] Jobs are being killed unexpectedly so remove potential source; Add more timeouts; Extend timeouts --- compile/eclipsebuild/eclipseds5build.gsh | 48 +++++++++++++----------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 5e1c0de..9fd5293 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -8,7 +8,7 @@ def doDisplayLeftovers() { ps aux | grep "eclipse" ps aux | grep "make" ps aux | grep "arm-linux" - ps aux | grep "sh" + # ps aux | grep "sh" """ } } @@ -121,8 +121,10 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou // The lock is being used because it was being found that the doKillLeftovers was affecting other builds lock(resource: "eclipsebuild_${env.NODE_NAME}") { try { - addToolchainPath(toolchainfolder) - doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) + timeout(time: 2, unit: 'MINUTES') { + addToolchainPath(toolchainfolder) + doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) + } for (appInfo in apps ) { (build, cleanbuild, project, variants, exportpathlist) = appInfo if (build) { @@ -134,25 +136,30 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou } for (build_variant in variants) { retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) - doDisplayLeftovers() - doRegisterToolchain(ds5folder, toolchainfolder) - echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" - if (isUnix()) { - timeout(time: 5, unit: 'MINUTES') { - sh """ - echo Start time: `date` - ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' - echo End time: `date` - """ + try { + doDisplayLeftovers() + doRegisterToolchain(ds5folder, toolchainfolder) + echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\'" + timeout(time: 10, unit: 'MINUTES') { + if (isUnix()) { + sh """ + echo Start time: `date` + ${ds5shellcommand} \'${buildcommand} -no-indexer ${buildtype} \"${project}/${build_variant}\"\' + echo End time: `date` + """ + } + else { + bat """ + "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" + """ + } } + doExport(exportfolder, exportpathlist, "", build_variant) + } catch (Exception e) { + echo "Build failed - Waiting for a while" sleep(time: 4, unit: 'SECONDS') + error "Build failed..." } - else { - bat """ - "%ds5shellcommand%" "%buildcommand%" -no-indexer ${buildtype} "${project}\\${build_variant}" - """ - } - doExport(exportfolder, exportpathlist, "", build_variant) } } } @@ -164,10 +171,9 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou } } } catch (Exception e) { + // doKillLeftovers() error "Build failed - Killing leftovers" - doKillLeftovers() } - doKillLeftovers() } }