Feature/add kill to stdio client #183
+170
−2
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| //go:build !windows | ||
| // +build !windows | ||
|
|
||
| package transport | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/shirou/gopsutil/v3/process" | ||
| ) | ||
|
|
||
| func killByPid(pid int) error { | ||
| proc, err := process.NewProcess(int32(pid)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // first send SIGTERM | ||
| err = proc.Terminate() | ||
|
There was a problem hiding this comment. How about using There was a problem hiding this comment. On linux/unix, we can simple use process.Signal() to send signal. |
||
| if err != nil { | ||
| fmt.Printf("Failed to send SIGTERM to pid %d: %v\n", pid, err) | ||
| } | ||
|
|
||
| _, err = proc.Status() | ||
| if err == nil { | ||
| // kill ok | ||
| return nil | ||
| } | ||
| // send SIGKILL | ||
| return proc.Kill() | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| //go:build windows | ||
|
There was a problem hiding this comment. I recommend to move it to a util package There was a problem hiding this comment. Move to the top level package? There was a problem hiding this comment. maybe |
||
| // +build windows | ||
|
|
||
| package transport | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "github.com/shirou/gopsutil/v3/process" | ||
|
There was a problem hiding this comment. I still don't like this dep. Can you justify why it is actually needed? There was a problem hiding this comment. I think @cryo-zd gave a good suggestion in #183 (comment) on how we might be able to avoid it. |
||
| ) | ||
|
|
||
| func killByPid(pid int) error { | ||
| proc, err := process.NewProcess(int32(pid)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // 获取所有子进程（递归） | ||
|
There was a problem hiding this comment. Please translate to English for consistency |
||
| children, err := proc.Children() | ||
| if err == nil { | ||
| for _, child := range children { | ||
| err = killByPid(int(child.Pid)) // 递归杀子进程 | ||
| if err != nil { | ||
| fmt.Printf("Failed to kill pid %d: %v\n", child.Pid, err) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // 杀掉当前进程 | ||
| p, err := os.FindProcess(int(pid)) | ||
| if err == nil { | ||
| // windows does not support SIGTERM, so we just use Kill() | ||
| err = p.Kill() | ||
| if err != nil { | ||
| fmt.Printf("Failed to kill pid %d: %v\n", pid, err) | ||
| } | ||
| } | ||
| return err | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather not introduce a new dependency if we can help it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, but handling subprocess termination on Windows is tricky and can get messy. May be it's a trade off.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for OS windows, how about utilizing command
taskkillto kill a process and its subprocess:pid := fmt.Sprint(proc.Pid)cmd := exec.Command("taskkill", "/T", "/PID", pid)cmd = exec.Command("taskkill", "/F", "/T", "/PID", pid)If it works, we may not need to introduce this dependency
https://learn.microsoft.com/zh-cn/windows-server/administration/windows-commands/taskkill
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea @cryo-zd