From c2612cd775e2c0c975f6250ddf0ac7f809b3d015 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Wed, 13 Nov 2019 17:51:19 -0800 Subject: [PATCH] Revert "Revert "Delay initial accept() until server initialized"" This reverts commit b71b5af7836c29a08678203043bec658bf07e584. Test: actually build device and host adb this time Change-Id: I9f9375aa83c9d023a1e26d2f95676b734e12f926 --- adb/adb.cpp | 8 ++++++-- adb/adb_listeners.cpp | 19 +++++++++++++++---- adb/adb_listeners.h | 6 +++++- adb/client/main.cpp | 27 +++++++++++++++++---------- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/adb/adb.cpp b/adb/adb.cpp index 98db19123..b5143685a 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -1016,8 +1016,12 @@ bool handle_forward_request(const char* service, if (kill_forward) { r = remove_listener(pieces[0].c_str(), transport); } else { - r = install_listener(pieces[0], pieces[1].c_str(), transport, no_rebind, - &resolved_tcp_port, &error); + int flags = 0; + if (no_rebind) { + flags |= INSTALL_LISTENER_NO_REBIND; + } + r = install_listener(pieces[0], pieces[1].c_str(), transport, flags, &resolved_tcp_port, + &error); } if (r == INSTALL_STATUS_OK) { #if ADB_HOST diff --git a/adb/adb_listeners.cpp b/adb/adb_listeners.cpp index 29909a555..43a925282 100644 --- a/adb/adb_listeners.cpp +++ b/adb/adb_listeners.cpp @@ -164,6 +164,15 @@ void remove_all_listeners() EXCLUDES(listener_list_mutex) { } } +void enable_daemon_sockets() EXCLUDES(listener_list_mutex) { + std::lock_guard lock(listener_list_mutex); + for (auto& l : listener_list) { + if (l->connect_to == "*smartsocket*") { + fdevent_set(l->fde, FDE_READ); + } + } +} + void close_smartsockets() EXCLUDES(listener_list_mutex) { std::lock_guard lock(listener_list_mutex); auto pred = [](const std::unique_ptr& listener) { @@ -173,7 +182,7 @@ void close_smartsockets() EXCLUDES(listener_list_mutex) { } InstallStatus install_listener(const std::string& local_name, const char* connect_to, - atransport* transport, int no_rebind, int* resolved_tcp_port, + atransport* transport, int flags, int* resolved_tcp_port, std::string* error) EXCLUDES(listener_list_mutex) { std::lock_guard lock(listener_list_mutex); for (auto& l : listener_list) { @@ -184,8 +193,8 @@ InstallStatus install_listener(const std::string& local_name, const char* connec return INSTALL_STATUS_INTERNAL_ERROR; } - // Can't repurpose a listener if 'no_rebind' is true. - if (no_rebind) { + // Can't repurpose a listener if INSTALL_LISTENER_NO_REBIND is set + if (flags & INSTALL_LISTENER_NO_REBIND) { *error = "cannot rebind"; return INSTALL_STATUS_CANNOT_REBIND; } @@ -222,7 +231,9 @@ InstallStatus install_listener(const std::string& local_name, const char* connec } else { listener->fde = fdevent_create(listener->fd, listener_event_func, listener.get()); } - fdevent_set(listener->fde, FDE_READ); + if ((flags & INSTALL_LISTENER_DISABLED) == 0) { + fdevent_set(listener->fde, FDE_READ); + } listener->transport = transport; diff --git a/adb/adb_listeners.h b/adb/adb_listeners.h index 70a2ee121..354dcc5c8 100644 --- a/adb/adb_listeners.h +++ b/adb/adb_listeners.h @@ -32,8 +32,11 @@ enum InstallStatus { INSTALL_STATUS_LISTENER_NOT_FOUND = -4, }; +inline constexpr int INSTALL_LISTENER_NO_REBIND = 1 << 0; +inline constexpr int INSTALL_LISTENER_DISABLED = 1 << 1; + InstallStatus install_listener(const std::string& local_name, const char* connect_to, - atransport* transport, int no_rebind, int* resolved_tcp_port, + atransport* transport, int flags, int* resolved_tcp_port, std::string* error); std::string format_listeners(); @@ -41,6 +44,7 @@ std::string format_listeners(); InstallStatus remove_listener(const char* local_name, atransport* transport); void remove_all_listeners(void); +void enable_daemon_sockets(); void close_smartsockets(); #endif /* __ADB_LISTENERS_H */ diff --git a/adb/client/main.cpp b/adb/client/main.cpp index a85a18c4e..33e0716ab 100644 --- a/adb/client/main.cpp +++ b/adb/client/main.cpp @@ -139,9 +139,10 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply auto start = std::chrono::steady_clock::now(); // If we told a previous adb server to quit because of version mismatch, we can get to this - // point before it's finished exiting. Retry for a while to give it some time. - while (install_listener(socket_spec, "*smartsocket*", nullptr, 0, nullptr, &error) != - INSTALL_STATUS_OK) { + // point before it's finished exiting. Retry for a while to give it some time. Don't actually + // accept any connections until adb_wait_for_device_initialization finishes below. + while (install_listener(socket_spec, "*smartsocket*", nullptr, INSTALL_LISTENER_DISABLED, + nullptr, &error) != INSTALL_STATUS_OK) { if (std::chrono::steady_clock::now() - start > 0.5s) { LOG(FATAL) << "could not install *smartsocket* listener: " << error; } @@ -162,12 +163,14 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply PLOG(FATAL) << "setsid() failed"; } #endif + } - // Wait for the USB scan to complete before notifying the parent that we're up. - // We need to perform this in a thread, because we would otherwise block the event loop. - std::thread notify_thread([ack_reply_fd]() { - adb_wait_for_device_initialization(); + // Wait for the USB scan to complete before notifying the parent that we're up. + // We need to perform this in a thread, because we would otherwise block the event loop. + std::thread notify_thread([ack_reply_fd]() { + adb_wait_for_device_initialization(); + if (ack_reply_fd >= 0) { // Any error output written to stderr now goes to adb.log. We could // keep around a copy of the stderr fd and use that to write any errors // encountered by the following code, but that is probably overkill. @@ -193,9 +196,13 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply } unix_close(ack_reply_fd); #endif - }); - notify_thread.detach(); - } + } + // We don't accept() client connections until this point: this way, clients + // can't see wonky state early in startup even if they're connecting directly + // to the server instead of going through the adb program. + fdevent_run_on_main_thread([] { enable_daemon_sockets(); }); + }); + notify_thread.detach(); #if defined(__linux__) // Write our location to .android/adb.$PORT, so that older clients can exec us.