<div dir="ltr">Cool, thanks! </div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 18, 2014 at 8:24 AM, Jay Foad <span dir="ltr"><<a href="mailto:jay.foad@gmail.com" target="_blank">jay.foad@gmail.com</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: foad<br>
Date: Thu Dec 18 10:24:01 2014<br>
New Revision: 224522<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=224522&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=224522&view=rev</a><br>
Log:<br>
[Sanitizer] Fix GetRSS on Linux with non-4k pages<br>
<br>
Summary:<br>
The numbers in /proc/self/statm are in pages, not in fixed 4k units.<br>
This fixes Linux/hard_rss_limit_mb_test.cc on my PowerPC64 box which<br>
has 64k pages.<br>
<br>
Reviewers: kcc, willschm<br>
<br>
Reviewed By: willschm<br>
<br>
Subscribers: llvm-commits<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D6717" target="_blank">http://reviews.llvm.org/D6717</a><br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=224522&r1=224521&r2=224522&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=224522&r1=224521&r2=224522&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Thu Dec 18 10:24:01 2014<br>
@@ -432,7 +432,7 @@ uptr GetRSS() {<br>
   buf[len] = 0;<br>
   // The format of the file is:<br>
   // 1084 89 69 11 0 79 0<br>
-  // We need the second number which is RSS in 4K units.<br>
+  // We need the second number which is RSS in pages.<br>
   char *pos = buf;<br>
   // Skip the first number.<br>
   while (*pos >= '0' && *pos <= '9')<br>
@@ -444,7 +444,7 @@ uptr GetRSS() {<br>
   uptr rss = 0;<br>
   while (*pos >= '0' && *pos <= '9')<br>
     rss = rss * 10 + *pos++ - '0';<br>
-  return rss * 4096;<br>
+  return rss * GetPageSizeCached();<br>
 }<br>
<br>
 static void GetArgsAndEnv(char*** argv, char*** envp) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div>