sys-proctable 1.2.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb96b1cfb746706244c26f2ce85f54740163cb9f9174237fd06767849ca62cb8
-  data.tar.gz: f8b0b6d47efb86e64a630331a3408deb5baf2a6c8b1256bf55a0bad76f9c17c7
+  metadata.gz: 67e97600844b87fee76e66de7ca9ce8dc437c4b0e37d8760a1a1211629ca0ad4
+  data.tar.gz: 8f3940b17936f4fa4fdcbaae499728d54a0d20160f320021882435dc42fa8e1d
 SHA512:
-  metadata.gz: 72bf0ffb98c4362deeb9506c6d2f50147c327fe0862575b06f5de1d342e6c9b3a7d5a0fd9a51d69e15cd2f1f68f8d8a9d67ceba12b8a8350f123498b759c4ac0
-  data.tar.gz: 9acdc748cffeee40be36cff671b9f8057ec7fd9f416609f326882c28dfa5b9dd4fddba07a56ed9d64fe9d27b2743c242a3a9b04f902a2f9c3b442ab4ca38a2e1
+  metadata.gz: 7d9abfefc12b38b3e9961aaed71e4c0cf220418d6e719e945bcb72fe0d66a9782375ad860bb9f9dd37cedb5aefa410d689cdc97cfeb8ecc9f61e9c6eecf6fcf1
+  data.tar.gz: b1bb3b2a1fad203879b6a3c79066e730c074e9b6a5c090da0abdaebe86e4648dbccf07955c27e575ea52aa0c38acc08ae781754ee68dc50c8527f7c054433c56

data/{CHANGES → CHANGES.rdoc}

@@ -1,3 +1,40 @@
+== 1.2.6 - 25-Aug-2020
+* Made some updates so that it worked properly with TruffleRuby on Mac.
+* Fixed an issue on Linux where non-ascii environ strings could cause failure.
+  Thanks go to deemytch for the spot and original patch.
+* Removed the spec_helper.rb file, just use Process.spawn instead of messing
+  around with custom fork implementations. This also helps with implementations
+  that don't support fork.
+* Updated the MANIFEST.
+
+== 1.2.5 - 19-Jun-2020
+* Added the delayacct_blkio_ticks, guest_time, and cguest_time fields on Linux.
+  These require 2.6.18 or later, but will simply be nil on earlier versions.
+* Added the rsslim synonym for the rlim field for Linux.
+
+== 1.2.4 - 18-Jun-2020
+* Added the num_threads field for Linux. This was originally a dead field in
+  older versions of Linux that was skipped, but as of Linux 2.6+ it actually
+  holds meaningful data.
+* Updated the specs for Linux.
+
+== 1.2.3 - 17-Mar-2020
+* Properly include a copy of Apache-2.0 in LICENSE file as part of library.
+* Add explicit .rdoc extensions to CHANGES and MANIFEST files.
+
+== 1.2.2 - 12-Aug-2019
+* Added compatibility for JRuby on Mac which apparently doesn't define a
+  read_uint64 method, nor a CharArray. Thanks go to Adithya Pentela for
+  the spot.
+* Refactored the specs a bit, adding a spec_helper.rb. This was mainly
+  for JRuby compatibility.
+* Updates to the travis.yml file for both Ruby and JRuby versions.
+* Removed the doc directory and all the files it contained. It was
+  redundant, and some of the information was wrong. All of the
+  documentation you need is on the wiki.
+* Cleaned up the MANIFEST file, updated the gemspec, and fixed the
+  license name, which was missing a hyphen.
+
 == 1.2.1 - 8-Jun-2018
 * The code for OSX is now more efficient when a pid argument is provided.
   Thanks go to Nick LaMuro for his efforts.

data/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/MANIFEST.rdoc

@@ -0,0 +1,28 @@
+* CHANGES
+* LICENSE
+* MANIFEST
+* Rakefile
+* README
+* sys-proctable.gemspec
+* benchmarks/bench_ps.rb
+* benchmarks/bench_ips_ps.rb
+* example/example_ps.rb
+* lib/sys-proctable.rb
+* lib/sys-top.rb
+* lib/sys/proctable.rb
+* lib/sys/top.rb
+* lib/sys/proctable/version.rb
+* lib/aix/sys/proctable.rb
+* lib/darwin/sys/proctable.rb
+* lib/freebsd/sys/proctable.rb
+* lib/linux/sys/proctable.rb
+* lib/sunos/sys/proctable.rb
+* lib/windows/sys/proctable.rb
+* spec/sys_proctable_aix_spec.rb
+* spec/sys_proctable_all_spec.rb
+* spec/sys_proctable_darwin_spec.rb
+* spec/sys_proctable_freebsd_spec.rb
+* spec/sys_proctable_linux_spec.rb
+* spec/sys_proctable_sunos_spec.rb
+* spec/sys_proctable_windows_spec.rb
+* spec/sys_top_spec.rb

data/README.md

@@ -150,7 +150,7 @@ Apache 2.0
 
 ## Copyright
 
-(C) 2003-2018 Daniel J. Berger
+(C) 2003-2019 Daniel J. Berger
 All Rights Reserved.
 
 ## Author

data/benchmarks/bench_ips_ps.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'optparse'
+require 'rbconfig'
+require 'benchmark/ips'
+
+@source, @gem = false
+
+OptionParser.new do |opt|
+  opt.banner = "Usage: #{File.basename $0} [--gem|--source]"
+
+  opt.separator ""
+  opt.separator "Benchmark IPS (iterations per second) changes between"
+  opt.separator "source version of sys-proctable and previous gem"
+  opt.separator "version."
+  opt.separator ""
+  opt.separator "Requires that the both the source version of the gem"
+  opt.separator "be installed (run `rake install` to do this after"
+  opt.separator "each of your changes) and version installed via"
+  opt.separator "rubygems."
+  opt.separator ""
+  opt.separator "To run, call with `--gem` two times, and then with "
+  opt.separator "`--source` two times again."
+  opt.separator ""
+
+  opt.on("--source") { @source = true }
+  opt.on("--gem")    { @gem = true }
+end.parse!
+
+if @source && !@gem
+  # Being paranoid here and making sure we get the version installed to
+  # sitelibdir
+  require File.join(RbConfig::CONFIG["sitelibdir"], "sys", "proctable")
+else
+  @gem = true
+  require 'sys-proctable'
+end
+
+Benchmark.ips do |bench|
+  bench.report("Block form - pre patch") do
+    (puts "ERR:  Please run with --gem"; exit 1) unless @gem
+    Sys::ProcTable.ps {}
+  end
+
+  bench.report("Non-block form - pre patch") do
+    (puts "ERR:  Please run with --gem"; exit 1) unless @gem
+    Sys::ProcTable.ps
+  end
+
+  bench.report("Block form - post patch") do
+    (puts "ERR:  Please run with --source"; exit 1) unless @source
+    Sys::ProcTable.ps {}
+  end
+
+  bench.report("Non-block form - post patch") do
+    (puts "ERR:  Please run with --source"; exit 1) unless @source
+    Sys::ProcTable.ps
+  end
+
+  bench.hold! "bench_ips_ps.results"
+  bench.compare!
+end

data/lib/darwin/sys/proctable.rb

@@ -26,6 +26,15 @@ module Sys
     MAXTHREADNAMESIZE = 64
     PROC_PIDPATHINFO_MAXSIZE = MAXPATHLEN * 4
 
+    # JRuby/Truffleruby on Mac
+    unless defined? FFI::StructLayout::CharArray
+      if defined? FFI::StructLayout::CharArrayProxy
+        FFI::StructLayout::CharArray = FFI::StructLayout::CharArrayProxy
+      else
+        FFI::StructLayout::CharArray = FFI::Struct::CharArray
+      end
+    end
+
     class ProcBsdInfo < FFI::Struct
       layout(
         :pbi_flags, :uint32_t,
@@ -285,7 +294,13 @@ module Sys
 
       0.upto(max-1) do |index|
         tinfo = ProcThreadInfo.new
-        nb = proc_pidinfo(pid, PROC_PIDTHREADINFO, buf[index].read_uint64, tinfo, tinfo.size)
+
+        # Use read_array_of_uint64 for compatibility with JRuby if necessary.
+        if buf[index].respond_to?(:read_uint64)
+          nb = proc_pidinfo(pid, PROC_PIDTHREADINFO, buf[index].read_uint64, tinfo, tinfo.size)
+        else
+          nb = proc_pidinfo(pid, PROC_PIDTHREADINFO, buf[index].read_array_of_uint64(1).first, tinfo, tinfo.size)
+        end
 
         if nb <= 0
           if [Errno::EPERM::Errno, Errno::ESRCH::Errno].include?(FFI.errno)

data/lib/linux/sys/proctable.rb

@@ -20,62 +20,67 @@ module Sys
     @boot_time = IO.read("/proc/stat")[/btime.*/].split.last.to_i rescue nil
 
     @fields = [
-      'cmdline',     # Complete command line
-      'cwd',         # Current working directory
-      'environ',     # Environment
-      'exe',         # Actual pathname of the executed command
-      'fd',          # File descriptors open by process
-      'root',        # Root directory of process
-      'pid',         # Process ID
-      'comm',        # Filename of executable
-      'state',       # Single character state abbreviation
-      'ppid',        # Parent process ID
-      'pgrp',        # Process group
-      'session',     # Session ID
-      'tty_nr',      # TTY (terminal) associated with the process
-      'tpgid',       # Group ID of the TTY
-      'flags',       # Kernel flags
-      'minflt',      # Number of minor faults
-      'cminflt',     # Number of minor faults of waited-for children
-      'majflt',      # Number of major faults
-      'cmajflt',     # Number of major faults of waited-for children
-      'utime',       # Number of user mode jiffies
-      'stime',       # Number of kernel mode jiffies
-      'cutime',      # Number of children's user mode jiffies
-      'cstime',      # Number of children's kernel mode jiffies
-      'priority',    # Nice value plus 15
-      'nice',        # Nice value
-      'itrealvalue', # Time in jiffies before next SIGALRM
-      'starttime',   # Time in jiffies since system boot
-      'vsize',       # Virtual memory size in bytes
-      'rss',         # Resident set size
-      'rlim',        # Current limit on the rss in bytes
-      'startcode',   # Address above which program text can run
-      'endcode',     # Address below which program text can run
-      'startstack',  # Address of the startstack
-      'kstkesp',     # Kernel stack page address
-      'kstkeip',     # Kernel instruction pointer
-      'signal',      # Bitmap of pending signals
-      'blocked',     # Bitmap of blocked signals
-      'sigignore',   # Bitmap of ignored signals
-      'sigcatch',    # Bitmap of caught signals
-      'wchan',       # Channel in which the process is waiting
-      'nswap',       # Number of pages swapped
-      'cnswap',      # Cumulative nswap for child processes
-      'exit_signal', # Signal to be sent to parent when process dies
-      'processor',   # CPU number last executed on
-      'rt_priority', # Real time scheduling priority
-      'policy',      # Scheduling policy
-      'name',        # Process name
-      'uid',         # Real user ID
-      'euid',        # Effective user ID
-      'gid',         # Real group ID
-      'egid',        # Effective group ID
-      'pctcpu',      # Percent of CPU usage (custom field)
-      'pctmem',      # Percent of Memory usage (custom field)
-      'nlwp',        # Number of Light-Weight Processes associated with the process (threads)
-      'cgroup',      # Control groups to which the process belongs
-      'smaps'        # Process memory size for all mapped files
+      'cmdline',               # Complete command line
+      'cwd',                   # Current working directory
+      'environ',               # Environment
+      'exe',                   # Actual pathname of the executed command
+      'fd',                    # File descriptors open by process
+      'root',                  # Root directory of process
+      'pid',                   # Process ID
+      'comm',                  # Filename of executable
+      'state',                 # Single character state abbreviation
+      'ppid',                  # Parent process ID
+      'pgrp',                  # Process group
+      'session',               # Session ID
+      'tty_nr',                # TTY (terminal) associated with the process
+      'tpgid',                 # Group ID of the TTY
+      'flags',                 # Kernel flags
+      'minflt',                # Number of minor faults
+      'cminflt',               # Number of minor faults of waited-for children
+      'majflt',                # Number of major faults
+      'cmajflt',               # Number of major faults of waited-for children
+      'utime',                 # Number of user mode jiffies
+      'stime',                 # Number of kernel mode jiffies
+      'cutime',                # Number of children's user mode jiffies
+      'cstime',                # Number of children's kernel mode jiffies
+      'priority',              # Nice value plus 15
+      'nice',                  # Nice value
+      'num_threads',           # Number of threads in this process
+      'itrealvalue',           # Time in jiffies before next SIGALRM
+      'starttime',             # Time in jiffies since system boot
+      'vsize',                 # Virtual memory size in bytes
+      'rss',                   # Resident set size
+      'rlim',                  # Current limit on the rss in bytes (old)
+      'rsslim',                # Current limit on the rss in bytes (current)
+      'startcode',             # Address above which program text can run
+      'endcode',               # Address below which program text can run
+      'startstack',            # Address of the startstack
+      'kstkesp',               # Kernel stack page address
+      'kstkeip',               # Kernel instruction pointer
+      'signal',                # Bitmap of pending signals
+      'blocked',               # Bitmap of blocked signals
+      'sigignore',             # Bitmap of ignored signals
+      'sigcatch',              # Bitmap of caught signals
+      'wchan',                 # Channel in which the process is waiting
+      'nswap',                 # Number of pages swapped
+      'cnswap',                # Cumulative nswap for child processes
+      'exit_signal',           # Signal to be sent to parent when process dies
+      'processor',             # CPU number last executed on
+      'rt_priority',           # Real time scheduling priority
+      'policy',                # Scheduling policy
+      'delayacct_blkio_ticks', # Aggregated block I/O delays
+      'guest_time',            # Guest time of the process
+      'cguest_time',           # Guest time of the process's children
+      'name',                  # Process name
+      'uid',                   # Real user ID
+      'euid',                  # Effective user ID
+      'gid',                   # Real group ID
+      'egid',                  # Effective group ID
+      'pctcpu',                # Percent of CPU usage (custom field)
+      'pctmem',                # Percent of Memory usage (custom field)
+      'nlwp',                  # Number of Light-Weight Processes associated with the process (threads)
+      'cgroup',                # Control groups to which the process belongs
+      'smaps'                  # Process memory size for all mapped files
     ]
 
     public
@@ -141,7 +146,7 @@ module Sys
         struct.environ = {}
 
         begin
-          IO.read("/proc/#{file}/environ").split("\0").each{ |str|
+          IO.read("/proc/#{file}/environ").force_encoding("UTF-8").split("\0").each{ |str|
             key, value = str.split('=')
             struct.environ[key] = value
           }
@@ -197,47 +202,51 @@ module Sys
 
         stat = stat.split
 
-        struct.pid         = stat[0].to_i
-        struct.comm        = stat[1].tr('()','') # Remove parens
-        struct.state       = stat[2]
-        struct.ppid        = stat[3].to_i
-        struct.pgrp        = stat[4].to_i
-        struct.session     = stat[5].to_i
-        struct.tty_nr      = stat[6].to_i
-        struct.tpgid       = stat[7].to_i
-        struct.flags       = stat[8].to_i
-        struct.minflt      = stat[9].to_i
-        struct.cminflt     = stat[10].to_i
-        struct.majflt      = stat[11].to_i
-        struct.cmajflt     = stat[12].to_i
-        struct.utime       = stat[13].to_i
-        struct.stime       = stat[14].to_i
-        struct.cutime      = stat[15].to_i
-        struct.cstime      = stat[16].to_i
-        struct.priority    = stat[17].to_i
-        struct.nice        = stat[18].to_i
-        # Skip 19
-        struct.itrealvalue = stat[20].to_i
-        struct.starttime   = stat[21].to_i
-        struct.vsize       = stat[22].to_i
-        struct.rss         = stat[23].to_i
-        struct.rlim        = stat[24].to_i
-        struct.startcode   = stat[25].to_i
-        struct.endcode     = stat[26].to_i
-        struct.startstack  = stat[27].to_i
-        struct.kstkesp     = stat[28].to_i
-        struct.kstkeip     = stat[29].to_i
-        struct.signal      = stat[30].to_i
-        struct.blocked     = stat[31].to_i
-        struct.sigignore   = stat[32].to_i
-        struct.sigcatch    = stat[33].to_i
-        struct.wchan       = stat[34].to_i
-        struct.nswap       = stat[35].to_i
-        struct.cnswap      = stat[36].to_i
-        struct.exit_signal = stat[37].to_i
-        struct.processor   = stat[38].to_i
-        struct.rt_priority = stat[39].to_i
-        struct.policy      = stat[40].to_i
+        struct.pid                   = stat[0].to_i
+        struct.comm                  = stat[1].tr('()','') # Remove parens
+        struct.state                 = stat[2]
+        struct.ppid                  = stat[3].to_i
+        struct.pgrp                  = stat[4].to_i
+        struct.session               = stat[5].to_i
+        struct.tty_nr                = stat[6].to_i
+        struct.tpgid                 = stat[7].to_i
+        struct.flags                 = stat[8].to_i
+        struct.minflt                = stat[9].to_i
+        struct.cminflt               = stat[10].to_i
+        struct.majflt                = stat[11].to_i
+        struct.cmajflt               = stat[12].to_i
+        struct.utime                 = stat[13].to_i
+        struct.stime                 = stat[14].to_i
+        struct.cutime                = stat[15].to_i
+        struct.cstime                = stat[16].to_i
+        struct.priority              = stat[17].to_i
+        struct.nice                  = stat[18].to_i
+        struct.num_threads           = stat[19].to_i
+        struct.itrealvalue           = stat[20].to_i
+        struct.starttime             = stat[21].to_i
+        struct.vsize                 = stat[22].to_i
+        struct.rss                   = stat[23].to_i
+        struct.rlim                  = stat[24].to_i # Old name for backwards compatibility
+        struct.rsslim                = stat[24].to_i
+        struct.startcode             = stat[25].to_i
+        struct.endcode               = stat[26].to_i
+        struct.startstack            = stat[27].to_i
+        struct.kstkesp               = stat[28].to_i
+        struct.kstkeip               = stat[29].to_i
+        struct.signal                = stat[30].to_i
+        struct.blocked               = stat[31].to_i
+        struct.sigignore             = stat[32].to_i
+        struct.sigcatch              = stat[33].to_i
+        struct.wchan                 = stat[34].to_i
+        struct.nswap                 = stat[35].to_i
+        struct.cnswap                = stat[36].to_i
+        struct.exit_signal           = stat[37].to_i
+        struct.processor             = stat[38].to_i
+        struct.rt_priority           = stat[39].to_i
+        struct.policy                = stat[40].to_i
+        struct.delayacct_blkio_ticks = stat[41].to_i
+        struct.guest_time            = stat[42].to_i
+        struct.cguest_time           = stat[43].to_i
 
         # Get /proc/<pid>/status information (name, uid, euid, gid, egid)
         begin

data/lib/sys/proctable/version.rb

@@ -1,6 +1,6 @@
 module Sys
   class ProcTable
     # The version of the sys-proctable library
-    VERSION = '1.2.1'.freeze
+    VERSION = '1.2.6'.freeze
   end
 end

data/spec/sys_proctable_all_spec.rb

@@ -16,7 +16,8 @@ describe Sys::ProcTable do
   end
 
   it "has a VERSION constant set to the expected value" do
-    expect(Sys::ProcTable::VERSION).to eql('1.2.1')
+    expect(Sys::ProcTable::VERSION).to eql('1.2.6')
+    expect(Sys::ProcTable::VERSION).to be_frozen
   end
 
   it "defines a custom error class" do

data/spec/sys_proctable_darwin_spec.rb

@@ -21,8 +21,8 @@ describe Sys::ProcTable do
   }
 
   before(:all) do
-    @pid1 = fork { exec('env', '-i', 'A=B', 'Z=', 'sleep', '60') }
-    @pid2 = fork { exec('ruby', '-Ilib', '-e', 'sleep \'120\'.to_i', '--', 'foo bar') }
+    @pid1 = Process.spawn({'A' => 'B', 'Z' => nil}, "sleep 60")
+    @pid2 = Process.spawn("ruby", "-Ilib", "-e", "sleep \'120\'.to_i", "--", "foo bar")
     sleep 1 # wait to make sure env is replaced by sleep
   end
 
@@ -38,7 +38,7 @@ describe Sys::ProcTable do
 
     it "returns the expected results for the fields method" do
       expect(described_class.fields).to be_kind_of(Array)
-      expect(described_class.fields).to eql(fields)
+      expect(described_class.fields).to eq(fields)
     end
   end
 
@@ -48,72 +48,72 @@ describe Sys::ProcTable do
     it "contains a pid member and returns the expected value" do
       expect(subject).to respond_to(:pid)
       expect(subject.pid).to be_kind_of(Numeric)
-      expect(subject.pid).to eql(@pid1)
+      expect(subject.pid).to eq(@pid1)
     end
 
     it "contains a ppid member and returns the expected value" do
       expect(subject).to respond_to(:ppid)
       expect(subject.ppid).to be_kind_of(Numeric)
-      expect(subject.ppid).to eql(Process.pid)
+      expect(subject.ppid).to eq(Process.pid)
     end
 
     it "contains a pgid member and returns the expected value" do
       expect(subject).to respond_to(:pgid)
       expect(subject.pgid).to be_kind_of(Numeric)
-      expect(subject.pgid).to eql(Process.getpgrp)
+      expect(subject.pgid).to eq(Process.getpgrp)
     end
 
     it "contains a ruid member and returns the expected value" do
       expect(subject).to respond_to(:ruid)
       expect(subject.ruid).to be_kind_of(Numeric)
-      expect(subject.ruid).to eql(Process.uid)
+      expect(subject.ruid).to eq(Process.uid)
     end
 
     it "contains an rgid member and returns the expected value" do
       expect(subject).to respond_to(:rgid)
       expect(subject.rgid).to be_kind_of(Numeric)
-      expect(subject.rgid).to eql(Process.gid)
+      expect(subject.rgid).to eq(Process.gid)
     end
 
     it "contains an svuid member and returns the expected value" do
       expect(subject).to respond_to(:svuid)
       expect(subject.svuid).to be_kind_of(Numeric)
-      expect(subject.svuid).to eql(Process.uid)
+      expect(subject.svuid).to eq(Process.uid)
     end
 
     it "contains an svgid member and returns the expected value" do
       expect(subject).to respond_to(:svgid)
       expect(subject.svgid).to be_kind_of(Numeric)
-      expect(subject.svgid).to eql(Process.gid)
+      expect(subject.svgid).to eq(Process.gid)
     end
 
     it "contains a comm member and returns the expected value" do
       expect(subject).to respond_to(:comm)
       expect(subject.comm).to be_kind_of(String)
-      expect(subject.comm).to eql('sleep')
+      expect(subject.comm).to eq('sleep')
     end
 
     it "contains a cmdline member and returns the expected value" do
       expect(subject).to respond_to(:cmdline)
       expect(subject.cmdline).to be_kind_of(String)
-      expect(subject.cmdline).to eql('sleep 60')
+      expect(subject.cmdline).to eq('sleep 60')
     end
 
     it "returns a string with the expected arguments for the cmdline member" do
       ptable = Sys::ProcTable.ps(pid: @pid2)
-      expect(ptable.cmdline).to eql('ruby -Ilib -e sleep \'120\'.to_i -- foo bar')
+      expect(ptable.cmdline).to eq('ruby -Ilib -e sleep \'120\'.to_i -- foo bar')
     end
 
     it "contains an exe member and returns the expected value" do
       expect(subject).to respond_to(:exe)
       expect(subject.exe).to be_kind_of(String)
-      expect(subject.exe).to eql(`which sleep`.chomp)
+      expect(subject.exe).to eq(`which sleep`.chomp)
     end
 
     it "contains an environ member and returns the expected value" do
       expect(subject).to respond_to(:environ)
       expect(subject.environ).to be_kind_of(Hash)
-      expect(subject.environ['A']).to eql('B')
+      expect(subject.environ['A']).to eq('B')
       expect(subject.environ['Z']).to be_nil
     end
   end

data/spec/sys_proctable_linux_spec.rb

@@ -10,12 +10,12 @@ require_relative 'sys_proctable_all_spec'
 
 describe Sys::ProcTable do
   let(:fields){ %w[
-      cmdline cwd exe pid name uid euid gid egid comm state ppid pgrp
-      session tty_num tpgid flags minflt cminflt majflt cmajflt utime
-      stime cutime cstime priority nice itrealvalue starttime vsize
-      rss rlim startcode endcode startstack kstkesp kstkeip signal blocked
-      sigignore sigcatch wchan nswap cnswap exit_signal processor environ
-      pctcpu pctmem nlwp cgroup smaps
+      cmdline cwd environ exe fd root pid name uid euid gid egid comm state ppid pgrp
+      session tty_nr tpgid flags minflt cminflt majflt cmajflt utime
+      stime cutime cstime priority nice num_threads itrealvalue starttime vsize
+      rss rlim rsslim startcode endcode startstack kstkesp kstkeip signal blocked
+      sigignore sigcatch wchan nswap cnswap exit_signal processor rt_priority
+      policy delayacct_blkio_ticks guest_time cguest_time pctcpu pctmem nlwp cgroup smaps
     ]
   }
 
@@ -147,6 +147,11 @@ describe Sys::ProcTable do
       expect(subject.nice).to be_kind_of(Numeric)
     end
 
+    it "contains a num_threads member and returns the expected value" do
+      expect(subject).to respond_to(:num_threads)
+      expect(subject.num_threads).to be_kind_of(Numeric)
+    end
+
     it "contains a itrealvalue member and returns the expected value" do
       expect(subject).to respond_to(:itrealvalue)
       expect(subject.itrealvalue).to be_kind_of(Numeric)
@@ -167,9 +172,10 @@ describe Sys::ProcTable do
       expect(subject.rss).to be_kind_of(Numeric)
     end
 
-    it "contains an rlim member and returns the expected value" do
-      expect(subject).to respond_to(:rlim)
-      expect(subject.rlim).to be_kind_of(Numeric)
+    it "contains an rsslim member and returns the expected value" do
+      expect(subject).to respond_to(:rsslim)
+      expect(subject.rsslim).to be_kind_of(Numeric)
+      expect(subject.rsslim).to eq(subject.rlim)
     end
 
     it "contains an startcode member and returns the expected value" do
@@ -252,6 +258,21 @@ describe Sys::ProcTable do
       expect(subject.policy).to be_kind_of(Integer)
     end
 
+    it "contains a delayacct_blkio_ticks member and returns the expected value" do
+      expect(subject).to respond_to(:delayacct_blkio_ticks)
+      expect(subject.delayacct_blkio_ticks).to be_kind_of(Integer)
+    end
+
+    it "contains a guest_time member and returns the expected value" do
+      expect(subject).to respond_to(:guest_time)
+      expect(subject.guest_time).to be_kind_of(Integer)
+    end
+
+    it "contains a cguest_time member and returns the expected value" do
+      expect(subject).to respond_to(:cguest_time)
+      expect(subject.cguest_time).to be_kind_of(Integer)
+    end
+
     it "contains a name member and returns the expected value" do
       expect(subject).to respond_to(:name)
       expect(subject.name).to be_kind_of(String)
@@ -307,4 +328,12 @@ describe Sys::ProcTable do
       expect(subject.smaps).to be_kind_of(Sys::ProcTable::Smaps)
     end
   end
+
+  context "fields" do
+    it "has a fields method that returns the expected results" do
+      expect(described_class).to respond_to(:fields)
+      expect(described_class.fields).to be_kind_of(Array)
+      expect(described_class.fields).to match_array(fields)
+    end
+  end
 end

data/sys-proctable.gemspec

@@ -2,9 +2,9 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '1.2.1'
+  spec.version    = '1.2.6'
   spec.author     = 'Daniel J. Berger'
-  spec.license    = 'Apache 2.0'
+  spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'http://github.com/djberg96/sys-proctable'
   spec.summary    = 'An interface for providing process table information'
@@ -15,14 +15,15 @@ Gem::Specification.new do |spec|
     "benchmarks/**/*.rb",
     "examples/**/*.rb",
     "lib/**/*.rb",
-    'CHANGES',
-    'MANIFEST',
+    'CHANGES.rdoc',
+    'LICENSE',
+    'MANIFEST.rdoc',
     'Rakefile',
     'README.md',
     'sys-proctable.gemspec'
   ]
 
-  spec.extra_rdoc_files  = ['CHANGES', 'README.md', 'MANIFEST', 'doc/top.txt']
+  spec.extra_rdoc_files = ['CHANGES.rdoc', 'README.md', 'MANIFEST.rdoc']
 
   spec.add_dependency('ffi')
   spec.add_development_dependency('rspec')
@@ -31,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.metadata = {
     'homepage_uri'      => 'https://github.com/djberg96/sys-proctable',
     'bug_tracker_uri'   => 'https://github.com/djberg96/sys-proctable/issues',
-    'changelog_uri'     => 'https://github.com/djberg96/sys-proctable/blob/master/CHANGES',
+    'changelog_uri'     => 'https://github.com/djberg96/sys-proctable/blob/master/CHANGES.rdoc',
     'documentation_uri' => 'https://github.com/djberg96/sys-proctable/wiki',
     'source_code_uri'   => 'https://github.com/djberg96/sys-proctable',
     'wiki_uri'          => 'https://github.com/djberg96/sys-proctable/wiki'

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.6
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2018-06-08 00:00:00.000000000 Z
+date:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -89,11 +89,11 @@ email: djberg96@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- CHANGES
+- CHANGES.rdoc
 - README.md
-- MANIFEST
-- doc/top.txt
+- MANIFEST.rdoc
 files:
+- benchmarks/bench_ips_ps.rb
 - benchmarks/bench_ps.rb
 - examples/example_ps.rb
 - lib/aix/sys/proctable.rb
@@ -109,22 +109,23 @@ files:
 - lib/sys/proctable/version.rb
 - lib/sys/top.rb
 - lib/windows/sys/proctable.rb
-- CHANGES
-- MANIFEST
+- CHANGES.rdoc
+- LICENSE
+- MANIFEST.rdoc
 - Rakefile
 - README.md
 - sys-proctable.gemspec
 homepage: http://github.com/djberg96/sys-proctable
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata:
   homepage_uri: https://github.com/djberg96/sys-proctable
   bug_tracker_uri: https://github.com/djberg96/sys-proctable/issues
-  changelog_uri: https://github.com/djberg96/sys-proctable/blob/master/CHANGES
+  changelog_uri: https://github.com/djberg96/sys-proctable/blob/master/CHANGES.rdoc
   documentation_uri: https://github.com/djberg96/sys-proctable/wiki
   source_code_uri: https://github.com/djberg96/sys-proctable
   wiki_uri: https://github.com/djberg96/sys-proctable/wiki
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An interface for providing process table information
 test_files:

data/MANIFEST

@@ -1,33 +0,0 @@
-* CHANGES
-* MANIFEST
-* Rakefile
-* README
-* sys-proctable.gemspec
-* doc/aix.txt
-* doc/bsd.txt
-* doc/hpux.txt
-* doc/linux.txt
-* doc/solaris.txt
-* doc/top.txt
-* doc/windows.txt
-* example/example_ps.rb
-* ext/hpux/extconf.rb
-* ext/hpux/sys/proctable.c
-* lib/sys-proctable.rb
-* lib/sys/top.rb
-* lib/sys/proctable/version.rb
-* lib/aix/sys/proctable.rb
-* lib/darwin/sys/proctable.rb
-* lib/freebsd/sys/proctable.rb
-* lib/linux/sys/proctable.rb
-* lib/sunos/sys/proctable.rb
-* lib/windows/sys/proctable.rb
-* test/test_sys_proctable_aix.rb
-* test/test_sys_proctable_all.rb
-* test/test_sys_proctable_darwin.rb
-* test/test_sys_proctable_freebsd.rb
-* test/test_sys_proctable_hpux.rb
-* test/test_sys_proctable_linux.rb
-* test/test_sys_proctable_sunos.rb
-* test/test_sys_proctable_windows.rb
-* test/test_sys_top.rb

data/doc/top.txt

@@ -1,47 +0,0 @@
-= Description
-   A simple 'top' interface for Ruby
-
-= Prerequisites
-   Requires the "sys/proctable" package (which should be installed along
-   with this package).
-
-= Synopsis
-   require "sys/top"
-
-   Sys::Top.top(5).each{ |ps|
-      p ps
-   }
-	
-= Constants
-VERSION
-   Returns the version number of this package as a String.
-	
-= Class Methods
-Sys::Top.top(number=10, field="pctcpu")
-   Returns an array of ProcTableStruct's.  The size of the array (i.e. the
-   number of processes) that it returns is based on +number+, and sorted by
-   +pctcpu+.  By default, the size and field values are 10 and "pctcpu",
-   respectively.
-
-= Notes
-   Not all fields are available on all platforms.  Please check your
-   platform specific documentation for which fields are available.
-	
-= Bugs
-   None that I'm aware of.  Please log bug reports on the project page at
-   http://www.rubyforge.org/projects/sysutils
-	
-= License
-   Artistic 2.0
-	
-= Copyright
-   (C) 2004-2009 Daniel J. Berger
-   All Rights Reserved.
-    
-= Warranty
-   This package is provided "as is" and without any express or
-   implied warranties, including, without limitation, the implied
-   warranties of merchantability and fitness for a particular purpose.
-
-= Author
-   Daniel J. Berger