sigar 0.7.2 → 0.7.3

data/src/sigar_ptql.c

@@ -1338,6 +1338,14 @@ static ptql_lookup_t PTQL_Cpu[] = {
     { NULL }
 };
 
+static ptql_lookup_t PTQL_Disk_IO[] = {
+    { "BytesRead", PTQL_LOOKUP_ENTRY(proc_disk_io, bytes_read, UI64) },
+    { "BytesWritten",      PTQL_LOOKUP_ENTRY(proc_disk_io, bytes_written, UI64) },
+    { "BytesTotal",       PTQL_LOOKUP_ENTRY(proc_disk_io, bytes_total, UI64) },
+    { NULL }
+};
+
+
 static ptql_lookup_t PTQL_CredName[] = {
     { "User",  PTQL_LOOKUP_ENTRY(proc_cred_name, user, STR) },
     { "Group", PTQL_LOOKUP_ENTRY(proc_cred_name, group, STR) },
@@ -1424,6 +1432,7 @@ static ptql_entry_t ptql_map[] = {
     { "Port",     PTQL_Port },
     { "Pid",      PTQL_Pid },
     { "Service",  PTQL_Service },
+    { "Disk_IO",   PTQL_Disk_IO },
     { NULL }
 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sigar
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies: []
 description: System Information Gatherer And Reporter
 email: sigar-users@hyperic.org
@@ -25,28 +25,8 @@ files:
 - version.properties
 - bindings/SigarWrapper.pm
 - bindings/SigarBuild.pm
-- bindings/ruby/examples/arp.rb
-- bindings/ruby/examples/cpu_info.rb
-- bindings/ruby/examples/df.rb
-- bindings/ruby/examples/free.rb
-- bindings/ruby/examples/ifconfig.rb
-- bindings/ruby/examples/logging.rb
-- bindings/ruby/examples/net_info.rb
-- bindings/ruby/examples/netstat.rb
-- bindings/ruby/examples/pargs.rb
-- bindings/ruby/examples/penv.rb
-- bindings/ruby/examples/route.rb
-- bindings/ruby/examples/version.rb
-- bindings/ruby/examples/who.rb
 - bindings/ruby/extconf.rb
 - bindings/ruby/rbsigar.c
-- bindings/ruby/test/cpu_test.rb
-- bindings/ruby/test/file_system_test.rb
-- bindings/ruby/test/helper.rb
-- bindings/ruby/test/loadavg_test.rb
-- bindings/ruby/test/mem_test.rb
-- bindings/ruby/test/swap_test.rb
-- bindings/ruby/test/uptime_test.rb
 - include/sigar.h
 - include/sigar_fileinfo.h
 - include/sigar_format.h
@@ -105,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: System Information Gatherer And Reporter

data/bindings/ruby/examples/arp.rb

@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'sigar'
-
-Sigar.new.arp_list.each do |arp|
-  host = "?" #XXX
-  puts host + " " +
-    "(" + arp.address + ")" + " at " + arp.hwaddr + " " +
-    "[" + arp.type + "]" + " on " + arp.ifname
-end

data/bindings/ruby/examples/cpu_info.rb

@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2007 Hyperic, Inc.
-# Copyright (c) 2009-2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'sigar'
-
-sigar = Sigar.new
-
-infos = sigar.cpu_info_list
-
-num = infos.length
-
-puts num.to_s + " total CPUs.."
-
-infos.each do |info|
-    puts "Vendor........" + info.vendor
-    puts "Model........." + info.model
-    puts "Current Mhz..." + info.mhz.to_s
-    puts "Maximum Mhz..." + info.mhz_max.to_s
-    puts "Minimum Mhz..." + info.mhz_min.to_s
-    puts "Cache size...." + info.cache_size.to_s
-end

data/bindings/ruby/examples/df.rb

@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2007, 2009 Hyperic, Inc.
-# Copyright (c) 2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'sigar'
-
-def format_size(size)
-  return Sigar.format_size(size * 1024)
-end
-
-sigar = Sigar.new
-fslist = sigar.file_system_list
-
-puts "Filesystem\tSize\tUsed\tAvail\tUse%\tMounted on\tType\n"
-
-fslist.each do |fs|
-  dir_name = fs.dir_name
-  begin
-    usage = sigar.file_system_usage(dir_name)
-    total = usage.total
-    used = total - usage.free
-    avail = usage.avail
-    pct = usage.use_percent * 100
-  rescue Exception => e
-    #e.g. floppy or cdrom drive
-    used = avail = total = pct = 0;
-  end
-
-  puts fs.dev_name + "\t" +
-    format_size(total) + "\t" +
-    format_size(used) + "\t" +
-    format_size(avail) + "\t" +
-    (pct == 0.0 ? '-' : pct.to_s) + "\t" +
-    dir_name + "\t" + 
-    fs.sys_type_name + "/" + fs.type_name
-end

data/bindings/ruby/examples/free.rb

@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2007 Hyperic, Inc.
-# Copyright (c) 2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'sigar'
-
-sigar = Sigar.new
-mem = sigar.mem
-swap = sigar.swap
-
-puts "\tTotal\tUsed\tFree"
-
-puts "Mem:    " +
-     (mem.total / 1024).to_s + "\t" +
-     (mem.used / 1024).to_s + "\t" +
-     (mem.free/ 1024).to_s
-
-puts "Swap:   " +
-     (swap.total / 1024).to_s + "\t" +
-     (swap.used / 1024).to_s + "\t" +
-     (swap.free/ 1024).to_s
-
-puts "RAM:    " + mem.ram.to_s + "MB";

data/bindings/ruby/examples/ifconfig.rb

@@ -1,101 +0,0 @@
-#
-# Copyright (c) 2007 Hyperic, Inc.
-# Copyright (c) 2009 SpringSource, Inc.
-# Copyright (c) 2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'sigar'
-
-sigar = Sigar.new
-iflist = sigar.net_interface_list
-
-iflist.each do |ifname|
-  ifconfig = sigar.net_interface_config(ifname)
-  flags = ifconfig.flags
-  encap = ifconfig.type
-
-  if (flags & Sigar::IFF_UP) == 0
-    next
-  end
-
-  hwaddr = ifconfig.hwaddr
-  if hwaddr == Sigar::NULL_HWADDR
-    hwaddr = ""
-  else
-    hwaddr = " HWaddr " + hwaddr
-  end
-
-  puts ifname + "\t" + "Link encap:" + encap + hwaddr
-
-  if (flags & Sigar::IFF_POINTOPOINT) != 0
-    ptp = "  P-t-P:" + ifconfig.destination
-  else
-    ptp = ""
-  end
-
-  if (flags & Sigar::IFF_BROADCAST) != 0
-    bcast = "  Bcast:" + ifconfig.broadcast
-  else
-    bcast = ""
-  end
-
-  address = ifconfig.address
-  if address != "0.0.0.0"
-    puts "\t" + "inet addr:" + address +
-      ptp + bcast + " Mask:" + ifconfig.netmask
-  end
-
-  if ifconfig.prefix6_length != 0
-    puts "\t" + "inet6 addr: " + ifconfig.address6 + "/" +
-      ifconfig.prefix6_length.to_s + " Scope:" + Sigar.net_scope_to_s(ifconfig.scope6)
-  end
-
-  puts "\t" +
-    Sigar.net_interface_flags_to_s(flags) +
-    " MTU:" + ifconfig.mtu.to_s +
-    " Metric:" + ifconfig.metric.to_s
-
-  if (!ifname.include?(":"))
-    ifstat = sigar.net_interface_stat(ifname)
-    puts "\t" +
-        "RX packets:" + ifstat.rx_packets.to_s +
-        " errors:" + ifstat.rx_errors.to_s +
-        " dropped:" + ifstat.rx_dropped.to_s +
-        " overruns:" + ifstat.rx_overruns.to_s +
-        " frame:" + ifstat.rx_frame.to_s
-
-    puts "\t" +
-        "TX packets:" + ifstat.tx_packets.to_s +
-        " errors:" + ifstat.tx_errors.to_s +
-        " dropped:" + ifstat.tx_dropped.to_s +
-        " overruns:" + ifstat.tx_overruns.to_s +
-        " carrier:" + ifstat.tx_carrier.to_s
-
-    puts "\t" + "collisions:" + ifstat.tx_collisions.to_s +
-      " txqueuelen:" + ifconfig.tx_queue_len.to_s
-
-    rx_bytes = ifstat.rx_bytes
-    tx_bytes = ifstat.tx_bytes
-
-    puts "\t" +
-      "RX bytes:" + rx_bytes.to_s +
-      " (" + Sigar.format_size(rx_bytes) + ")" +
-      "  " +
-      "TX bytes:" + tx_bytes.to_s +
-      " (" + Sigar.format_size(tx_bytes) + ")" + "\n"
-  end
-
-  puts "\n"
-end

data/bindings/ruby/examples/logging.rb

@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2009 SpringSource, Inc.
-# Copyright (c) 2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Example illustrating the use of the optional logger.
-
-require 'sigar'
-require 'logger'
-
-sigar = Sigar.new
-sigar.log_level = Sigar::LOG_DEBUG
-
-logger = Logger.new(STDERR)
-logger.datetime_format = "%H:%M:%S"
-
-# Call something that has DEBUG level logging.
-fslist = sigar.file_system_list
-
-# cache data
-fslist.each do |fs|
-  dir_name = fs.dir_name
-  usage = sigar.file_system_usage(dir_name)
-end
-
-puts "Calling file_system_usage() for each filesystem"
-
-puts "\nwith Logger:"
-
-sigar.logger = logger
-
-fslist.each do |fs|
-  dir_name = fs.dir_name
-  usage = sigar.file_system_usage(dir_name)
-end
-
-puts "\nwith Proc:"
-
-sigar.logger = Proc.new do |level, msg| 
-  puts "Level #{level}: #{msg}"
-end
-
-fslist.each do |fs|
-  dir_name = fs.dir_name
-  usage = sigar.file_system_usage(dir_name)
-end

data/bindings/ruby/examples/net_info.rb

@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2009-2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Example illustrating the collecting of network information.
-
-require 'sigar'
-
-sigar = Sigar.new
-
-ninfo = sigar.net_info
-
-puts "Hostname:                  " + ninfo.host_name
-puts "Domain Name:               " + ninfo.domain_name
-puts "FQDN:                      " + sigar.fqdn
-puts "Default gateway:           " + ninfo.default_gateway
-puts "Default gateway interface: " + ninfo.default_gateway_interface
-puts "Primary DNS:               " + ninfo.primary_dns
-puts "Secondary DNS:             " + ninfo.secondary_dns

data/bindings/ruby/examples/netstat.rb

@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2007 Hyperic, Inc.
-# Copyright (c) 2010 VMware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'sigar'
-require 'socket'
-
-#XXX this example is incomplete wrt:
-#../../java/src/org/hyperic/sigar/cmd/Netstat.java
-
-is_numeric = false
-flags = Sigar::NETCONN_CLIENT|Sigar::NETCONN_SERVER
-flags |= Sigar::NETCONN_TCP
-
-def format_port(sigar, proto, port, is_numeric)
-  if port == 0
-    return "*"
-  end
-  if !is_numeric
-    service = sigar.net_services_name(proto, port)
-    if service != nil
-      return service
-    end
-  end
-  port.to_s
-end
-
-def format_address(sigar, proto, ip, portnum, is_numeric)
-  port = format_port(sigar, proto, portnum, is_numeric)
-  address = ""
-  if ip == "0.0.0.0" || ip == "::"
-    address = "*"
-  elsif is_numeric
-    address = ip.to_s
-  else
-    begin
-      name = Socket.gethostbyname(ip)
-      address = name[0]
-    rescue SocketError
-      address = ip.to_s
-    end
-  end
-  return address + ":" + port
-end
-
-sigar = Sigar.new
-
-connections = sigar.net_connection_list(flags)
-puts "Proto\tLocal Address\tForeign Address\tState"
-
-connections.each do |conn|
-  proto = Sigar.net_connection_type_to_s(conn.type)
-  state = Sigar.net_connection_state_to_s(conn.state)
-  local = format_address(sigar, conn.type, conn.local_address, conn.local_port, is_numeric)
-  remote = format_address(sigar, conn.type, conn.remote_address, conn.remote_port, is_numeric)
-  puts proto + "\t" + local + "\t" + remote + "\t" + state
-end
-