ghazel-rack-bug 0.3.0.1 → 0.3.0.2

data/lib/rack/bug/panels/memory_panel.rb

@@ -1,15 +1,44 @@
-#
+begin
+  require 'win32ole'
+rescue LoadError
+end
+
 module Rack
   class Bug
 
     class MemoryPanel < Panel
 
+      def get_memory_usage
+        if defined? WIN32OLE
+          wmi = WIN32OLE.connect("winmgmts:root/cimv2")
+          mem = 0
+          query = "select * from Win32_Process where ProcessID = #{$$}"
+          wmi.ExecQuery(query).each do |wproc|
+            mem = wproc.WorkingSetSize
+          end
+          mem.to_i / 1000
+        elsif pages = File.read("/proc/self/statm") rescue nil
+          pages.to_i * statm_page_size
+        elsif proc_file = File.new("/proc/#{$$}/smaps") rescue nil
+          proc_file.map do |line|
+            size = line[/Size: *(\d+)/, 1] and size.to_i
+          end.compact.sum
+        else
+          `ps -o vsz= -p #{$$}`.to_i
+        end
+      end
+
+      # try to get and cache memory page size. falls back to 4096.
+      def statm_page_size
+        @statm_page_size ||= (`getconf PAGESIZE`.strip.to_i rescue 4096) / 1024
+      end
+
       def before(env)
-        @original_memory = `ps -o rss= -p #{$$}`.to_i
+        @original_memory = get_memory_usage
       end
 
       def after(env, status, headers, body)
-        @total_memory = `ps -o rss= -p #{$$}`.to_i
+        @total_memory = get_memory_usage
         @memory_increase = @total_memory - @original_memory
       end
 

data/rack-bug.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ghazel-rack-bug}
-  s.version = "0.3.0.1"
+  s.version = "0.3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-rack-bug
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.1
+  version: 0.3.0.2
 platform: ruby
 authors: 
 - Bryan Helmkamp