diff --git a/haiku-apps/slayer/patches/slayer-0.9.patchset b/haiku-apps/slayer/patches/slayer-0.9.patchset deleted file mode 100644 index 0a7baa832..000000000 --- a/haiku-apps/slayer/patches/slayer-0.9.patchset +++ /dev/null @@ -1,52 +0,0 @@ -From aa827341d670c542f8b8475ba3cc63384aa8537d Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Thu, 12 Nov 2015 08:49:19 +0100 -Subject: Exclude Idle threads from CPU use compuation. - - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index 7f392a2..44f66f0 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -282,6 +282,7 @@ void MainWindow::UpdateTeams() - iteration = (iteration + 1) % 2; - - total_CPU_diff = 0; -+ int idle_CPU_diff = 0; - - for (i = 0; get_next_team_info(&te_cookie, &teinf) == B_NO_ERROR; i++) { - if (!(team_item = (TeamItem *)team_items_list->get(teinf.team))) { -@@ -297,7 +298,10 @@ void MainWindow::UpdateTeams() - thread_item->refreshed = iteration; - team_item->thread_items_list->put(thinf.thread, thread_item); - teamView->AddUnder(thread_item, team_item); -- team_item->CPU_diff += thread_item->CPU_diff; -+ if (teinf.team != 1 || strncmp(thinf.name, "idle thread ", 12) != 0) { -+ team_item->CPU_diff += thread_item->CPU_diff; -+ } else -+ idle_CPU_diff += thread_item->CPU_diff; - } - } - // update team -@@ -318,13 +322,17 @@ void MainWindow::UpdateTeams() - thread_item->update(&thinf); - thread_item->refreshed = iteration; - } -- team_item->CPU_diff += thread_item->CPU_diff; -+ if (teinf.team != 1 || strncmp(thinf.name, "idle thread ", 12) != 0) { -+ team_item->CPU_diff += thread_item->CPU_diff; -+ } else -+ idle_CPU_diff += thread_item->CPU_diff; - } - - } - total_CPU_diff += team_item->CPU_diff; - if (total_CPU_diff < 0) printf("Error. CPU diff out of bounds\n"); - } -+ total_CPU_diff += idle_CPU_diff; - - // division by zero && overflow handling - if (total_CPU_diff <= 0) total_CPU_diff = 1; --- -2.2.2 - diff --git a/haiku-apps/slayer/slayer-0.9.recipe b/haiku-apps/slayer/slayer-0.9.recipe index f39a628eb..fc88aff44 100644 --- a/haiku-apps/slayer/slayer-0.9.recipe +++ b/haiku-apps/slayer/slayer-0.9.recipe @@ -2,14 +2,12 @@ SUMMARY="A tool to manage teams and threads" DESCRIPTION="Monitor CPU and memory usage of running threads and teams, \ adjust their priorities or kill them." LICENSE="GNU GPL v3" -COPYRIGHT="1998 Arto Jalkanen." +COPYRIGHT="1998 Arto Jalkanen" HOMEPAGE="https://github.com/HaikuArchives/Slayer" -SOURCE_URI="git+https://github.com/HaikuArchives/Slayer.git#e04057b" -REVISION="2" +SOURCE_URI="git+https://github.com/HaikuArchives/Slayer.git#5e3fa02" +REVISION="3" ARCHITECTURES="?x86 x86_gcc2" -PATCHES="slayer-$portVersion.patchset" - PROVIDES=" slayer = $portVersion app:Slayer = $portVersion @@ -29,12 +27,12 @@ BUILD_PREREQUIRES=" BUILD() { cd src - make $jobArgs + make OBJ_DIR=objects $jobArgs } INSTALL() { mkdir -p $appsDir - cp src/objects.*-release/Slayer $appsDir/Slayer + cp src/objects/Slayer $appsDir/Slayer addAppDeskbarSymlink $appsDir/Slayer }