Merge "Avoid unnecessary smaps logic during app compaction" into sc-dev (b28ad521) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_am_CachedAppOptimizer.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ static int getAnyPageAdvice(const Vma& vma) {
		static int compactProcess(int pid, VmaToAdviseFunc vmaToAdviseFunc) {
		ProcMemInfo meminfo(pid);
		std::vector<Vma> pageoutVmas, coldVmas;
		auto vmaCollectorCb = [&](Vma vma) {
		auto vmaCollectorCb = [&coldVmas,&pageoutVmas,&vmaToAdviseFunc](const Vma& vma) {
		int advice = vmaToAdviseFunc(vma);
		switch (advice) {
		case MADV_COLD:
		@@ -146,7 +146,7 @@ static int compactProcess(int pid, VmaToAdviseFunc vmaToAdviseFunc) {
		break;
		}
		};
		meminfo.ForEachVma(vmaCollectorCb);
		meminfo.ForEachVmaFromMaps(vmaCollectorCb);

		int err = compactMemory(pageoutVmas, pid, MADV_PAGEOUT);
		if (!err) {