get_process_mem 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb77afa418ea02d1e7d7416d88fc9706de5c581c84aa22d3199c405e406404e
-  data.tar.gz: 1ee05474ce71701a823828452ee0d657422f790aafc8a0cdd7b2259843af4f0f
+  metadata.gz: 06a96e8d978fd95bcf546a1e5e8bbc01cc10635d50b2f87639eb9c1f8c7f4f76
+  data.tar.gz: 6c941ae4f0301ff698b9be4ba75597537ed3ae5a11bf9295ab81144ef8435047
 SHA512:
-  metadata.gz: d70576115a29294f6e0bf456f5992b9f1aa208d1c0855ccf15492c93824ac602c8911bca6b819723d4f2a1faeb25828afe453ff5c1f3bb3715e632eae7b339e7
-  data.tar.gz: cd0c1482f61ef34933cbe87afcbf281debd359b6f37e476dc765196b791c61fa768aab5f9a5f0eb98df0026ac174d3036633bce4135e5e7c650ff40f23d259a3
+  metadata.gz: 3cdb2baad08676298249f006b12f0c61bd0fdc1e13902211e2e0c3ea965c39fee2edb2ad3d2ceb617dcf450738e765c60c7e748830d85c52b044fa0ad8a3c8db
+  data.tar.gz: 35d717cc39f85a902adaa8ea6028d969b40b89465bcc0d1578de4e97308fe890e77ce9ff06b68855253030b3ab26fa130e2e44be06b041368a39a4cb4bc300f8

data/.travis.yml

@@ -15,6 +15,8 @@ rvm:
 
 matrix:
   allow_failures:
+    - rvm: 2.2
+      if: os = osx
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: truffleruby

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## Master - unreleased
+## HEAD (unreleased)
+
+## 0.2.7
+
+- Native (faster) support for returning memory from different PIDs on mac (https://github.com/schneems/get_process_mem/pull/42)
 
 ## 0.2.6
 

data/lib/get_process_mem.rb

@@ -58,7 +58,7 @@ class GetProcessMem
 
   def bytes
     memory =   linux_status_memory if linux?
-    memory ||= darwin_memory if RUNS_ON_DARWIN && Process.pid == pid
+    memory ||= darwin_memory if RUNS_ON_DARWIN
     memory ||= ps_memory
   end
 
@@ -119,6 +119,8 @@ class GetProcessMem
   end
 
   def darwin_memory
-    Darwin.resident_size
+    Darwin.resident_size(pid)
+  rescue Errno::EPERM
+    nil
   end
 end

data/lib/get_process_mem/darwin.rb

@@ -3,49 +3,59 @@ require 'ffi'
 class GetProcessMem
   class Darwin
     extend FFI::Library
-    ffi_lib 'c'
-    attach_function :mach_task_self, [], :__darwin_mach_port_t
-    attach_function :task_info,
-                    [
-                      :__darwin_mach_port_t,
-                      :int,     # return selector
-                      :pointer, #pointer to task info
-                      :pointer, #pointer to int (size of structure / bytes filled out)
-                    ],
-                    :int
+    ffi_lib 'proc'
 
-    class IntPtr < FFI::Struct
-      layout :value, :int
-    end
 
     class TaskInfo < FFI::Struct
-      layout  :suspend_count, :int32,
-              :virtual_size, :uint64,
-              :resident_size, :uint64,
-              :user_time, :uint64,
-              :system_time, :uint64,
-              :policy, :int32
+      layout :pti_virtual_size, :uint64,
+             :pti_resident_size, :uint64,
+             :pti_total_user, :uint64,
+             :pti_total_system, :uint64,
+             :pti_threads_user, :uint64,
+             :pti_threads_system, :uint64,
+             :pti_policy, :int32,
+             :pti_faults, :int32,
+             :pti_pageins, :int32,
+             :pti_cow_faults, :int32,
+             :pti_messages_sent, :int32,
+             :pti_messages_received, :int32,
+             :pti_syscalls_mach, :int32,
+             :pti_syscalls_unix, :int32,
+             :pti_csw, :int32,
+             :pti_threadnum, :int32,
+             :pti_numrunning, :int32,
+             :pti_priority, :int32
+
     end
 
-    MACH_TASK_BASIC_INFO = 20
-    MACH_TASK_BASIC_INFO_COUNT = TaskInfo.size / FFI.type_size(:uint)
+
+    attach_function :proc_pidinfo,
+                    [
+                      :int, #pid
+                      :int, # flavour
+                      :uint64, #arg, not needed for this selector
+                      TaskInfo.by_ref, #output buffer
+                      :int, #size of buffer
+                    ],
+                    :int
+
+
+    PROC_PIDTASKINFO = 4 #from sys/proc_info.h
 
     class << self
-      def resident_size
-        mach_task_info[:resident_size]
+      def resident_size(pid)
+        get_proc_pidinfo(pid)[:pti_resident_size]
       end
 
       private
 
-      def mach_task_info
+      def get_proc_pidinfo(pid)
         data = TaskInfo.new
-        out_count = IntPtr.new
-        out_count[:value] = MACH_TASK_BASIC_INFO_COUNT
-        result = task_info(mach_task_self, MACH_TASK_BASIC_INFO, data, out_count)
-        if result == 0
+        result = proc_pidinfo(pid, PROC_PIDTASKINFO, 0, data, TaskInfo.size)
+        if result == TaskInfo.size
           data
         else
-          raise "task_info returned #{result}"
+          raise SystemCallError.new("proc_pidinfo returned #{result}", FFI.errno);
         end
       end
     end

data/lib/get_process_mem/version.rb

@@ -1,3 +1,3 @@
 class GetProcessMem
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: get_process_mem
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi