vmstat 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9755d74fe2f9659eb01e1cb582a44cce556bda4a
-  data.tar.gz: 0d846e1cd3eb12d3fafbc1dd93f1472ffc6ab2bc
+  metadata.gz: 69a842d6f8a88a49ab2bce5670713cc8608a2f70
+  data.tar.gz: c68c3e51480bbf34f321b09ddfdfb2f90d80394c
 SHA512:
-  metadata.gz: 4629bcb7856759da7f79684f50eeb5bff64e76ed1962b7b2cc91dd3203bf58eacee6608beadca990e8359f402aed0168530c9f4d345722dc688b0b6df193f63a
-  data.tar.gz: bfc607c69789a069fdf9c370af456f8d89b6d8adc1465ab7d8df424b8263324af818d81623860e732ac8cd7c49ceabc70cf9316c843a2d584b215c2ce81b6761
+  metadata.gz: e1f86c40a0baaec18bb129a59bb156147e6f3d35875d251b380014ac1d3d7ee785e65fbacead385094c9ba823eafbc8f6405d111d8131426c26d1c838228bec7
+  data.tar.gz: 3e828475c895b8bdd29435d12e28b37c5a8e1741bc32a76e70bb695946cdf40d728caf3ca53464175d1e151328a2d409c67ed18f8634ff537c156414aba113eb

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 os:
   - linux
-  - osx
 rvm:
-  - 2.2.3
+  - ruby-2.2.5
+  - ruby-head
 env:
   - TRAVIS=true
+matrix:
+  allow_failures:
+  - rvm: ruby-head
+

data/README.md

@@ -15,16 +15,14 @@ This is a focused and fast library to get system information like:
 * FreeBSD
 * MacOS X
 * Linux (>= 2.6)
+* OpenBSD
+* NetBSD
+* Solaris/SmartOS
 
 *It might support (but not tested):*
 
 * Older versions of linux
 
-*It doesn't support:*
-
-* OpenBSD
-* NetBSD
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -137,9 +135,10 @@ Just require the library and make a snapshot or use the distinct methods to just
 ## Todo
 
 * Swap information
-* Support more platforms (hp ux, aix, solaris, ...)
+* Support more platforms (hp ux, aix, ...)
+* Optimize performance for OpenBSD, NetBSD using `uvmexp` etc. directly
+* Optimize performance for solaris, smartos using `kstat` etc. directly
 * Server performance/system information (open file handles, cache sizes, number of inodes ...)
-* Add support for (Open|Net)BSD using UVM (http://cvsweb.netbsd.org/bsdweb.cgi/src/external/bsd/top/dist/machine/) and remove sysctlbyname references where possible to make it compatible
 
 ## Contributing
 

data/ext/vmstat/extconf.rb

@@ -2,9 +2,13 @@ require 'mkmf'
 
 # posix.h
 have_header 'unistd.h'
-have_func 'getpagesize'
+have_func 'getpagesize', 'unistd.h'
 have_header 'stdlib.h'
-have_func 'getloadavg'
+if have_header 'sys/loadavg.h'
+  have_func 'getloadavg', 'sys/loadavg.h'
+else
+  have_func 'getloadavg'
+end
 
 # mach.h
 have_header 'mach/mach.h'
@@ -31,6 +35,10 @@ have_header 'sys/param.h'
 have_header 'sys/mount.h'
 have_header 'sys/statfs.h'
 have_func 'statfs'
+have_struct_member('struct statfs', 'f_type', ['sys/param.h', 'sys/mount.h', 'sys/statfs.h'])
+have_struct_member('struct statfs', 'f_fstypename', ['sys/param.h', 'sys/mount.h'])
+have_func 'statvfs', ['sys/types.h', 'sys/statvfs.h']
+have_struct_member('struct statvfs', 'f_basetype', ['sys/types.h', 'sys/statvfs.h'])
 
 # sysctl.h
 sys_headers = ['unistd.h', 'sys/sysctl.h', 'sys/types.h', 'sys/socket.h',
@@ -44,8 +52,9 @@ have_const 'PF_LINK', sys_headers
 have_const 'NETLINK_GENERIC', sys_headers
 have_const 'IFMIB_IFDATA', sys_headers
 have_const 'IFDATA_GENERAL', sys_headers
-have_const 'CTL_KERN', sys_headers
-have_const 'KERN_BOOTTIME', sys_headers
+
+have_const 'CTL_KERN', ['sys/sysctl.h', 'sys/types.h']
+have_const 'KERN_BOOTTIME', ['sys/sysctl.h', 'sys/types.h']
 
 # bsd.h
 # only if we have *bsd like stats check for sysctlbyname

data/ext/vmstat/hw/posix.h

@@ -1,6 +1,8 @@
-#if defined(HAVE_UNISTD_H) && defined(HAVE_GETPAGESIZE)
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
+#endif
 
+#if defined(HAVE_GETPAGESIZE)
 #ifndef VMSTAT_PAGESIZE
 #define VMSTAT_PAGESIZE
 VALUE vmstat_pagesize(VALUE self) {
@@ -9,7 +11,11 @@ VALUE vmstat_pagesize(VALUE self) {
 #endif
 #endif
 
-#if defined(HAVE_STDLIB_H) && defined(HAVE_GETLOADAVG)
+#if defined(HAVE_SYS_LOADAVG_H)
+#include <sys/loadavg.h>
+#endif
+
+#if defined(HAVE_GETLOADAVG)
 #ifndef VMSTAT_LOAD_AVERAGE
 #define VMSTAT_LOAD_AVERAGE
 VALUE vmstat_load_average(VALUE self) {

data/ext/vmstat/hw/statfs.h

@@ -1,4 +1,4 @@
-#if defined(HAVE_SYS_PARAM_H) && defined(HAVE_SYS_MOUNT_H) && defined(HAVE_STATFS)
+#if defined(HAVE_STATFS) && (defined(HAVE_STRUCT_STATFS_F_TYPE) || defined(HAVE_STRUCT_STATFS_F_FSTYPENAME))
 #include <vmstat.h>
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -39,3 +39,29 @@ VALUE vmstat_disk(VALUE self, VALUE path) {
 }
 #endif
 #endif
+
+#if defined(HAVE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
+#include <vmstat.h>
+#include <sys/types.h>
+#include <sys/statvfs.h>
+
+#ifndef VMSTAT_DISK
+#define VMSTAT_DISK
+VALUE vmstat_disk(VALUE self, VALUE path) {
+  VALUE disk = Qnil;
+  struct statvfs stat;
+
+  if (statvfs(StringValueCStr(path), &stat) == 0) {
+    disk = rb_funcall(rb_path2class("Vmstat::LinuxDisk"),
+           rb_intern("new"), 6, ID2SYM(rb_intern(stat.f_basetype)),
+                                path,
+                                ULL2NUM(stat.f_bsize),
+                                ULL2NUM(stat.f_bfree),
+                                ULL2NUM(stat.f_bavail),
+                                ULL2NUM(stat.f_blocks));
+  }
+
+  return disk;
+}
+#endif
+#endif

data/ext/vmstat/hw/sysctl.h

@@ -1,22 +1,31 @@
-#if defined(HAVE_SYS_SYSCTL_H) && \
-    defined(HAVE_SYS_TYPES_H) && \
-    defined(HAVE_SYS_SOCKET_H) && \
-    defined(HAVE_NET_IF_H) && \
-    defined(HAVE_NET_IF_MIB_H) && \
-    defined(HAVE_NET_IF_TYPES_H) && \
-    defined(HAVE_GETLOADAVG) && \
-    defined(HAVE_SYSCTL) && \
-    defined(HAVE_TYPE_STRUCT_IFMIBDATA) && \
-    defined(HAVE_CONST_CTL_NET) && \
-    defined(HAVE_CONST_PF_LINK) && \
-    defined(HAVE_CONST_NETLINK_GENERIC) && \
-    defined(HAVE_CONST_IFMIB_IFDATA) && \
-    defined(HAVE_CONST_IFDATA_GENERAL) && \
-    defined(HAVE_CONST_CTL_KERN) && \
-    defined(HAVE_CONST_KERN_BOOTTIME)
+#if defined(HAVE_SYS_SYSCTL_H) &&  defined(HAVE_SYS_TYPES_H) && \
+    defined(HAVE_CONST_CTL_KERN) && defined(HAVE_CONST_KERN_BOOTTIME)
 #include <vmstat.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
+
+#ifndef VMSTAT_BOOT_TIME
+#define VMSTAT_BOOT_TIME
+static int BOOT_TIME_MIB[] = { CTL_KERN, KERN_BOOTTIME };
+
+VALUE vmstat_boot_time(VALUE self) {
+  struct timeval tv;
+  size_t size = sizeof(tv);
+
+  if (sysctl(BOOT_TIME_MIB, 2, &tv, &size, NULL, 0) == 0) {
+    return rb_time_new(tv.tv_sec, tv.tv_usec);
+  } else {
+    return Qnil;
+  }
+}
+#endif // VMSTAT_BOOT_TIME
+
+#if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NET_IF_H) && \
+    defined(HAVE_NET_IF_MIB_H) && defined(HAVE_NET_IF_TYPES_H) && \
+    defined(HAVE_GETLOADAVG) && defined(HAVE_SYSCTL) && \
+    defined(HAVE_TYPE_STRUCT_IFMIBDATA) && defined(HAVE_CONST_CTL_NET) && \
+    defined(HAVE_CONST_PF_LINK) && defined(HAVE_CONST_NETLINK_GENERIC) && \
+    defined(HAVE_CONST_IFMIB_IFDATA) && defined(HAVE_CONST_IFDATA_GENERAL)
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_mib.h>
@@ -52,21 +61,6 @@ VALUE vmstat_network_interfaces(VALUE self) {
 
   return devices;
 }
-#endif
-
-#ifndef VMSTAT_BOOT_TIME
-#define VMSTAT_BOOT_TIME
-static int BOOT_TIME_MIB[] = { CTL_KERN, KERN_BOOTTIME };
-
-VALUE vmstat_boot_time(VALUE self) {
-  struct timeval tv;
-  size_t size = sizeof(tv);
-
-  if (sysctl(BOOT_TIME_MIB, 2, &tv, &size, NULL, 0) == 0) {
-    return rb_time_new(tv.tv_sec, tv.tv_usec);
-  } else {
-    return Qnil;
-  }
-}
+#endif // VMSTAT_NETWORK_INTERFACES
 #endif
 #endif

data/lib/vmstat.rb

@@ -20,6 +20,7 @@ module Vmstat
   autoload :ProcFS,           "vmstat/procfs"
   autoload :Stub,             "vmstat/stub"
   autoload :Snapshot,         "vmstat/snapshot"
+  autoload :Solaris,          "vmstat/solaris"
   extend Stub # the default empty implementation
 
   # @!method self.boot_time
@@ -98,4 +99,10 @@ require "vmstat/vmstat" # native lib
 
 if RUBY_PLATFORM =~ /linux/
   Vmstat.send(:extend, Vmstat::ProcFS)
+elsif RUBY_PLATFORM =~ /(net|open)bsd/
+  # command based implementation of mem, net, cpu
+  require "vmstat/netopenbsd"
+elsif RUBY_PLATFORM =~ /solaris|smartos/
+  # command based implementation of mem, net, cpu
+  Vmstat.send(:include, Vmstat::Solaris)
 end

data/lib/vmstat/netopenbsd.rb

@@ -0,0 +1,61 @@
+module Vmstat
+  def self.cpu
+    cptime = `sysctl kern.cp_time`.split(/=/).last
+    user, nice, sys, irq, idle = cptime.split(/,/).map(&:to_i)
+    [Cpu.new(0, user, sys + irq, nice, idle)]
+  end
+  
+  def self.memory
+    uvmexp = `vmstat -s`
+
+    Memory.new(
+      # pagesize call is not used to avoid double shell out
+      pagesize,       # pagesize
+      extract_uvm_val(uvmexp, 'pages managed'),        # wired
+      extract_uvm_val(uvmexp, 'pages active'),         # active
+      extract_uvm_val(uvmexp, 'pages inactive'),       # inactive
+      extract_uvm_val(uvmexp, 'pages free'),           # free
+      extract_uvm_val(uvmexp, 'pagein operations'),    # pageins
+      extract_uvm_val(uvmexp, 'pages being paged out') # pageouts
+    )
+  end
+
+  def self.network_interfaces
+    bytes = `netstat -ibq`.lines.grep(/<Link>/) # bytes
+    pkgs = `netstat -iqd`.lines.grep(/<Link>/) # packages
+  
+    itf = Hash.new { |h, k| h[k] = NetworkInterface.new(k) }
+  
+    bytes.each do |line|
+      # Name Mtu Network Address Ibytes Obytes
+      name, _, _, _, ibytes, obytes = line.split(/\s+/)
+      itf[name].in_bytes = ibytes.to_i
+      itf[name].out_bytes = obytes.to_i
+    end
+  
+    pkgs.each do |line| 
+      # Name Mtu Network Address Ipkts Ierrs Opkts Oerrs Colls Drop
+      name, _, _, _, _, ierrs, _, oerrs, _, drop = line.split(/\s+/)
+      itf[name].in_errors = ierrs.to_i
+      itf[name].in_drops = drop.to_i
+      itf[name].out_errors = oerrs.to_i
+    end
+    
+    itf.each do |name, nic|
+      if name =~ /lo\d+/ 
+        nic.type = NetworkInterface::LOOPBACK_TYPE
+      else
+        nic.type = NetworkInterface::ETHERNET_TYPE
+      end
+    end
+  
+    itf.values      
+  end
+
+  def self.extract_uvm_val(uvmexp, name)
+    regexp = Regexp.new('(\d+)\s' + name)
+    uvmexp.lines.grep(regexp) do |line|
+      return $1.to_i
+    end
+  end
+end

data/lib/vmstat/solaris.rb

@@ -0,0 +1,75 @@
+module Vmstat
+  module Solaris
+    module ClassMethods
+      def cpu
+        kstat = `kstat -p "cpu_stat:::/idle|kernel|user/"`
+        cpus = Hash.new { |h, k| h[k] = Hash.new }
+
+        kstat.lines.each do |line|
+          _, cpu, _, key, value = line.strip.split(/:|\s+/)
+          cpus[cpu.to_i][key] = value
+        end
+
+        cpus.map do |num, v|
+          Cpu.new(num, v["user"].to_i, v["kernel"].to_i, 0, v["idle"].to_i)
+        end
+      end
+
+      def boot_time
+        Time.at(`kstat -p unix:::boot_time`.strip.split(/\s+/).last.to_i)
+      end
+
+      def memory
+        kstat = `kstat -p -n system_pages`
+        values = Hash.new
+
+        kstat.lines.each do |line|
+          _, _, _, key, value = line.strip.split(/:|\s+/)
+          values[key] = value
+        end
+
+        total = values['pagestotal'].to_i
+        free = values['pagesfree'].to_i
+        locked = values['pageslocked'].to_i
+
+        Memory.new(Vmstat.pagesize,
+                   locked, # wired
+                   total - free - locked, # active
+                   0, # inactive
+                   free, # free
+                   0, #pageins
+                   0) #pageouts
+      end
+
+      def network_interfaces
+        kstat = `kstat -p link:::`
+        itfs = Hash.new { |h, k| h[k] = Hash.new }
+
+        kstat.lines.each do |line|
+          _, _, name, key, value = line.strip.split(/:|\s+/)
+          itfs[name.to_sym][key] = value
+        end
+
+        itfs.map do |k, v|
+          NetworkInterface.new(k, v['rbytes64'].to_i,
+                                  v['ierrors'].to_i,
+                                  0,
+                                  v['obytes64'].to_i,
+                                  v['oerrors'].to_i,
+                                  NetworkInterface::ETHERNET_TYPE)
+        end
+      end
+    end
+
+    extend ClassMethods
+
+    def self.included base
+      base.instance_eval do
+        def cpu; Vmstat::Solaris.cpu end
+        def boot_time; Vmstat::Solaris.boot_time end
+        def memory; Vmstat::Solaris.memory end
+        def network_interfaces; Vmstat::Solaris.network_interfaces end
+      end
+    end
+  end
+end

data/lib/vmstat/version.rb

@@ -1,3 +1,3 @@
 module Vmstat
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/spec/vmstat/solaris_spec.rb

@@ -0,0 +1,275 @@
+require 'spec_helper'
+
+describe Vmstat::Solaris do
+  let(:solaris) do
+    c = Vmstat::Solaris
+    
+    def c.`(cmd)
+      if cmd == 'kstat -p "cpu_stat:::/idle|kernel|user/"'
+        "cpu_stat:0:cpu_stat0:idle       2325343762
+cpu_stat:0:cpu_stat0:idlethread 776439232
+cpu_stat:0:cpu_stat0:kernel     89137335
+cpu_stat:0:cpu_stat0:kernel_asflt       1
+cpu_stat:0:cpu_stat0:user       64919001
+cpu_stat:1:cpu_stat1:idle       2322767706
+cpu_stat:1:cpu_stat1:idlethread 125993797
+cpu_stat:1:cpu_stat1:kernel     78457429
+cpu_stat:1:cpu_stat1:kernel_asflt       34
+cpu_stat:1:cpu_stat1:user       78174710
+cpu_stat:2:cpu_stat2:idle       2390178542
+cpu_stat:2:cpu_stat2:idlethread 3368087417
+cpu_stat:2:cpu_stat2:kernel     50617796
+cpu_stat:2:cpu_stat2:kernel_asflt       0
+cpu_stat:2:cpu_stat2:user       38603497
+cpu_stat:3:cpu_stat3:idle       2390802861
+cpu_stat:3:cpu_stat3:idlethread 1772145290
+cpu_stat:3:cpu_stat3:kernel     46044221
+cpu_stat:3:cpu_stat3:kernel_asflt       0
+cpu_stat:3:cpu_stat3:user       42552751
+cpu_stat:4:cpu_stat4:idle       2436590263
+cpu_stat:4:cpu_stat4:idlethread 2145015281
+cpu_stat:4:cpu_stat4:kernel     23983506
+cpu_stat:4:cpu_stat4:kernel_asflt       0
+cpu_stat:4:cpu_stat4:user       18826062
+cpu_stat:5:cpu_stat5:idle       2435969240
+cpu_stat:5:cpu_stat5:idlethread 3720145695
+cpu_stat:5:cpu_stat5:kernel     25630307
+cpu_stat:5:cpu_stat5:kernel_asflt       0
+cpu_stat:5:cpu_stat5:user       17800281
+cpu_stat:6:cpu_stat6:idle       2432659504
+cpu_stat:6:cpu_stat6:idlethread 3012624014
+cpu_stat:6:cpu_stat6:kernel     24414413
+cpu_stat:6:cpu_stat6:kernel_asflt       0
+cpu_stat:6:cpu_stat6:user       22325909
+cpu_stat:7:cpu_stat7:idle       2430409364
+cpu_stat:7:cpu_stat7:idlethread 1931519381
+cpu_stat:7:cpu_stat7:kernel     28094309
+cpu_stat:7:cpu_stat7:kernel_asflt       0
+cpu_stat:7:cpu_stat7:user       20896150
+cpu_stat:8:cpu_stat8:idle       2443187236
+cpu_stat:8:cpu_stat8:idlethread 1900014542
+cpu_stat:8:cpu_stat8:kernel     20799721
+cpu_stat:8:cpu_stat8:kernel_asflt       0
+cpu_stat:8:cpu_stat8:user       15412864
+cpu_stat:9:cpu_stat9:idle       2440596009
+cpu_stat:9:cpu_stat9:idlethread 3703869451
+cpu_stat:9:cpu_stat9:kernel     23787482
+cpu_stat:9:cpu_stat9:kernel_asflt       0
+cpu_stat:9:cpu_stat9:user       15016328
+cpu_stat:10:cpu_stat10:idle     2427567910
+cpu_stat:10:cpu_stat10:idlethread       3191481058
+cpu_stat:10:cpu_stat10:kernel   30059932
+cpu_stat:10:cpu_stat10:kernel_asflt     5
+cpu_stat:10:cpu_stat10:user     21771975
+cpu_stat:11:cpu_stat11:idle     2431827979
+cpu_stat:11:cpu_stat11:idlethread       1824361353
+cpu_stat:11:cpu_stat11:kernel   27388335
+cpu_stat:11:cpu_stat11:kernel_asflt     0
+cpu_stat:11:cpu_stat11:user     20183500
+cpu_stat:12:cpu_stat12:idle     2442824569
+cpu_stat:12:cpu_stat12:idlethread       2037054756
+cpu_stat:12:cpu_stat12:kernel   21276397
+cpu_stat:12:cpu_stat12:kernel_asflt     0
+cpu_stat:12:cpu_stat12:user     15298846
+cpu_stat:13:cpu_stat13:idle     2443388458
+cpu_stat:13:cpu_stat13:idlethread       3442886390
+cpu_stat:13:cpu_stat13:kernel   22081759
+cpu_stat:13:cpu_stat13:kernel_asflt     0
+cpu_stat:13:cpu_stat13:user     13929592
+cpu_stat:14:cpu_stat14:idle     2434768696
+cpu_stat:14:cpu_stat14:idlethread       2856867656
+cpu_stat:14:cpu_stat14:kernel   23352419
+cpu_stat:14:cpu_stat14:kernel_asflt     0
+cpu_stat:14:cpu_stat14:user     21278693
+cpu_stat:15:cpu_stat15:idle     2432514522
+cpu_stat:15:cpu_stat15:idlethread       1703823954
+cpu_stat:15:cpu_stat15:kernel   27050642
+cpu_stat:15:cpu_stat15:kernel_asflt     16
+cpu_stat:15:cpu_stat15:user     19834642
+cpu_stat:16:cpu_stat16:idle     2436582325
+cpu_stat:16:cpu_stat16:idlethread       1983802071
+cpu_stat:16:cpu_stat16:kernel   21833225
+cpu_stat:16:cpu_stat16:kernel_asflt     0
+cpu_stat:16:cpu_stat16:user     20984253
+cpu_stat:17:cpu_stat17:idle     2432250902
+cpu_stat:17:cpu_stat17:idlethread       307297399
+cpu_stat:17:cpu_stat17:kernel   29580663
+cpu_stat:17:cpu_stat17:kernel_asflt     0
+cpu_stat:17:cpu_stat17:user     17568236
+cpu_stat:18:cpu_stat18:idle     2447310538
+cpu_stat:18:cpu_stat18:idlethread       1473510287
+cpu_stat:18:cpu_stat18:kernel   18480841
+cpu_stat:18:cpu_stat18:kernel_asflt     5
+cpu_stat:18:cpu_stat18:user     13608419
+cpu_stat:19:cpu_stat19:idle     2446462748
+cpu_stat:19:cpu_stat19:idlethread       2882237650
+cpu_stat:19:cpu_stat19:kernel   20384068
+cpu_stat:19:cpu_stat19:kernel_asflt     0
+cpu_stat:19:cpu_stat19:user     12552980
+cpu_stat:20:cpu_stat20:idle     2439710143
+cpu_stat:20:cpu_stat20:idlethread       2513415319
+cpu_stat:20:cpu_stat20:kernel   20976077
+cpu_stat:20:cpu_stat20:kernel_asflt     0
+cpu_stat:20:cpu_stat20:user     18713575
+cpu_stat:21:cpu_stat21:idle     2434565830
+cpu_stat:21:cpu_stat21:idlethread       1574993351
+cpu_stat:21:cpu_stat21:kernel   26063716
+cpu_stat:21:cpu_stat21:kernel_asflt     0
+cpu_stat:21:cpu_stat21:user     18770245
+cpu_stat:22:cpu_stat22:idle     2447896586
+cpu_stat:22:cpu_stat22:idlethread       1566290884
+cpu_stat:22:cpu_stat22:kernel   18718466
+cpu_stat:22:cpu_stat22:kernel_asflt     0
+cpu_stat:22:cpu_stat22:user     12784738
+cpu_stat:23:cpu_stat23:idle     2444823222
+cpu_stat:23:cpu_stat23:idlethread       3286395080
+cpu_stat:23:cpu_stat23:kernel   21510594
+cpu_stat:23:cpu_stat23:kernel_asflt     0
+cpu_stat:23:cpu_stat23:user     13065972
+cpu_stat:24:cpu_stat24:idle     2437316848
+cpu_stat:24:cpu_stat24:idlethread       2628739060
+cpu_stat:24:cpu_stat24:kernel   22266295
+cpu_stat:24:cpu_stat24:kernel_asflt     0
+cpu_stat:24:cpu_stat24:user     19816643
+cpu_stat:25:cpu_stat25:idle     2433451000
+cpu_stat:25:cpu_stat25:idlethread       1604646150
+cpu_stat:25:cpu_stat25:kernel   26748441
+cpu_stat:25:cpu_stat25:kernel_asflt     0
+cpu_stat:25:cpu_stat25:user     19200341
+cpu_stat:26:cpu_stat26:idle     2446405472
+cpu_stat:26:cpu_stat26:idlethread       1573139378
+cpu_stat:26:cpu_stat26:kernel   19619834
+cpu_stat:26:cpu_stat26:kernel_asflt     0
+cpu_stat:26:cpu_stat26:user     13374474
+cpu_stat:27:cpu_stat27:idle     2444019515
+cpu_stat:27:cpu_stat27:idlethread       3275705315
+cpu_stat:27:cpu_stat27:kernel   21816225
+cpu_stat:27:cpu_stat27:kernel_asflt     0
+cpu_stat:27:cpu_stat27:user     13564039
+cpu_stat:28:cpu_stat28:idle     2435784523
+cpu_stat:28:cpu_stat28:idlethread       2628201319
+cpu_stat:28:cpu_stat28:kernel   23125551
+cpu_stat:28:cpu_stat28:kernel_asflt     0
+cpu_stat:28:cpu_stat28:user     20489701
+cpu_stat:29:cpu_stat29:idle     2432230501
+cpu_stat:29:cpu_stat29:idlethread       1635408506
+cpu_stat:29:cpu_stat29:kernel   27198273
+cpu_stat:29:cpu_stat29:kernel_asflt     0
+cpu_stat:29:cpu_stat29:user     19970999
+cpu_stat:30:cpu_stat30:idle     2444413183
+cpu_stat:30:cpu_stat30:idlethread       1644573224
+cpu_stat:30:cpu_stat30:kernel   20310412
+cpu_stat:30:cpu_stat30:kernel_asflt     0
+cpu_stat:30:cpu_stat30:user     14676176
+cpu_stat:31:cpu_stat31:idle     2442483106
+cpu_stat:31:cpu_stat31:idlethread       3345414215
+cpu_stat:31:cpu_stat31:kernel   22515695
+cpu_stat:31:cpu_stat31:kernel_asflt     0
+cpu_stat:31:cpu_stat31:user     14400967\n"
+      elsif cmd == "kstat -p unix:::boot_time"
+        "unix:0:system_misc:boot_time     1470765992\n"
+      elsif cmd == "kstat -p -n system_pages"
+        "unix:0:system_pages:availrmem     70121
+unix:0:system_pages:crtime        116.1198523
+unix:0:system_pages:desfree       3744
+unix:0:system_pages:desscan       25
+unix:0:system_pages:econtig       176160768
+unix:0:system_pages:fastscan      137738
+unix:0:system_pages:freemem       61103
+unix:0:system_pages:kernelbase    16777216
+unix:0:system_pages:lotsfree      7488
+unix:0:system_pages:minfree       1872
+unix:0:system_pages:nalloc        26859076
+unix:0:system_pages:nalloc_calls  11831
+unix:0:system_pages:nfree         25250198
+unix:0:system_pages:nfree_calls   7888
+unix:0:system_pages:nscan         0
+unix:0:system_pages:pagesfree     61103
+unix:0:system_pages:pageslocked   409145
+unix:0:system_pages:pagestotal    479266
+unix:0:system_pages:physmem       489586
+unix:0:system_pages:pp_kernel     438675
+unix:0:system_pages:slowscan      100
+unix:0:system_pages:snaptime      314313.3248461\n"
+      elsif cmd == "kstat -p link:::"
+        "link:0:e1000g0:ierrors 0
+link:0:e1000g0:oerrors 1
+link:0:e1000g0:rbytes64 1000
+link:0:e1000g0:obytes64 2000\n"
+      else
+        raise "Unknown cmd: '#{cmd}'"
+      end
+    end
+    c
+  end
+  
+  context "#cpu" do
+    subject { solaris.cpu }
+
+    it { should be_a(Array)}
+    it do
+      should == [
+        Vmstat::Cpu.new(0, 64919001, 89137335, 0, 2325343762),
+        Vmstat::Cpu.new(1, 78174710, 78457429, 0, 2322767706),
+        Vmstat::Cpu.new(2, 38603497, 50617796, 0, 2390178542),
+        Vmstat::Cpu.new(3, 42552751, 46044221, 0, 2390802861),
+        Vmstat::Cpu.new(4, 18826062, 23983506, 0, 2436590263),
+        Vmstat::Cpu.new(5, 17800281, 25630307, 0, 2435969240),
+        Vmstat::Cpu.new(6, 22325909, 24414413, 0, 2432659504),
+        Vmstat::Cpu.new(7, 20896150, 28094309, 0, 2430409364),
+        Vmstat::Cpu.new(8, 15412864, 20799721, 0, 2443187236),
+        Vmstat::Cpu.new(9, 15016328, 23787482, 0, 2440596009),
+        Vmstat::Cpu.new(10, 21771975, 30059932, 0, 2427567910),
+        Vmstat::Cpu.new(11, 20183500, 27388335, 0, 2431827979),
+        Vmstat::Cpu.new(12, 15298846, 21276397, 0, 2442824569),
+        Vmstat::Cpu.new(13, 13929592, 22081759, 0, 2443388458),
+        Vmstat::Cpu.new(14, 21278693, 23352419, 0, 2434768696),
+        Vmstat::Cpu.new(15, 19834642, 27050642, 0, 2432514522),
+        Vmstat::Cpu.new(16, 20984253, 21833225, 0, 2436582325),
+        Vmstat::Cpu.new(17, 17568236, 29580663, 0, 2432250902),
+        Vmstat::Cpu.new(18, 13608419, 18480841, 0, 2447310538),
+        Vmstat::Cpu.new(19, 12552980, 20384068, 0, 2446462748),
+        Vmstat::Cpu.new(20, 18713575, 20976077, 0, 2439710143),
+        Vmstat::Cpu.new(21, 18770245, 26063716, 0, 2434565830),
+        Vmstat::Cpu.new(22, 12784738, 18718466, 0, 2447896586),
+        Vmstat::Cpu.new(23, 13065972, 21510594, 0, 2444823222),
+        Vmstat::Cpu.new(24, 19816643, 22266295, 0, 2437316848),
+        Vmstat::Cpu.new(25, 19200341, 26748441, 0, 2433451000),
+        Vmstat::Cpu.new(26, 13374474, 19619834, 0, 2446405472),
+        Vmstat::Cpu.new(27, 13564039, 21816225, 0, 2444019515),
+        Vmstat::Cpu.new(28, 20489701, 23125551, 0, 2435784523),
+        Vmstat::Cpu.new(29, 19970999, 27198273, 0, 2432230501),
+        Vmstat::Cpu.new(30, 14676176, 20310412, 0, 2444413183),
+        Vmstat::Cpu.new(31, 14400967, 22515695, 0, 2442483106)
+      ]
+    end
+  end
+
+  context "#memory" do
+    subject { solaris.memory }
+
+    it { should be_a(Vmstat::Memory) }
+    it do
+      should == Vmstat::Memory.new(4096, 409145, 9018, 0, 61103, 0, 0)
+    end
+  end
+
+  context "#boot_time" do
+    subject { solaris.boot_time }
+
+    it { should be_a(Time) }
+    it { should == Time.at(1470765992) }
+  end
+
+  context "#network_interfaces" do
+    subject { solaris.network_interfaces }
+
+    it { should be_a(Array) }
+    it do
+      should == [
+        Vmstat::NetworkInterface.new(:e1000g0, 1000, 0, 0, 2000, 1,
+                                     Vmstat::NetworkInterface::ETHERNET_TYPE)
+      ]
+    end
+  end
+end

data/spec/vmstat_spec.rb

@@ -24,7 +24,7 @@ describe Vmstat do
       Vmstat.loopback_devices.size.should == 1
     end
   end
-  
+
   context "performance" do
     percent = RUBY_VERSION.to_i == 2 ? 26 : 10
     
@@ -44,5 +44,5 @@ describe Vmstat do
     it_should_behave_like "a not memory leaking method", :disk, "/"
     it_should_behave_like "a not memory leaking method", :boot_time
     it_should_behave_like "a not memory leaking method", :load_average
-  end
+  end if ENV['PERF'] == "1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmstat
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Vincent Landgraf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,9 +114,11 @@ files:
 - lib/vmstat/linux_disk.rb
 - lib/vmstat/load_average.rb
 - lib/vmstat/memory.rb
+- lib/vmstat/netopenbsd.rb
 - lib/vmstat/network_interface.rb
 - lib/vmstat/procfs.rb
 - lib/vmstat/snapshot.rb
+- lib/vmstat/solaris.rb
 - lib/vmstat/stub.rb
 - lib/vmstat/task.rb
 - lib/vmstat/version.rb
@@ -135,6 +137,7 @@ files:
 - spec/vmstat/network_spec.rb
 - spec/vmstat/procfs_spec.rb
 - spec/vmstat/snapshot_spec.rb
+- spec/vmstat/solaris_spec.rb
 - spec/vmstat/task_spec.rb
 - spec/vmstat_spec.rb
 - vmstat.gemspec
@@ -157,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A focused and fast library to gather system information
@@ -177,5 +180,6 @@ test_files:
 - spec/vmstat/network_spec.rb
 - spec/vmstat/procfs_spec.rb
 - spec/vmstat/snapshot_spec.rb
+- spec/vmstat/solaris_spec.rb
 - spec/vmstat/task_spec.rb
 - spec/vmstat_spec.rb