commit 12e975bffb4915d2829114874793b1f936dde0b1
author Marco Nelissen <marcone@google.com> Fri May 13 10:39:23 2016 -0700
committer Marco Nelissen <marcone@google.com> Tue May 17 08:00:27 2016 -0700
tree 9c4263196423a96427667009f8c1c61b1a3abecc
parent ef1fcffc9808df37f4031ddbf247492c8609559a

limit mediaserver memory

Limit mediaserver using rlimit, to prevent it from bringing down the system
via the low memory killer.
Default max is 65% of total RAM, but can be customized via system property.

Bug: 28471206
Bug: 28615448
Change-Id: Ic84137435d1ef0a6883e9789a4b4f399e4283f05

media/mediaserver/main_mediaserver.cpp

diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index af1c9e6..a289fc7 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -33,6 +33,7 @@
 #include "CameraService.h"
 #include "MediaLogService.h"
 #include "MediaPlayerService.h"
+#include "MediaUtils.h"
 #include "AudioPolicyService.h"
 #include "SoundTriggerHwService.h"
 
@@ -40,6 +41,11 @@
 
 int main(int argc __unused, char** argv)
 {
+    limitProcessMemory(
+        "ro.media.maxmem", /* property that defines limit */
+        SIZE_MAX, /* upper limit in bytes */
+        65 /* upper limit as percentage of physical RAM */);
+
     signal(SIGPIPE, SIG_IGN);
     char value[PROPERTY_VALUE_MAX];
     bool doLog = (property_get("ro.test_harness", value, "0") > 0) && (atoi(value) == 1);