sys-proctable 1.1.0-universal-darwin → 1.1.1-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 138368be13088153dc725009fa1921edf64a7a63
-  data.tar.gz: a046d5a49a5071add7cb27ca153692dacf5234ff
+  metadata.gz: 536255fca496dc375430fe9698a5f277fdd8db10
+  data.tar.gz: f108e5642d8312dae6fc598023c2a2703320278a
 SHA512:
-  metadata.gz: 0a75f3fc8d2190f04bf05e9ee0859a9c1e91321eb08980af50a5f990c93790f3482edb1c3218f6557e9667d565268d0a69352916898276738fbc2d45e8afaa1f
-  data.tar.gz: c758a8a578c3ec13230b88f2d5801516ce57fee59d6352df1f7fcd2b6419046ec946d8e9eeaf0d9e281c588a1927bf54d3d74929add706fa0450f67d116efc71
+  metadata.gz: 113ed8abaa560fd6abaa75b545eb9d068c8a510c388ea0eda1c97ba80a2571df9ae11653888920e42f93e775920df151bc65ea9f835a94ef0bb3dcc7bad2f925
+  data.tar.gz: 7d0eb460512b0c1f9cb8173de138069cea86382f0b4173845479c79855e8cbfc8239dbb907b1b8dad00b1511438dfda4f3a40613e782183ec5ee17a47140085b

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.1.1 - 30-Jun-2016
+* Added thread information for OS X.
+* Fixed VERSION constant for HP-UX.
+
 == 1.1.0 - 27-Jun-2016
 * License was changed to Apache 2.0.
 * The OS X version now requires OS X 10.7 or later.

data/lib/darwin/sys/proctable.rb

@@ -13,16 +13,16 @@ module Sys
 
     private
 
-    PROC_ALL_PIDS       = 1
     PROC_PIDTASKALLINFO = 2
-    PROC_PIDTASKINFO    = 4
+    PROC_PIDTHREADINFO  = 5
+    PROC_PIDLISTTHREADS = 6
 
     CTL_KERN       = 1
     KERN_PROCARGS  = 38
-    KERN_PROCARGS2 = 49
     MAXCOMLEN      = 16
     MAXPATHLEN     = 256
 
+    MAXTHREADNAMESIZE = 64
     PROC_PIDPATHINFO_MAXSIZE = MAXPATHLEN * 4
 
     class ProcBsdInfo < FFI::Struct
@@ -75,6 +75,22 @@ module Sys
       )
     end
 
+    class ProcThreadInfo < FFI::Struct
+      layout(
+        :pth_user_time, :uint64_t,
+        :pth_system_time, :uint64_t,
+        :pth_cpu_usage, :int32_t,
+        :pth_policy, :int32_t,
+        :pth_run_state, :int32_t,
+        :pth_flags, :int32_t,
+        :pth_sleep_time, :int32_t,
+        :pth_curpri, :int32_t,
+        :pth_priority, :int32_t,
+        :pth_maxpriority, :int32_t,
+        :pth_name, [:char, MAXTHREADNAMESIZE]
+      )
+    end
+
     class ProcTaskAllInfo < FFI::Struct
       layout(:pbsd, ProcBsdInfo, :ptinfo, ProcTaskInfo)
     end
@@ -95,7 +111,7 @@ module Sys
       virtual_size resident_size total_user total_system threads_user
       threads_system policy faults pageins cow_faults messages_sent
       messages_received syscalls_mach syscalls_unix csw threadnum numrunning
-      priority cmdline exe environ
+      priority cmdline exe environ threadinfo
     ]
 
     # Add a couple aliases to make it similar to Linux
@@ -104,6 +120,11 @@ module Sys
       alias rss resident_size
     end
 
+    ThreadInfoStruct = Struct.new("ThreadInfo", :user_time, :system_time,
+      :cpu_usage, :policy, :run_state, :flags, :sleep_time, :curpri,
+      :priority, :maxpriority, :name
+    )
+
     public
 
     # Returns an array of fields that each ProcTableStruct will contain. This
@@ -162,7 +183,10 @@ module Sys
         end
 
         struct = ProcTableStruct.new
-        get_cmd_args_and_env(lpid, struct) # Pass by reference
+
+        # Pass by reference
+        get_cmd_args_and_env(lpid, struct)
+        get_thread_info(lpid, struct, info[:ptinfo])
 
         # Chop the leading xx_ from the FFI struct members for our ruby struct.
         info.members.each do |nested|
@@ -192,6 +216,53 @@ module Sys
 
     private
 
+    # Returns an array of ThreadInfo objects for the given pid.
+    #
+    def self.get_thread_info(pid, struct, ptinfo)
+      buf = FFI::MemoryPointer.new(:uint64_t, ptinfo[:pti_threadnum])
+      num = proc_pidinfo(pid, PROC_PIDLISTTHREADS, 0, buf, buf.size)
+
+      if num <= 0
+        if [Errno::EPERM::Errno, Errno::ESRCH::Errno].include?(FFI.errno)
+          return # Either we don't have permission, or the pid no longer exists
+        else
+          raise SystemCallError.new('proc_pidinfo', FFI.errno)
+        end
+      end
+
+      max = ptinfo[:pti_threadnum]
+      struct[:threadinfo] = []
+
+      0.upto(max-1) do |index|
+        tinfo = ProcThreadInfo.new
+        nb = proc_pidinfo(pid, PROC_PIDTHREADINFO, buf[index].read_uint64, tinfo, tinfo.size)
+
+        if nb <= 0
+          if [Errno::EPERM::Errno, Errno::ESRCH::Errno].include?(FFI.errno)
+            return # Either we don't have permission, or the pid no longer exists
+          else
+            raise SystemCallError.new('proc_pidinfo', FFI.errno)
+          end
+        end
+
+        tinfo_struct = ThreadInfoStruct.new(
+          tinfo[:pth_user_time],
+          tinfo[:pth_system_time],
+          tinfo[:pth_cpu_usage],
+          tinfo[:pth_policy],
+          tinfo[:pth_run_state], 
+          tinfo[:pth_flags], 
+          tinfo[:pth_sleep_time], 
+          tinfo[:pth_curpri],
+          tinfo[:pth_priority],
+          tinfo[:pth_maxpriority],
+          tinfo[:pth_name].to_s,
+        )
+
+        struct[:threadinfo] << tinfo_struct
+      end
+    end
+
     # Get the command line arguments, as well as the environment settings,
     # for the given PID.
     #
@@ -211,7 +282,7 @@ module Sys
       exe = buf.read_string # Read up to first null, does not include args
       struct[:exe] = exe
 
-      # Parse the rest of the information out of big, ugly sring
+      # Parse the rest of the information out of a big, ugly string
       array = buf.read_bytes(len.read_ulong).split(0.chr)
       array.shift      # Delete first exe
       array.delete('') # Delete empty strings
@@ -225,8 +296,8 @@ module Sys
 
       struct[:cmdline] = File.basename(cmdline.strip)
 
-      # Anything remaining at this point is a collect of key=value pairs which
-      # we convert into a hash.
+      # Anything remaining at this point is a collection of key=value
+      # pairs which we convert into a hash.
       environ = array.inject({}) do |hash, string|
         if string && string.include?('=')
           key, value = string.split('=')

data/lib/sys/proctable/version.rb

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

data/sys-proctable.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '1.1.0'
+  spec.version    = '1.1.1'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache 2.0'
   spec.email      = 'djberg96@gmail.com'

data/test/test_sys_proctable_all.rb

@@ -19,7 +19,7 @@ class TC_ProcTable_All < Test::Unit::TestCase
   end
 
   test "version is set to expected value" do
-    assert_equal('1.1.0', ProcTable::VERSION)
+    assert_equal('1.1.1', ProcTable::VERSION)
   end
 
   test "fields basic functionality" do

data/test/test_sys_proctable_darwin.rb

@@ -16,7 +16,7 @@ class TC_ProcTable_Darwin < Test::Unit::TestCase
       virtual_size resident_size total_user total_system threads_user
       threads_system policy faults pageins cow_faults messages_sent
       messages_received syscalls_mach syscalls_unix csw threadnum numrunning
-      priority cmdline exe environ
+      priority cmdline exe environ threadinfo
     ]
 
     @@pid = fork do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: universal-darwin
 authors:
 - Daniel J. Berger
@@ -30,7 +30,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit