Move go-sysinfo to gx
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Jun 8, 2016 at 20:33 UTC
c7d04e96b313707d6174c9202f24d048233071f9
6 files changed
+7
-145
Godeps/Godeps.json
-4
@@ -73,10 +73,6 @@
73
"ImportPath": "github.com/whyrusleeping/chunker",
74
"Rev": "537e901819164627ca4bb5ce4e3faa8ce7956564"
75
},
76
- {
77
- "ImportPath": "github.com/whyrusleeping/go-sysinfo",
78
- "Rev": "769b7c0b50e8030895abc74ba8107ac715e3162a"
79
- },
76
{
77
"ImportPath": "gopkg.in/fsnotify.v1",
78
"Comment": "v1.2.0",
Godeps/_workspace/src/github.com/whyrusleeping/go-sysinfo/info.go
deleted
-38
@@ -1,38 +0,0 @@
1
-package sysinfo
2
-
3
-import (
4
- "errors"
5
-)
6
-
7
-var ErrPlatformNotSupported = errors.New("this operation is not supported on your platform")
8
-
9
-type DiskStats struct {
10
- Free uint64
11
- Total uint64
12
- FsType string
13
-}
14
-
15
-var diskUsageImpl func(string) (*DiskStats, error)
16
-
17
-func DiskUsage(path string) (*DiskStats, error) {
18
- if diskUsageImpl == nil {
19
- return nil, ErrPlatformNotSupported
20
- }
21
-
22
- return diskUsageImpl(path)
23
-}
24
-
25
-type MemStats struct {
26
- Swap uint64
27
- Used uint64
28
-}
29
-
30
-var memInfoImpl func() (*MemStats, error)
31
-
32
-func MemoryInfo() (*MemStats, error) {
33
- if memInfoImpl == nil {
34
- return nil, ErrPlatformNotSupported
35
- }
36
-
37
- return memInfoImpl()
38
-}
Godeps/_workspace/src/github.com/whyrusleeping/go-sysinfo/info_darwin.go
deleted
-32
@@ -1,32 +0,0 @@
1
-package sysinfo
2
-
3
-import (
4
- "fmt"
5
- "syscall"
6
-)
7
-
8
-func init() {
9
- diskUsageImpl = darwinDiskUsage
10
- memInfoImpl = darwinMemInfo
11
-}
12
-
13
-func darwinDiskUsage(path string) (*DiskStats, error) {
14
- var stfst syscall.Statfs_t
15
- err := syscall.Statfs(path, &stfst)
16
- if err != nil {
17
- return nil, err
18
- }
19
-
20
- free := stfst.Bfree * uint64(stfst.Bsize)
21
- total := stfst.Bavail * uint64(stfst.Bsize)
22
- return &DiskStats{
23
- Free: free,
24
- Total: total,
25
- FsType: fmt.Sprint(stfst.Type),
26
- }, nil
27
-}
28
-
29
-func darwinMemInfo() (*MemStats, error) {
30
- // TODO: use vm_stat on osx to gather memory information
31
- return new(MemStats), nil
32
-}
Godeps/_workspace/src/github.com/whyrusleeping/go-sysinfo/info_linux.go
deleted
-70
@@ -1,70 +0,0 @@
1
-package sysinfo
2
-
3
-import (
4
- "bytes"
5
- "fmt"
6
- "io/ioutil"
7
- "strings"
8
- "syscall"
9
-
10
- humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
11
-)
12
-
13
-func init() {
14
- diskUsageImpl = linuxDiskUsage
15
- memInfoImpl = linuxMemInfo
16
-}
17
-
18
-func linuxDiskUsage(path string) (*DiskStats, error) {
19
- var stfst syscall.Statfs_t
20
- err := syscall.Statfs(path, &stfst)
21
- if err != nil {
22
- return nil, err
23
- }
24
-
25
- free := stfst.Bfree * uint64(stfst.Bsize)
26
- total := stfst.Bavail * uint64(stfst.Bsize)
27
- return &DiskStats{
28
- Free: free,
29
- Total: total,
30
- FsType: fmt.Sprint(stfst.Type),
31
- }, nil
32
-}
33
-
34
-func linuxMemInfo() (*MemStats, error) {
35
- info, err := ioutil.ReadFile("/proc/self/status")
36
- if err != nil {
37
- return nil, err
38
- }
39
-
40
- var stats MemStats
41
- for _, e := range bytes.Split(info, []byte("\n")) {
42
- if !bytes.HasPrefix(e, []byte("Vm")) {
43
- continue
44
- }
45
-
46
- parts := bytes.Split(e, []byte(":"))
47
- if len(parts) != 2 {
48
- return nil, fmt.Errorf("unexpected line in proc stats: %q", string(e))
49
- }
50
-
51
- val := strings.Trim(string(parts[1]), " \n\t")
52
- switch string(parts[0]) {
53
- case "VmSize":
54
- vmsize, err := humanize.ParseBytes(val)
55
- if err != nil {
56
- return nil, err
57
- }
58
-
59
- stats.Used = vmsize
60
- case "VmSwap":
61
- swapsize, err := humanize.ParseBytes(val)
62
- if err != nil {
63
- return nil, err
64
- }
65
-
66
- stats.Swap = swapsize
67
- }
68
- }
69
- return &stats, nil
70
-}
core/commands/sysdiag.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
cmds "github.com/ipfs/go-ipfs/commands"
9
config "github.com/ipfs/go-ipfs/repo/config"
10
11
- sysi "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/go-sysinfo"
11
manet "gx/ipfs/QmUBa4w6CbHJUMeGJPDiMEDWsM93xToK1fTnFXnrC8Hksw/go-multiaddr-net"
12
+ sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo"
13
)
14
15
var sysDiagCmd = &cmds.Command{
package.json
+6
@@ -129,6 +129,12 @@
129
"hash": "QmbBhyDKsY4mbY6xsKt3qu9Y7FPvMJ6qbD8AMjYYvPRw1g",
130
"name": "goleveldb",
131
"version": "0.0.1"
132
+ },
133
+ {
134
+ "author": "whyrusleeping",
135
+ "hash": "QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM",
136
+ "name": "go-sysinfo",
137
+ "version": "0.0.0"
138
}
139
],
140
"gxVersion": "0.4.0",