Merge "adbd: configure jemalloc to not immediately purge." (6d200f09) · Commits · e / os / android_system_core

adb/daemon/main.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -19,10 +19,11 @@
		#include "sysdeps.h"

		#include <errno.h>
		#include <getopt.h>
		#include <malloc.h>
		#include <signal.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <getopt.h>
		#include <sys/prctl.h>

		#include <memory>
		@@ -213,6 +214,9 @@ int adbd_main(int server_port) {
		}

		int main(int argc, char** argv) {
		// Set M_DECAY_TIME so that our allocations aren't immediately purged on free.
		mallopt(M_DECAY_TIME, 1);

		while (true) {
		static struct option opts[] = {
		{"root_seclabel", required_argument, nullptr, 's'},

+4 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <malloc.h>
		#include <stdio.h>

		#include <android-base/logging.h>
		@@ -171,6 +172,9 @@ ADB_CONNECTION_BENCHMARK(BM_Connection_Echo, ThreadPolicy::SameThread);
		ADB_CONNECTION_BENCHMARK(BM_Connection_Echo, ThreadPolicy::MainThread);

		int main(int argc, char** argv) {
		// Set M_DECAY_TIME so that our allocations aren't immediately purged on free.
		mallopt(M_DECAY_TIME, 1);

		android::base::SetMinimumLogSeverity(android::base::WARNING);
		adb_trace_init(argv);
		::benchmark::Initialize(&argc, argv);