Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: tools/android/forwarder2/daemon.cc

Issue 684133002: [Android] Fix gn build for instrumentation tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Follow review Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/android/forwarder2/BUILD.gn ('k') | tools/android/forwarder2/device_forwarder_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/forwarder2/daemon.cc
diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc
index 19a1054c0e93de26d5d69e5de80f6ee1198f983d..75de3ba325fa4f330b9ab952ee66b492895fa66c 100644
--- a/tools/android/forwarder2/daemon.cc
+++ b/tools/android/forwarder2/daemon.cc
@@ -98,31 +98,6 @@ void SigChildHandler(int signal_number) {
SIGNAL_SAFE_LOG(ERROR, string_builder.buffer());
}
-// Note that 0 is written to |lock_owner_pid| in case the file is not locked.
-bool GetFileLockOwnerPid(int fd, pid_t* lock_owner_pid) {
- struct flock lock_info = {};
- lock_info.l_type = F_WRLCK;
- lock_info.l_whence = SEEK_CUR;
- const int ret = HANDLE_EINTR(fcntl(fd, F_GETLK, &lock_info));
- if (ret < 0) {
- if (errno == EBADF) {
- // Assume that the provided file descriptor corresponding to the PID file
- // was valid until the daemon removed this file.
- *lock_owner_pid = 0;
- return true;
- }
- PError("fcntl");
- return false;
- }
- if (lock_info.l_type == F_UNLCK) {
- *lock_owner_pid = 0;
- return true;
- }
- CHECK_EQ(F_WRLCK /* exclusive lock */, lock_info.l_type);
- *lock_owner_pid = lock_info.l_pid;
- return true;
-}
-
scoped_ptr<Socket> ConnectToUnixDomainSocket(
const std::string& socket_name,
int tries_count,
« no previous file with comments | « tools/android/forwarder2/BUILD.gn ('k') | tools/android/forwarder2/device_forwarder_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698