From e7d9cb8ebb023b384142285dbde3ce8ce70f7d27 Mon Sep 17 00:00:00 2001 From: Amir Szekely Date: Mon, 3 Jan 2022 21:10:44 -0800 Subject: [PATCH] fix: Gather RAM information --- README.md | 36 +++++++- cmd/root.go | 1 + go.mod | 4 + go.sum | 25 ++++++ providers/cpuid.go | 10 +-- providers/memory.go | 203 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 273 insertions(+), 6 deletions(-) create mode 100644 providers/memory.go diff --git a/README.md b/README.md index ff574d5..fc6f628 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Cloud-Z gathers information and perform benchmarks on cloud instances in multipl - [x] Cloud type, instance id, and type - [x] CPU information including type, number of available cores, and cache sizes -- [ ] RAM information +- [x] RAM information - [ ] Benchmark CPU - [ ] Storage devices information - [ ] Benchmark storage @@ -40,4 +40,38 @@ $ ./cloud-z | Instance ID | i-12345678900112344 | | Instance type | t4g.nano | +---------------+-----------------------+ ++-----------------+--------------------------------+ +| CPU | Intel(R) Xeon(R) CPU @ 2.20GHz | +| Vendor | GenuineIntel | +| Vendor ID | Intel | +| Family | 6 | +| MHz | 2200 | +| Logical cores | 2 | +| Physical cores | 1 | +| Thread per core | 2 | +| Boost frequency | 0 | +| L1 Cache | 32.00KB instruction, 32.00KB | +| | data | +| L2 Cache | 256.00KB | +| L2 Cache | 256.00KB | +| L3 Cache | 55.00MB | +| Cache line | 64 | +| Features | ADX, AESNI, AVX, AVX2, BMI1, | +| | BMI2, CLMUL, CMOV, CX16, | +| | ERMS, F16C, FMA3, HLE, HTT, | +| | HYPERVISOR, IBPB, LZCNT, MMX, | +| | MMXEXT, NX, POPCNT, RDRAND, | +| | RDSEED, RDTSCP, RTM, SSE, | +| | SSE2, SSE3, SSE4, SSE42, | +| | SSSE3, STIBP | ++-----------------+--------------------------------+ ++-----------------------+----------+ +| Total RAM | 1.0GB | +| Stick #1: location | DIMM 0 | +| Stick #1: type | RAM DIMM | +| Stick #1: size | 1024MB | +| Stick #1: data width | 64-bit | +| Stick #1: total width | 64-bit | +| Stick #1: speed | 0 MHz | ++-----------------------+----------+ ``` diff --git a/cmd/root.go b/cmd/root.go index 335fe23..da66a7a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -47,6 +47,7 @@ var rootCmd = &cobra.Command{ } printTable(providers.GetCPUInfo()) + printTable(providers.GetMemoryInfo()) }, } diff --git a/go.mod b/go.mod index 4d73c7a..f50fece 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,8 @@ module cloud-z go 1.17 require ( + github.com/cloudfoundry/gosigar v1.3.2 + github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743 github.com/klauspost/cpuid/v2 v2.0.9 github.com/olekukonko/tablewriter v0.0.5 @@ -12,6 +14,8 @@ require ( require ( github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/pkg/errors v0.8.1 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect ) diff --git a/go.sum b/go.sum index 78f16d7..4cc10c3 100644 --- a/go.sum +++ b/go.sum @@ -75,6 +75,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudfoundry/gosigar v1.3.2 h1:bSW9IHq1UKZJuno/LZiuSs9D7WNgZdaduhyZn0oaMNI= +github.com/cloudfoundry/gosigar v1.3.2/go.mod h1:tZGd29SDghYXnEP3vX7AGanIGEVZhGWcp/2HGSt1FXg= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -89,7 +91,10 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e h1:vUmf0yezR0y7jJ5pceLHthLaYf4bA5T14B6q39S4q2Q= +github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e/go.mod h1:YTIHhz/QFSYnu/EhlF2SpU2Uk+32abacUYA5ZPljz1A= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -162,6 +167,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -242,6 +248,7 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= @@ -278,12 +285,18 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/onsi/ginkgo v1.2.1-0.20160409220416-2c2e9bb47b4e h1:IMj5WMpYeLyqT/sJnXJJ3Ze/7qoDXc/TJbKaIY8RRBA= +github.com/onsi/ginkgo v1.2.1-0.20160409220416-2c2e9bb47b4e/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.2.0 h1:tQjc4uvqBp0z424R9V/S2L18penoUiwZftoY0t48IZ4= +github.com/onsi/gomega v1.2.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= @@ -321,11 +334,13 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= @@ -394,6 +409,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/net v0.0.0-20171107184841-a337091b0525/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -434,6 +450,7 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -463,6 +480,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -527,9 +545,11 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.1.1-0.20171102192421-88f656faf3f3/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -537,6 +557,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -746,16 +767,20 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/providers/cpuid.go b/providers/cpuid.go index db38795..55426e3 100644 --- a/providers/cpuid.go +++ b/providers/cpuid.go @@ -7,7 +7,7 @@ import ( "strings" ) -func bytes(b int) string { +func int2bytes(b int) string { //return bytesize.New(float64(b)).Format("%d", "", false) return bytesize.New(float64(b)).String() } @@ -23,10 +23,10 @@ func GetCPUInfo() [][]string { {"Physical cores", fmt.Sprintf("%v", cpuid.CPU.PhysicalCores)}, {"Thread per core", fmt.Sprintf("%v", cpuid.CPU.ThreadsPerCore)}, {"Boost frequency", fmt.Sprintf("%v", cpuid.CPU.BoostFreq)}, - {"L1 Cache", fmt.Sprintf("%v instruction, %v data", bytes(cpuid.CPU.Cache.L1I), bytes(cpuid.CPU.Cache.L1D))}, - {"L2 Cache", bytes(cpuid.CPU.Cache.L2)}, - {"L2 Cache", bytes(cpuid.CPU.Cache.L2)}, - {"L3 Cache", bytes(cpuid.CPU.Cache.L3)}, + {"L1 Cache", fmt.Sprintf("%v instruction, %v data", int2bytes(cpuid.CPU.Cache.L1I), int2bytes(cpuid.CPU.Cache.L1D))}, + {"L2 Cache", int2bytes(cpuid.CPU.Cache.L2)}, + {"L2 Cache", int2bytes(cpuid.CPU.Cache.L2)}, + {"L3 Cache", int2bytes(cpuid.CPU.Cache.L3)}, {"Cache line", fmt.Sprintf("%v", cpuid.CPU.CacheLine)}, {"Features", strings.Join(cpuid.CPU.FeatureSet(), ", ")}, } diff --git a/providers/memory.go b/providers/memory.go new file mode 100644 index 0000000..fa07673 --- /dev/null +++ b/providers/memory.go @@ -0,0 +1,203 @@ +package providers + +import ( + "bytes" + "encoding/binary" + "fmt" + "github.com/cloudfoundry/gosigar" + "github.com/digitalocean/go-smbios/smbios" + "io" + "log" +) + +// https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.1.1.pdf +type MemoryDevice struct { + Location string + PhysicalMemoryArrayHandle uint16 + MemoryErrorInformationHandle uint16 + TotalWidth uint16 + DataWidth uint16 + Size uint16 + FormFactor uint8 + DeviceSet uint8 + DeviceLocator string + BankLocator string + MemoryType uint8 + TypeDetail uint16 + Speed uint16 + Manufacturer string + SerialNumber string + AssetTag string + PartNumber string + Attributes uint8 + ExtendedSize uint32 + ConfiguredMemoryClockSpeed uint16 + MinimumVoltage uint16 + MaximumVoltage uint16 + ConfiguredVoltage uint16 +} + +func (mem *MemoryDevice) formFactor() string { + factors := []string{ + "", + "Other", + "Unknown", + "SIMM", + "SIP", + "Chip", + "DIP", + "ZIP", + "Proprietary Card", + "DIMM", + "TSOP", + "Row of chips", + "RIMM", + "SODIMM", + "SRIMM", + "FB-DIMM", + } + + if int(mem.FormFactor) > len(factors) { + return "" + } + + return factors[mem.FormFactor] +} + +func (mem *MemoryDevice) memoryType() string { + types := []string{ + "", + "Other", + "Unknown", + "DRAM", + "EDRAM", + "VRAM", + "SRAM", + "RAM", + "ROM", + "FLASH", + "EEPROM", + "FEPROM", + "EPROM", + "CDRAM", + "3DRAM", + "SDRAM", + "SGRAM", + "RDRAM", + "DDR", + "DDR2", + "DDR2 FB-DIMM", + "Reserved", + "Reserved", + "Reserved", + "DDR3", + "FBD2", + "DDR4", + "LPDDR", + "LPDDR2", + "LPDDR3", + "LPDDR4", + } + + if int(mem.MemoryType) > len(types) { + return "" + } + + return types[mem.MemoryType] +} + +func (mem *MemoryDevice) size() string { + if mem.Size != 0x7fff { + if mem.Size&0x8000 != 0 { + return fmt.Sprintf("%vKB", mem.Size&0x7fff) + } + return fmt.Sprintf("%vMB", mem.Size&0x7fff) + } + + return fmt.Sprintf("%vMB", mem.ExtendedSize) +} + +func readString(reader io.Reader, strings []string) string { + var stringId uint8 + binary.Read(reader, binary.LittleEndian, &stringId) + if int(stringId) < len(strings) { + return strings[stringId] + } + return "" +} + +func GetMemoryInfo() [][]string { + mem := sigar.Mem{} + mem.Get() + result := [][]string{ + {"Total RAM", sigar.FormatSize(mem.Total) + "B"}, + } + + // Find SMBIOS data in operating system-specific location. + rc, _, err := smbios.Stream() + if err != nil { + log.Printf("Failed to open SMBIOS stream: %v\n", err) + return result + } + // Be sure to close the stream! + defer rc.Close() + + // Decode SMBIOS structures from the stream. + d := smbios.NewDecoder(rc) + records, err := d.Decode() + if err != nil { + log.Printf("Failed to decode SMBIOS structures: %v\n", err) + return result + } + + i := 1 + for _, record := range records { + if record.Header.Type == 17 { + memDevice := readMemoryDevice(record) + prefix := fmt.Sprintf("Stick #%v: ", i) + + result = append(result, []string{prefix + "location", memDevice.Location}) + result = append(result, []string{prefix + "type", memDevice.memoryType() + " " + memDevice.formFactor()}) + result = append(result, []string{prefix + "size", memDevice.size()}) + result = append(result, []string{prefix + "data width", fmt.Sprintf("%v-bit", memDevice.DataWidth)}) + result = append(result, []string{prefix + "total width", fmt.Sprintf("%v-bit", memDevice.TotalWidth)}) + result = append(result, []string{prefix + "speed", fmt.Sprintf("%v MHz", memDevice.Speed)}) + + i += 1 + } + } + + return result +} + +func readMemoryDevice(record *smbios.Structure) MemoryDevice { + memDevice := MemoryDevice{} + recordBytes := bytes.NewReader(record.Formatted) + + binary.Read(recordBytes, binary.LittleEndian, &memDevice.MemoryErrorInformationHandle) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.PhysicalMemoryArrayHandle) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.TotalWidth) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.DataWidth) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.Size) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.FormFactor) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.DeviceSet) + memDevice.DeviceLocator = readString(recordBytes, record.Strings) + memDevice.BankLocator = readString(recordBytes, record.Strings) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.MemoryType) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.TypeDetail) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.Speed) + memDevice.Manufacturer = readString(recordBytes, record.Strings) + memDevice.SerialNumber = readString(recordBytes, record.Strings) + memDevice.AssetTag = readString(recordBytes, record.Strings) + memDevice.PartNumber = readString(recordBytes, record.Strings) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.Attributes) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.ExtendedSize) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.ConfiguredMemoryClockSpeed) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.MinimumVoltage) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.MaximumVoltage) + binary.Read(recordBytes, binary.LittleEndian, &memDevice.ConfiguredVoltage) + + memDevice.Location = record.Strings[0] + + return memDevice +}