From 7ff732e06ef17a9324bc3eb86e44bb0f31c2c734 Mon Sep 17 00:00:00 2001 From: Jaron Swab Date: Thu, 3 Oct 2019 20:59:22 -0400 Subject: [PATCH] Added sigterm options to "d" command. This should satisfy issue #13 (at least in part). `main.go` now has cases for "dd", "d3", and "d9". "d3" is "sigquit" and "d9" is "sigkill". `KillProc()` now takes a string as an arugment to perferm desired kill action using `--signal`. `help.go` also has been update to reflect the additions. --- main.go | 10 +++++++++- src/widgets/help.go | 6 ++++-- src/widgets/proc.go | 7 ++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index c29b9a0..e69b14c 100644 --- a/main.go +++ b/main.go @@ -381,7 +381,15 @@ func eventLoop() { ui.Render(proc) case "d": if previousKey == "d" { - proc.KillProc() + proc.KillProc("SIGTERM") + } + case "3": + if previousKey == "d" { + proc.KillProc("SIGQUIT") + } + case "9": + if previousKey == "d" { + proc.KillProc("SIGKILL") } case "": proc.ToggleShowingGroupedProcs() diff --git a/src/widgets/help.go b/src/widgets/help.go index 54ddfbc..953de45 100644 --- a/src/widgets/help.go +++ b/src/widgets/help.go @@ -22,7 +22,9 @@ Process navigation Process actions: - : toggle process grouping - - dd: kill selected process or group of processes + - dd: kill selected process or group of processes with SIGTERM (15) + - d3: kill selected process or group of processes with SIGQUIT (3) + - d9: kill selected process or group of processes with SIGKILL (9) Process sorting - c: CPU @@ -50,7 +52,7 @@ func (self *HelpMenu) Resize(termWidth, termHeight int) { textWidth = maxInt(len(line), textWidth) } textWidth += 2 - textHeight := 22 + textHeight := 28 x := (termWidth - textWidth) / 2 y := (termHeight - textHeight) / 2 diff --git a/src/widgets/proc.go b/src/widgets/proc.go index d48ed9a..e782ec0 100644 --- a/src/widgets/proc.go +++ b/src/widgets/proc.go @@ -182,14 +182,15 @@ func (self *ProcWidget) ToggleShowingGroupedProcs() { self.convertProcsToTableRows() } -// KillProc kills a process or group of processes depending on if we're displaying the processes grouped or not. -func (self *ProcWidget) KillProc() { +// KillProc kills a process or group of processes depending on if we're +// displaying the processes grouped or not. +func (self *ProcWidget) KillProc(sigName string) { self.SelectedItem = "" command := "kill" if self.UniqueCol == 1 { command = "pkill" } - cmd := exec.Command(command, self.Rows[self.SelectedRow][self.UniqueCol]) + cmd := exec.Command(command, "--signal", sigName, self.Rows[self.SelectedRow][self.UniqueCol]) cmd.Start() cmd.Wait() }