@@ -42,7 +42,7 @@ var kstatSplit = regexp.MustCompile(`[:\s]+`)
4242func TimesWithContext (ctx context.Context , percpu bool ) ([]TimesStat , error ) {
4343 kstatSysOut , err := invoke .CommandWithContext (ctx , "kstat" , "-p" , "cpu_stat:*:*:/^idle$|^user$|^kernel$|^iowait$|^swap$/" )
4444 if err != nil {
45- return nil , fmt .Errorf ("cannot execute kstat: %s " , err )
45+ return nil , fmt .Errorf ("cannot execute kstat: %w " , err )
4646 }
4747 cpu := make (map [float64 ]float64 )
4848 idle := make (map [float64 ]float64 )
@@ -57,29 +57,29 @@ func TimesWithContext(ctx context.Context, percpu bool) ([]TimesStat, error) {
5757 }
5858 cpuNumber , err := strconv .ParseFloat (fields [1 ], 64 )
5959 if err != nil {
60- return nil , fmt .Errorf ("cannot parse cpu number: %s " , err )
60+ return nil , fmt .Errorf ("cannot parse cpu number: %w " , err )
6161 }
6262 cpu [cpuNumber ] = cpuNumber
6363 switch fields [3 ] {
6464 case "idle" :
6565 idle [cpuNumber ], err = strconv .ParseFloat (fields [4 ], 64 )
6666 if err != nil {
67- return nil , fmt .Errorf ("cannot parse idle: %s " , err )
67+ return nil , fmt .Errorf ("cannot parse idle: %w " , err )
6868 }
6969 case "user" :
7070 user [cpuNumber ], err = strconv .ParseFloat (fields [4 ], 64 )
7171 if err != nil {
72- return nil , fmt .Errorf ("cannot parse user: %s " , err )
72+ return nil , fmt .Errorf ("cannot parse user: %w " , err )
7373 }
7474 case "kernel" :
7575 kern [cpuNumber ], err = strconv .ParseFloat (fields [4 ], 64 )
7676 if err != nil {
77- return nil , fmt .Errorf ("cannot parse kernel: %s " , err )
77+ return nil , fmt .Errorf ("cannot parse kernel: %w " , err )
7878 }
7979 case "iowait" :
8080 iowt [cpuNumber ], err = strconv .ParseFloat (fields [4 ], 64 )
8181 if err != nil {
82- return nil , fmt .Errorf ("cannot parse iowait: %s " , err )
82+ return nil , fmt .Errorf ("cannot parse iowait: %w " , err )
8383 }
8484 //not sure how this translates, don't report, add to kernel, something else?
8585 /*case "swap":
@@ -121,22 +121,22 @@ func Info() ([]InfoStat, error) {
121121func InfoWithContext (ctx context.Context ) ([]InfoStat , error ) {
122122 psrInfoOut , err := invoke .CommandWithContext (ctx , "psrinfo" , "-p" , "-v" )
123123 if err != nil {
124- return nil , fmt .Errorf ("cannot execute psrinfo: %s " , err )
124+ return nil , fmt .Errorf ("cannot execute psrinfo: %w " , err )
125125 }
126126
127127 procs , err := parseProcessorInfo (string (psrInfoOut ))
128128 if err != nil {
129- return nil , fmt .Errorf ("error parsing psrinfo output: %s " , err )
129+ return nil , fmt .Errorf ("error parsing psrinfo output: %w " , err )
130130 }
131131
132132 isaInfoOut , err := invoke .CommandWithContext (ctx , "isainfo" , "-b" , "-v" )
133133 if err != nil {
134- return nil , fmt .Errorf ("cannot execute isainfo: %s " , err )
134+ return nil , fmt .Errorf ("cannot execute isainfo: %w " , err )
135135 }
136136
137137 flags , err := parseISAInfo (string (isaInfoOut ))
138138 if err != nil {
139- return nil , fmt .Errorf ("error parsing isainfo output: %s " , err )
139+ return nil , fmt .Errorf ("error parsing isainfo output: %w " , err )
140140 }
141141
142142 result := make ([]InfoStat , 0 , len (flags ))
@@ -160,7 +160,7 @@ func parseISAInfo(cmdOutput string) ([]string, error) {
160160 }
161161
162162 flags := make ([]string , len (words )- 4 )
163- for i , val := range words [4 :] {
163+ for i , val := range words [4 :] { //nolint:gosimple //FIXME
164164 flags [i ] = val
165165 }
166166 sort .Strings (flags )
@@ -194,15 +194,15 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) {
194194 if physicalCPU [psrStepOffset ] != "" {
195195 stepParsed , err := strconv .ParseInt (physicalCPU [psrStepOffset ], 10 , 32 )
196196 if err != nil {
197- return nil , fmt .Errorf ("cannot parse value %q for step as 32-bit integer: %s " , physicalCPU [9 ], err )
197+ return nil , fmt .Errorf ("cannot parse value %q for step as 32-bit integer: %w " , physicalCPU [9 ], err )
198198 }
199199 step = int32 (stepParsed )
200200 }
201201
202202 if physicalCPU [psrClockOffset ] != "" {
203203 clockParsed , err := strconv .ParseInt (physicalCPU [psrClockOffset ], 10 , 64 )
204204 if err != nil {
205- return nil , fmt .Errorf ("cannot parse value %q for clock as 32-bit integer: %s " , physicalCPU [10 ], err )
205+ return nil , fmt .Errorf ("cannot parse value %q for clock as 32-bit integer: %w " , physicalCPU [10 ], err )
206206 }
207207 clock = float64 (clockParsed )
208208 }
@@ -214,7 +214,7 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) {
214214 case physicalCPU [psrNumCoresOffset ] != "" :
215215 numCores , err = strconv .ParseInt (physicalCPU [psrNumCoresOffset ], 10 , 32 )
216216 if err != nil {
217- return nil , fmt .Errorf ("cannot parse value %q for core count as 32-bit integer: %s " , physicalCPU [1 ], err )
217+ return nil , fmt .Errorf ("cannot parse value %q for core count as 32-bit integer: %w " , physicalCPU [1 ], err )
218218 }
219219
220220 for i := 0 ; i < int (numCores ); i ++ {
@@ -235,12 +235,12 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) {
235235 case physicalCPU [psrNumCoresHTOffset ] != "" :
236236 numCores , err = strconv .ParseInt (physicalCPU [psrNumCoresHTOffset ], 10 , 32 )
237237 if err != nil {
238- return nil , fmt .Errorf ("cannot parse value %q for core count as 32-bit integer: %s " , physicalCPU [3 ], err )
238+ return nil , fmt .Errorf ("cannot parse value %q for core count as 32-bit integer: %w " , physicalCPU [3 ], err )
239239 }
240240
241241 numHT , err = strconv .ParseInt (physicalCPU [psrNumHTOffset ], 10 , 32 )
242242 if err != nil {
243- return nil , fmt .Errorf ("cannot parse value %q for hyperthread count as 32-bit integer: %s " , physicalCPU [4 ], err )
243+ return nil , fmt .Errorf ("cannot parse value %q for hyperthread count as 32-bit integer: %w " , physicalCPU [4 ], err )
244244 }
245245
246246 for i := 0 ; i < int (numCores ); i ++ {
0 commit comments