From 7623e22f577950827f62eda11edc512bbe06c01b Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Mon, 31 Aug 2015 12:05:21 -0700 Subject: adb: remove workaround for b/6558362. I believe the problem has been fixed in https://android-review.googlesource.com/#/c/168412/. So it's time to remove the workaround. Bug: 6558362 Change-Id: I399c18eda0693f3c51feac07ff59a0a4b5558128 --- client/main.cpp | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'client/main.cpp') diff --git a/client/main.cpp b/client/main.cpp index f6ddeb4..8d644d9 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -36,42 +36,6 @@ #include "adb_listeners.h" #include "transport.h" -#if defined(WORKAROUND_BUG6558362) && defined(__linux__) -static const bool kWorkaroundBug6558362 = true; -#else -static const bool kWorkaroundBug6558362 = false; -#endif - -static void adb_workaround_affinity(void) { -#if defined(__linux__) - const char affinity_env[] = "ADB_CPU_AFFINITY_BUG6558362"; - const char* cpunum_str = getenv(affinity_env); - if (cpunum_str == nullptr || *cpunum_str == '\0') { - return; - } - - char* strtol_res; - int cpu_num = strtol(cpunum_str, &strtol_res, 0); - if (*strtol_res != '\0') { - fatal("bad number (%s) in env var %s. Expecting 0..n.\n", cpunum_str, - affinity_env); - } - - cpu_set_t cpu_set; - sched_getaffinity(0, sizeof(cpu_set), &cpu_set); - D("orig cpu_set[0]=0x%08lx\n", cpu_set.__bits[0]); - - CPU_ZERO(&cpu_set); - CPU_SET(cpu_num, &cpu_set); - sched_setaffinity(0, sizeof(cpu_set), &cpu_set); - - sched_getaffinity(0, sizeof(cpu_set), &cpu_set); - D("new cpu_set[0]=0x%08lx\n", cpu_set.__bits[0]); -#else - // No workaround was ever implemented for the other platforms. -#endif -} - #if defined(_WIN32) static const char kNullFileName[] = "NUL"; @@ -157,10 +121,6 @@ int adb_main(int is_daemon, int server_port, int ack_reply_fd) { init_transport_registration(); - if (kWorkaroundBug6558362 && is_daemon) { - adb_workaround_affinity(); - } - usb_init(); local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT); adb_auth_init(); -- cgit v1.2.3