diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-29 04:07:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-29 04:07:10 +0000 |
| commit | 1673881f58371f441d23987c676e36322f566ade (patch) | |
| tree | ac4fbb1e567161aa25d30729f3cc74a117410b14 | |
| parent | fc493491fe4ca9c17ab5e7b9af5efbf9bfc8f7ae (diff) | |
/proc/self/status format check
* test/ruby/memory_status.rb: use /proc/self/status if it is in
the expected format.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/memory_status.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Feb 29 13:06:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/ruby/memory_status.rb: use /proc/self/status if it is in + the expected format. + Wed Feb 29 06:14:51 2012 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_core.c: reverted r34825. diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb index 3694e619ef..2817e16c56 100644 --- a/test/ruby/memory_status.rb +++ b/test/ruby/memory_status.rb @@ -3,9 +3,9 @@ module Memory vals = [] case - when File.exist?(procfile = "/proc/self/status") + when File.exist?(procfile = "/proc/self/status") and (pat = /^Vm(\w+):\s+(\d+)/) =~ File.binread(procfile) PROC_FILE = procfile - VM_PAT = /^Vm(\w+):\s+(\d+)/ + VM_PAT = pat def self.read_status IO.foreach(PROC_FILE, encoding: Encoding::ASCII_8BIT) do |l| yield($1.downcase.intern, $2.to_i * 1024) if VM_PAT =~ l |