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

adb: don\'t dup local socket fd. 

am: 42afe2033f

Change-Id: I4499180c294a79a12d7bcacbc3d41466037570f0
This commit is contained in:
Josh Gao 2016-06-23 01:08:03 +00:00 committed by android-build-merger
parent a2884315f4 42afe2033f
commit 22cbf62602
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adb/shell_service.cpp
View File

@ -155,7 +155,7 @@ class Subprocess {
const std::string& command() const { return command_; }
int local_socket_fd() const { return local_socket_sfd_.fd(); }
int ReleaseLocalSocket() { return local_socket_sfd_.Release(); }
pid_t pid() const { return pid_; }
@ -450,7 +450,7 @@ void Subprocess::ThreadHandler(void* userdata) {
Subprocess* subprocess = reinterpret_cast<Subprocess*>(userdata);
adb_thread_setname(android::base::StringPrintf(
"shell srvc %d", subprocess->local_socket_fd()));
"shell srvc %d", subprocess->pid()));
D("passing data streams for PID %d", subprocess->pid());
subprocess->PassDataStreams();
@ -761,14 +761,13 @@ int StartSubprocess(const char* name, const char* terminal_type,
return ReportError(protocol, error);
}
unique_fd local_socket(dup(subprocess->local_socket_fd()));
D("subprocess creation successful: local_socket_fd=%d, pid=%d", local_socket.get(),
subprocess->pid());
int local_socket = subprocess->ReleaseLocalSocket();
D("subprocess creation successful: local_socket_fd=%d, pid=%d", local_socket, subprocess->pid());
if (!Subprocess::StartThread(std::move(subprocess), &error)) {
LOG(ERROR) << "failed to start subprocess management thread: " << error;
return ReportError(protocol, error);
}
return local_socket.release();
return local_socket;
}