oink 0.1.1 → 0.1.2

data/lib/oink/base.rb

@@ -2,7 +2,7 @@ module Oink
 
   class Base
 
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
     FORMATS = %w[verbose short-summary summary]
     FORMAT_ALIASES = { "v" => "verbose", "ss" => "short-summary", "s" => "summary" }
     HODEL_LOG_FORMAT_REGEX = /^(\w+ \d{2} \d{2}:\d{2}:\d{2})/

data/lib/oink/rails/memory_usage_logger.rb

@@ -21,6 +21,8 @@ module Oink
             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
@@ -30,6 +32,11 @@ module Oink
         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 log_memory_usage
         if logger
           memory_usage = get_memory_usage

data/spec/rails/memory_usage_logger_spec.rb

@@ -43,7 +43,18 @@ end
 describe Oink::MemoryUsageLogger do
   unless defined? WIN32OLE
     describe "get_memory_usage" do
-      it "should work on linux" do
+      it "should work on linux with statm" do
+        pages = 6271
+        statm_file = "#{pages} 1157 411 1 0 763 0\n"
+
+        File.should_receive(:read).with("/proc/self/statm").and_return(statm_file)
+        controller = ApplicationController.new
+        controller.should_receive(:`).with('getconf PAGESIZE').and_return("4096\n")
+        controller.index
+        controller.logger.log.should == [[:info, "Memory usage: #{pages * 4} | PID: #{$$}"]]
+      end
+
+      it "should work on linux with smaps" do
         proc_file = <<-STR
             Header
 
@@ -56,6 +67,7 @@ describe Oink::MemoryUsageLogger do
 
             STR
 
+        File.stub!(:read).and_raise(Errno::ENOENT.new("No such file or directory"))
         File.should_receive(:new).with("/proc/#{$$}/smaps").and_return(proc_file)
         controller = ApplicationController.new
         controller.index
@@ -63,6 +75,7 @@ describe Oink::MemoryUsageLogger do
       end
 
       it "should work on non-linux" do
+        File.stub!(:read).and_raise(Errno::ENOENT.new("No such file or directory"))
         File.stub!(:new).and_raise(Errno::ENOENT.new("No such file or directory"))
         controller = ApplicationController.new
         controller.index

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oink
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Noah Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -04:00
+date: 2010-10-08 00:00:00 -04:00
 default_executable: oink
 dependencies: 
 - !ruby/object:Gem::Dependency