openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "Delay initial accept() until server initialized"" 

am: 5fff3877a1

Change-Id: I1bce66b314ef2789908faabd00c10e4da2c2bddc
This commit is contained in:
Raman Tenneti 2019-11-12 11:06:59 -08:00 committed by android-build-merger
parent 0b8dc11215 5fff3877a1
commit 4443254774
4 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adb/adb.cpp
View File

@ -979,12 +979,8 @@ bool handle_forward_request(const char* service,
if (kill_forward) {
r = remove_listener(pieces[0].c_str(), transport);
} else {
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);
r = install_listener(pieces[0], pieces[1].c_str(), transport, no_rebind,
&resolved_tcp_port, &error);
}
if (r == INSTALL_STATUS_OK) {
#if ADB_HOST

19
adb/adb_listeners.cpp
View File

@ -164,15 +164,6 @@ void remove_all_listeners() EXCLUDES(listener_list_mutex) {
}
}
void enable_daemon_sockets() EXCLUDES(listener_list_mutex) {
std::lock_guard<std::mutex> 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<std::mutex> lock(listener_list_mutex);
auto pred = [](const std::unique_ptr<alistener>& listener) {
@ -182,7 +173,7 @@ void close_smartsockets() EXCLUDES(listener_list_mutex) {
}
InstallStatus install_listener(const std::string& local_name, const char* connect_to,
atransport* transport, int flags, int* resolved_tcp_port,
atransport* transport, int no_rebind, int* resolved_tcp_port,
std::string* error) EXCLUDES(listener_list_mutex) {
std::lock_guard<std::mutex> lock(listener_list_mutex);
for (auto& l : listener_list) {
@ -193,8 +184,8 @@ InstallStatus install_listener(const std::string& local_name, const char* connec
return INSTALL_STATUS_INTERNAL_ERROR;
}
// Can't repurpose a listener if INSTALL_LISTENER_NO_REBIND is set
if (flags & INSTALL_LISTENER_NO_REBIND) {
// Can't repurpose a listener if 'no_rebind' is true.
if (no_rebind) {
*error = "cannot rebind";
return INSTALL_STATUS_CANNOT_REBIND;
}
@ -231,9 +222,7 @@ InstallStatus install_listener(const std::string& local_name, const char* connec
} else {
listener->fde = fdevent_create(listener->fd, listener_event_func, listener.get());
}
if ((flags & INSTALL_LISTENER_DISABLED) == 0) {
fdevent_set(listener->fde, FDE_READ);
}
fdevent_set(listener->fde, FDE_READ);
listener->transport = transport;

6
adb/adb_listeners.h
View File

@ -32,11 +32,8 @@ 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 flags, int* resolved_tcp_port,
atransport* transport, int no_rebind, int* resolved_tcp_port,
std::string* error);
std::string format_listeners();
@ -44,7 +41,6 @@ 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 */

27
adb/client/main.cpp
View File

@ -137,10 +137,9 @@ 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. 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) {
// 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) {
if (std::chrono::steady_clock::now() - start > 0.5s) {
LOG(FATAL) << "could not install *smartsocket* listener: " << error;
}
@ -161,14 +160,12 @@ 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.
@ -194,13 +191,9 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply
}
unix_close(ack_reply_fd);
#endif
}
// 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();
});
notify_thread.detach();
}
#if defined(__linux__)
// Write our location to .android/adb.$PORT, so that older clients can exec us.