Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
744428cb
Commit
744428cb
authored
Apr 21, 2018
by
Fabian Raetz
Committed by
Felix Lange
Apr 21, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vendor: update elastic/gosigar so that it compiles on OpenBSD (#16542)
parent
b15eb665
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
98 additions
and
7 deletions
+98
-7
CHANGELOG.md
vendor/github.com/elastic/gosigar/CHANGELOG.md
+11
-0
README.md
vendor/github.com/elastic/gosigar/README.md
+1
-0
concrete_sigar.go
vendor/github.com/elastic/gosigar/concrete_sigar.go
+6
-0
sigar_darwin.go
vendor/github.com/elastic/gosigar/sigar_darwin.go
+4
-0
sigar_freebsd.go
vendor/github.com/elastic/gosigar/sigar_freebsd.go
+5
-0
sigar_interface.go
vendor/github.com/elastic/gosigar/sigar_interface.go
+10
-0
sigar_linux.go
vendor/github.com/elastic/gosigar/sigar_linux.go
+24
-0
sigar_linux_common.go
vendor/github.com/elastic/gosigar/sigar_linux_common.go
+18
-4
sigar_openbsd.go
vendor/github.com/elastic/gosigar/sigar_openbsd.go
+8
-0
sigar_stub.go
vendor/github.com/elastic/gosigar/sigar_stub.go
+4
-0
sigar_windows.go
vendor/github.com/elastic/gosigar/sigar_windows.go
+4
-0
vendor.json
vendor/vendor.json
+3
-3
No files found.
vendor/github.com/elastic/gosigar/CHANGELOG.md
View file @
744428cb
...
...
@@ -8,10 +8,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
-
Added missing runtime import for FreeBSD. #104
### Changed
### Deprecated
## [0.9.0]
### Added
-
Added support for huge TLB pages on Linux #97
-
Added support for big endian platform #100
### Fixed
-
Add missing method for OpenBSD #99
## [0.8.0]
### Added
...
...
vendor/github.com/elastic/gosigar/README.md
View file @
744428cb
...
...
@@ -26,6 +26,7 @@ The features vary by operating system.
| FDUsage | X | | | | X |
| FileSystemList | X | X | X | X | X |
| FileSystemUsage | X | X | X | X | X |
| HugeTLBPages | X | | | | |
| LoadAverage | X | X | | X | X |
| Mem | X | X | X | X | X |
| ProcArgs | X | X | X | | X |
...
...
vendor/github.com/elastic/gosigar/concrete_sigar.go
View file @
744428cb
...
...
@@ -62,6 +62,12 @@ func (c *ConcreteSigar) GetSwap() (Swap, error) {
return
s
,
err
}
func
(
c
*
ConcreteSigar
)
GetHugeTLBPages
()
(
HugeTLBPages
,
error
)
{
p
:=
HugeTLBPages
{}
err
:=
p
.
Get
()
return
p
,
err
}
func
(
c
*
ConcreteSigar
)
GetFileSystemUsage
(
path
string
)
(
FileSystemUsage
,
error
)
{
f
:=
FileSystemUsage
{}
err
:=
f
.
Get
(
path
)
...
...
vendor/github.com/elastic/gosigar/sigar_darwin.go
View file @
744428cb
...
...
@@ -91,6 +91,10 @@ func (self *Swap) Get() error {
return
nil
}
func
(
self
*
HugeTLBPages
)
Get
()
error
{
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
(
self
*
Cpu
)
Get
()
error
{
var
count
C
.
mach_msg_type_number_t
=
C
.
HOST_CPU_LOAD_INFO_COUNT
var
cpuload
C
.
host_cpu_load_info_data_t
...
...
vendor/github.com/elastic/gosigar/sigar_freebsd.go
View file @
744428cb
...
...
@@ -4,6 +4,7 @@ package gosigar
import
(
"io/ioutil"
"runtime"
"strconv"
"strings"
"unsafe"
...
...
@@ -97,6 +98,10 @@ func (self *ProcFDUsage) Get(pid int) error {
return
nil
}
func
(
self
*
HugeTLBPages
)
Get
()
error
{
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
parseCpuStat
(
self
*
Cpu
,
line
string
)
error
{
fields
:=
strings
.
Fields
(
line
)
...
...
vendor/github.com/elastic/gosigar/sigar_interface.go
View file @
744428cb
...
...
@@ -26,6 +26,7 @@ type Sigar interface {
GetLoadAverage
()
(
LoadAverage
,
error
)
GetMem
()
(
Mem
,
error
)
GetSwap
()
(
Swap
,
error
)
GetHugeTLBPages
(
HugeTLBPages
,
error
)
GetFileSystemUsage
(
string
)
(
FileSystemUsage
,
error
)
GetFDUsage
()
(
FDUsage
,
error
)
GetRusage
(
who
int
)
(
Rusage
,
error
)
...
...
@@ -82,6 +83,15 @@ type Swap struct {
Free
uint64
}
type
HugeTLBPages
struct
{
Total
uint64
Free
uint64
Reserved
uint64
Surplus
uint64
DefaultSize
uint64
TotalAllocatedSize
uint64
}
type
CpuList
struct
{
List
[]
Cpu
}
...
...
vendor/github.com/elastic/gosigar/sigar_linux.go
View file @
744428cb
...
...
@@ -45,6 +45,30 @@ func (self *FDUsage) Get() error {
})
}
func
(
self
*
HugeTLBPages
)
Get
()
error
{
table
,
err
:=
parseMeminfo
()
if
err
!=
nil
{
return
err
}
self
.
Total
,
_
=
table
[
"HugePages_Total"
]
self
.
Free
,
_
=
table
[
"HugePages_Free"
]
self
.
Reserved
,
_
=
table
[
"HugePages_Rsvd"
]
self
.
Surplus
,
_
=
table
[
"HugePages_Surp"
]
self
.
DefaultSize
,
_
=
table
[
"Hugepagesize"
]
if
totalSize
,
found
:=
table
[
"Hugetlb"
];
found
{
self
.
TotalAllocatedSize
=
totalSize
}
else
{
// If Hugetlb is not present, or huge pages of different sizes
// are used, this figure can be unaccurate.
// TODO (jsoriano): Extract information from /sys/kernel/mm/hugepages too
self
.
TotalAllocatedSize
=
(
self
.
Total
-
self
.
Free
+
self
.
Reserved
)
*
self
.
DefaultSize
}
return
nil
}
func
(
self
*
ProcFDUsage
)
Get
(
pid
int
)
error
{
err
:=
readFile
(
procFileName
(
pid
,
"limits"
),
func
(
line
string
)
bool
{
if
strings
.
HasPrefix
(
line
,
"Max open files"
)
{
...
...
vendor/github.com/elastic/gosigar/sigar_linux_common.go
View file @
744428cb
...
...
@@ -379,12 +379,16 @@ func parseMeminfo() (map[string]uint64, error) {
return
true
// skip on errors
}
num
:=
strings
.
TrimLeft
(
fields
[
1
],
" "
)
val
,
err
:=
strtoull
(
strings
.
Fields
(
num
)
[
0
])
valueUnit
:=
strings
.
Fields
(
fields
[
1
]
)
val
ue
,
err
:=
strtoull
(
valueUnit
[
0
])
if
err
!=
nil
{
return
true
// skip on errors
}
table
[
fields
[
0
]]
=
val
*
1024
//in bytes
if
len
(
valueUnit
)
>
1
&&
valueUnit
[
1
]
==
"kB"
{
value
*=
1024
}
table
[
fields
[
0
]]
=
value
return
true
})
...
...
@@ -420,8 +424,18 @@ func procFileName(pid int, name string) string {
return
Procd
+
"/"
+
strconv
.
Itoa
(
pid
)
+
"/"
+
name
}
func
readProcFile
(
pid
int
,
name
string
)
(
[]
byte
,
error
)
{
func
readProcFile
(
pid
int
,
name
string
)
(
content
[]
byte
,
err
error
)
{
path
:=
procFileName
(
pid
,
name
)
// Panics have been reported when reading proc files, let's recover and
// report the path if this happens
// See https://github.com/elastic/beats/issues/6692
defer
func
()
{
if
r
:=
recover
();
r
!=
nil
{
content
=
nil
err
=
fmt
.
Errorf
(
"recovered panic when reading proc file '%s': %v"
,
path
,
r
)
}
}()
contents
,
err
:=
ioutil
.
ReadFile
(
path
)
if
err
!=
nil
{
...
...
vendor/github.com/elastic/gosigar/sigar_openbsd.go
View file @
744428cb
...
...
@@ -294,6 +294,10 @@ func (self *Swap) Get() error {
return
nil
}
func
(
self
*
HugeTLBPages
)
Get
()
error
{
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
(
self
*
Cpu
)
Get
()
error
{
load
:=
[
C
.
CPUSTATES
]
C
.
long
{
C
.
CP_USER
,
C
.
CP_NICE
,
C
.
CP_SYS
,
C
.
CP_INTR
,
C
.
CP_IDLE
}
...
...
@@ -381,6 +385,10 @@ func (self *ProcFDUsage) Get(pid int) error {
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
(
self
*
Rusage
)
Get
(
pid
int
)
error
{
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
fillCpu
(
cpu
*
Cpu
,
load
[
C
.
CPUSTATES
]
C
.
long
)
{
cpu
.
User
=
uint64
(
load
[
0
])
cpu
.
Nice
=
uint64
(
load
[
1
])
...
...
vendor/github.com/elastic/gosigar/sigar_stub.go
View file @
744428cb
...
...
@@ -22,6 +22,10 @@ func (s *Swap) Get() error {
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
(
s
*
HugeTLBPages
)
Get
()
error
{
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
(
f
*
FDUsage
)
Get
()
error
{
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
...
...
vendor/github.com/elastic/gosigar/sigar_windows.go
View file @
744428cb
...
...
@@ -120,6 +120,10 @@ func (self *Swap) Get() error {
return
nil
}
func
(
self
*
HugeTLBPages
)
Get
()
error
{
return
ErrNotImplemented
{
runtime
.
GOOS
}
}
func
(
self
*
Cpu
)
Get
()
error
{
idle
,
kernel
,
user
,
err
:=
windows
.
GetSystemTimes
()
if
err
!=
nil
{
...
...
vendor/vendor.json
View file @
744428cb
...
...
@@ -93,10 +93,10 @@
"revisionTime"
:
"2016-05-12T03:30:02Z"
},
{
"checksumSHA1"
:
"
Fc8BCxCoQ7ZmghDT6X1cASR10Ec
="
,
"checksumSHA1"
:
"
jElNoLEe7m/iaoF1vYIHyNaS2SE
="
,
"path"
:
"github.com/elastic/gosigar"
,
"revision"
:
"
a3814ce5008e612a0c6d027608b54e1d0d9a5613
"
,
"revisionTime"
:
"2018-0
1-22T22:25:45
Z"
"revision"
:
"
37f05ff46ffa7a825d1b24cf2b62d4a4c1a9d2e8
"
,
"revisionTime"
:
"2018-0
3-30T10:04:40
Z"
},
{
"checksumSHA1"
:
"qDsgp2kAeI9nhj565HUScaUyjU4="
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment