OrgGo/shirou_gopsutil
1
0
Fork 0
mirror of https://github.com/shirou/gopsutil.git synced 2025-05-10 19:29:14 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1182 from kestrelcjx/kestrel/process

Browse Source 
fix(process): fix the bug that the program is hung when getting the f…
This commit is contained in:
shirou 2021-11-20 22:46:59 +09:00 committed by GitHub
commit de385f50a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
process/process_windows.go
View File

@ -12,6 +12,7 @@ import (
"reflect"
"strings"
"syscall"
"time"
"unicode/utf16"
"unsafe"
@ -720,24 +721,38 @@ func (p *Process) OpenFilesWithContext(ctx context.Context) ([]OpenFilesStat, er
continue
}
var buf [syscall.MAX_LONG_PATH]uint16
n, err := windows.GetFinalPathNameByHandle(windows.Handle(file), &buf[0], syscall.MAX_LONG_PATH, 0)
if err != nil {
continue
}
var fileName string
ch := make(chan struct{})
fileName := string(utf16.Decode(buf[:n]))
fileInfo, _ := os.Stat(fileName)
if fileInfo.IsDir() {
continue
}
go func() {
var buf [syscall.MAX_LONG_PATH]uint16
n, err := windows.GetFinalPathNameByHandle(windows.Handle(file), &buf[0], syscall.MAX_LONG_PATH, 0)
if err != nil {
return
}
if _, exists := fileExists[fileName]; !exists {
files = append(files, OpenFilesStat{
Path: fileName,
Fd: uint64(file),
})
fileExists[fileName] = true
fileName = string(utf16.Decode(buf[:n]))
ch <- struct{}{}
}()
select {
case <-time.NewTimer(100 * time.Millisecond).C:
continue
case <-ch:
fileInfo, _ := os.Stat(fileName)
if fileInfo.IsDir() {
continue
}
if _, exists := fileExists[fileName]; !exists {
files = append(files, OpenFilesStat{
Path: fileName,
Fd: uint64(file),
})
fileExists[fileName] = true
}
case <-ctx.Done():
return files, ctx.Err()
}
}

47
v3/process/process_windows.go
View File

@ -12,6 +12,7 @@ import (
"reflect"
"strings"
"syscall"
"time"
"unicode/utf16"
"unsafe"
@ -707,24 +708,38 @@ func (p *Process) OpenFilesWithContext(ctx context.Context) ([]OpenFilesStat, er
continue
}
var buf [syscall.MAX_LONG_PATH]uint16
n, err := windows.GetFinalPathNameByHandle(windows.Handle(file), &buf[0], syscall.MAX_LONG_PATH, 0)
if err != nil {
continue
}
var fileName string
ch := make(chan struct{})
fileName := string(utf16.Decode(buf[:n]))
fileInfo, _ := os.Stat(fileName)
if fileInfo.IsDir() {
continue
}
go func() {
var buf [syscall.MAX_LONG_PATH]uint16
n, err := windows.GetFinalPathNameByHandle(windows.Handle(file), &buf[0], syscall.MAX_LONG_PATH, 0)
if err != nil {
return
}
if _, exists := fileExists[fileName]; !exists {
files = append(files, OpenFilesStat{
Path: fileName,
Fd: uint64(file),
})
fileExists[fileName] = true
fileName = string(utf16.Decode(buf[:n]))
ch <- struct{}{}
}()
select {
case <-time.NewTimer(100 * time.Millisecond).C:
continue
case <-ch:
fileInfo, _ := os.Stat(fileName)
if fileInfo.IsDir() {
continue
}
if _, exists := fileExists[fileName]; !exists {
files = append(files, OpenFilesStat{
Path: fileName,
Fd: uint64(file),
})
fileExists[fileName] = true
}
case <-ctx.Done():
return files, ctx.Err()
}
}