Skip to content

Commit 4690912

Browse files
authored
Merge pull request #20816 from karalabe/disable-gosigar-ios
metrics: disable CPU stats (gosigar) on iOS
2 parents 39f5023 + 42e02ac commit 4690912

File tree

3 files changed

+54
-12
lines changed

3 files changed

+54
-12
lines changed

metrics/cpu.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,9 @@
1616

1717
package metrics
1818

19-
import "github.com/elastic/gosigar"
20-
2119
// CPUStats is the system and process CPU stats.
2220
type CPUStats struct {
2321
GlobalTime int64 // Time spent by the CPU working on all processes
2422
GlobalWait int64 // Time spent by waiting on disk for all processes
2523
LocalTime int64 // Time spent by the CPU working on this process
2624
}
27-
28-
// ReadCPUStats retrieves the current CPU stats.
29-
func ReadCPUStats(stats *CPUStats) {
30-
global := gosigar.Cpu{}
31-
global.Get()
32-
33-
stats.GlobalTime = int64(global.User + global.Nice + global.Sys)
34-
stats.GlobalWait = int64(global.Wait)
35-
stats.LocalTime = getProcessCPUTime()
36-
}

metrics/cpu_disabled.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright 2020 The go-ethereum Authors
2+
// This file is part of the go-ethereum library.
3+
//
4+
// The go-ethereum library is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Lesser General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// The go-ethereum library is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Lesser General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Lesser General Public License
15+
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
16+
17+
// +build ios
18+
19+
package metrics
20+
21+
// ReadCPUStats retrieves the current CPU stats. Internally this uses `gosigar`,
22+
// which is not supported on the platforms in this file.
23+
func ReadCPUStats(stats *CPUStats) {}

metrics/cpu_enabled.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright 2020 The go-ethereum Authors
2+
// This file is part of the go-ethereum library.
3+
//
4+
// The go-ethereum library is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Lesser General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// The go-ethereum library is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Lesser General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Lesser General Public License
15+
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
16+
17+
// +build !ios
18+
19+
package metrics
20+
21+
import "github.com/elastic/gosigar"
22+
23+
// ReadCPUStats retrieves the current CPU stats.
24+
func ReadCPUStats(stats *CPUStats) {
25+
global := gosigar.Cpu{}
26+
global.Get()
27+
28+
stats.GlobalTime = int64(global.User + global.Nice + global.Sys)
29+
stats.GlobalWait = int64(global.Wait)
30+
stats.LocalTime = getProcessCPUTime()
31+
}

0 commit comments

Comments
 (0)