commit 4151db5f997cd91d3505ac6594bede0b50184855
author Elliott Hughes <enh@google.com> Wed Oct 28 17:14:48 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Oct 28 20:04:59 2015 -0700
tree 16c30988b1a1090c7221c3f14aac88d296596fc3
parent 50e92795890c0d8b4bf54c535f66f3b2edf7bd59

Add prlimit to LP32.

Bug: http://b/24918750
Change-Id: I0151cd66ccf79a6169610de35bb9c288c0fa4917

libc/bionic/legacy_32_bit_support.cpp

diff --git a/libc/bionic/legacy_32_bit_support.cpp b/libc/bionic/legacy_32_bit_support.cpp
index 20d258d..f2bb37d 100644
--- a/libc/bionic/legacy_32_bit_support.cpp
+++ b/libc/bionic/legacy_32_bit_support.cpp
@@ -111,3 +111,22 @@
 int setrlimit64(int resource, const rlimit64* limits64) {
   return prlimit64(0, resource, limits64, NULL);
 }
+
+// There is no prlimit system call, so we need to use prlimit64.
+int prlimit(pid_t pid, int resource, const rlimit* n32, rlimit* o32) {
+  rlimit64 n64;
+  if (n32 != nullptr) {
+    n64.rlim_cur = (n32->rlim_cur == RLIM_INFINITY) ? RLIM64_INFINITY : n32->rlim_cur;
+    n64.rlim_max = (n32->rlim_max == RLIM_INFINITY) ? RLIM64_INFINITY : n32->rlim_max;
+  }
+
+  rlimit64 o64;
+  int result = prlimit64(pid, resource,
+                         (n32 != nullptr) ? &n64 : nullptr,
+                         (o32 != nullptr) ? &o64 : nullptr);
+  if (result != -1 && o32 != nullptr) {
+    o32->rlim_cur = (o64.rlim_cur == RLIM64_INFINITY) ? RLIM_INFINITY : o64.rlim_cur;
+    o32->rlim_max = (o64.rlim_max == RLIM64_INFINITY) ? RLIM_INFINITY : o64.rlim_max;
+  }
+  return result;
+}

libc/include/sys/resource.h

diff --git a/libc/include/sys/resource.h b/libc/include/sys/resource.h
index 3f8dd45..8209dfb 100644
--- a/libc/include/sys/resource.h
+++ b/libc/include/sys/resource.h
@@ -53,10 +53,7 @@
 
 extern int getrusage(int, struct rusage*);
 
-#if __LP64__
-/* Implementing prlimit for 32-bit isn't worth the effort. */
 extern int prlimit(pid_t, int, const struct rlimit*, struct rlimit*);
-#endif
 extern int prlimit64(pid_t, int, const struct rlimit64*, struct rlimit64*);
 
 __END_DECLS

libc/libc.arm.map

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index fce04ee..bc68fc0 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -1314,6 +1314,7 @@
     getgrnam_r;
     preadv;
     preadv64;
+    prlimit; # arm mips x86
     pwritev;
     pwritev64;
     scandirat;

libc/libc.map.txt

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index b0f7030..418d4cf 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -1341,6 +1341,7 @@
     getgrnam_r;
     preadv;
     preadv64;
+    prlimit; # arm mips x86
     pwritev;
     pwritev64;
     scandirat;

libc/libc.mips.map

diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index e71d5ec..0c69c19 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -1277,6 +1277,7 @@
     getgrnam_r;
     preadv;
     preadv64;
+    prlimit; # arm mips x86
     pwritev;
     pwritev64;
     scandirat;

libc/libc.x86.map

diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 6f60524..544ee13 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -1275,6 +1275,7 @@
     getgrnam_r;
     preadv;
     preadv64;
+    prlimit; # arm mips x86
     pwritev;
     pwritev64;
     scandirat;