Merge "limit mediaextractor memory" into nyc-dev (559b01b2) · Commits · e / os / android_frameworks_av

media/libmedia/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ LOCAL_SRC_FILES:= \
		IResourceManagerService.cpp \
		IStreamSource.cpp \
		MediaCodecInfo.cpp \
		MediaUtils.cpp \
		Metadata.cpp \
		mediarecorder.cpp \
		IMediaMetadataRetriever.cpp \

media/libmedia/MediaUtils.cpp

0 → 100644

+74 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "MediaUtils"
		#define LOG_NDEBUG 0
		#include <utils/Log.h>

		#include <cutils/properties.h>
		#include <sys/resource.h>
		#include <unistd.h>

		#include "MediaUtils.h"

		namespace android {

		void limitProcessMemory(
		const char *property,
		size_t numberOfBytes,
		size_t percentageOfTotalMem) {

		long pageSize = sysconf(_SC_PAGESIZE);
		long numPages = sysconf(_SC_PHYS_PAGES);
		size_t maxMem = SIZE_MAX;

		if (pageSize > 0 && numPages > 0) {
		if (size_t(numPages) < SIZE_MAX / size_t(pageSize)) {
		maxMem = size_t(numPages) * size_t(pageSize);
		}
		ALOGV("physMem: %zu", maxMem);
		if (percentageOfTotalMem > 100) {
		ALOGW("requested %zu%% of total memory, using 100%%", percentageOfTotalMem);
		percentageOfTotalMem = 100;
		}
		maxMem = maxMem / 100 * percentageOfTotalMem;
		if (numberOfBytes < maxMem) {
		maxMem = numberOfBytes;
		}
		ALOGV("requested limit: %zu", maxMem);
		} else {
		ALOGW("couldn't determine total RAM");
		}

		int64_t propVal = property_get_int64(property, maxMem);
		if (propVal > 0 && uint64_t(propVal) <= SIZE_MAX) {
		maxMem = propVal;
		}
		ALOGV("actual limit: %zu", maxMem);

		struct rlimit limit;
		getrlimit(RLIMIT_AS, &limit);
		ALOGV("original limits: %lld/%lld", (long long)limit.rlim_cur, (long long)limit.rlim_max);
		limit.rlim_cur = maxMem;
		setrlimit(RLIMIT_AS, &limit);
		limit.rlim_cur = -1;
		limit.rlim_max = -1;
		getrlimit(RLIMIT_AS, &limit);
		ALOGV("new limits: %lld/%lld", (long long)limit.rlim_cur, (long long)limit.rlim_max);

		}

		} // namespace android

media/libmedia/MediaUtils.h

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef _MEDIA_UTILS_H
		#define _MEDIA_UTILS_H

		namespace android {

		/**
		Limit the amount of memory a process can allocate using setrlimit(RLIMIT_AS).
		The value to use will be read from the specified system property, or if the
		property doesn't exist it will use the specified number of bytes or the
		specified percentage of total memory, whichever is smaller.
		*/
		void limitProcessMemory(
		const char *property,
		size_t numberOfBytes,
		size_t percentageOfTotalMem);

		} // namespace android

		#endif // _MEDIA_UTILS_H

services/mediaextractor/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ LOCAL_STATIC_LIBRARIES := libicuandroid_utils
		LOCAL_MODULE:= mediaextractor
		LOCAL_32_BIT_ONLY := true
		LOCAL_INIT_RC := mediaextractor.rc
		LOCAL_C_INCLUDES := frameworks/av/media/libmedia
		include $(BUILD_EXECUTABLE)

		include $(call all-makefiles-under, $(LOCAL_PATH))

services/mediaextractor/main_extractorservice.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -29,12 +29,18 @@
		// from LOCAL_C_INCLUDES
		#include "IcuUtils.h"
		#include "MediaExtractorService.h"
		#include "MediaUtils.h"
		#include "minijail/minijail.h"

		using namespace android;

		int main(int argc __unused, char** argv)
		{
		limitProcessMemory(
		"ro.media.maxmem", /* property that defines limit */
		SIZE_MAX, /* upper limit in bytes */
		10 /* upper limit as percentage of physical RAM */);

		signal(SIGPIPE, SIG_IGN);
		MiniJail();