GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-09-02 07:07:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

unix: change darwin Eproc/ExternProc members from int8 array to byte array

Browse Source 
CL 328169 added Eproc and ExternProc types on darwin which have some
int8 array members containing human-readable strings. In order to make
it easier to convert these to Go strings, change them to byte arrays.

Change-Id: I200494fd90d8506bce0f52a039ea59703981c8d3
Reviewed-on: https://go-review.googlesource.com/c/sys/+/359674
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Tobias Klauser
2021-10-30 16:03:51 +00:00
committed by Tobias Klauser
parent 6e7872819d
commit 565ff80d9b
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unix/mkpost.go
+5
View File
@@ -63,6 +63,11 @@ func main() {
// the process creation time. // the process creation time.
externProcStarttimeRegex := regexp.MustCompile(`P_un\s*\[\d+\]byte`) externProcStarttimeRegex := regexp.MustCompile(`P_un\s*\[\d+\]byte`)
b = externProcStarttimeRegex.ReplaceAll(b, []byte("P_starttime Timeval")) b = externProcStarttimeRegex.ReplaceAll(b, []byte("P_starttime Timeval"))
// Convert [n]int8 to [n]byte in Eproc and ExternProc members to
// simplify conversion to string.
convertEprocRegex := regexp.MustCompile(`(P_comm|Wmesg|Login)(\s+)\[(\d+)\]int8`)
b = convertEprocRegex.ReplaceAll(b, []byte("$1$2[$3]byte"))
} }
// Intentionally export __val fields in Fsid and Sigset_t // Intentionally export __val fields in Fsid and Sigset_t
unix/ztypes_darwin_amd64.go
+3 -3
View File
@@ -641,13 +641,13 @@ type Eproc struct {
Tdev int32 Tdev int32
Tpgid int32 Tpgid int32
Tsess uintptr Tsess uintptr
Wmesg [8]int8 Wmesg [8]byte
Xsize int32 Xsize int32
Xrssize int16 Xrssize int16
Xccount int16 Xccount int16
Xswrss int16 Xswrss int16
Flag int32 Flag int32
Login [12]int8 Login [12]byte
Spare [4]int32 Spare [4]int32
_ [4]byte _ [4]byte
} }
@@ -688,7 +688,7 @@ type ExternProc struct {
P_priority uint8 P_priority uint8
P_usrpri uint8 P_usrpri uint8
P_nice int8 P_nice int8
P_comm [17]int8 P_comm [17]byte
P_pgrp uintptr P_pgrp uintptr
P_addr uintptr P_addr uintptr
P_xstat uint16 P_xstat uint16
unix/ztypes_darwin_arm64.go
+3 -3
View File
@@ -641,13 +641,13 @@ type Eproc struct {
Tdev int32 Tdev int32
Tpgid int32 Tpgid int32
Tsess uintptr Tsess uintptr
Wmesg [8]int8 Wmesg [8]byte
Xsize int32 Xsize int32
Xrssize int16 Xrssize int16
Xccount int16 Xccount int16
Xswrss int16 Xswrss int16
Flag int32 Flag int32
Login [12]int8 Login [12]byte
Spare [4]int32 Spare [4]int32
_ [4]byte _ [4]byte
} }
@@ -688,7 +688,7 @@ type ExternProc struct {
P_priority uint8 P_priority uint8
P_usrpri uint8 P_usrpri uint8
P_nice int8 P_nice int8
P_comm [17]int8 P_comm [17]byte
P_pgrp uintptr P_pgrp uintptr
P_addr uintptr P_addr uintptr
P_xstat uint16 P_xstat uint16