Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fd_utils: add missing logging for a couple of failure cases."

Browse Source 
am: 9dbcff7d73

Change-Id: Iabd49e8f322e926b1b157ff85f1e9e4f66b0f56a
This commit is contained in:
Narayan Kamath
2017-03-03 10:41:46 +00:00
committed by android-build-merger
parent e6f3ed6aef 9dbcff7d73
commit 04d17c07cc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/fd_utils.cpp
View File

@@ -26,6 +26,7 @@
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>
#include <android-base/logging.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <cutils/log.h> #include <cutils/log.h>
@@ -224,6 +225,7 @@ FileDescriptorInfo* FileDescriptorInfo::CreateFromFd(int fd) {
bool FileDescriptorInfo::Restat() const { bool FileDescriptorInfo::Restat() const {
struct stat f_stat; struct stat f_stat;
if (TEMP_FAILURE_RETRY(fstat(fd, &f_stat)) == -1) { if (TEMP_FAILURE_RETRY(fstat(fd, &f_stat)) == -1) {
PLOG(ERROR) << "Unable to restat fd " << fd;
return false; return false;
} }
@@ -312,7 +314,10 @@ bool FileDescriptorInfo::Readlink(const int fd, std::string* result) {
// ext2 and ext4 both have PAGE_SIZE limitations, so we assume that here. // ext2 and ext4 both have PAGE_SIZE limitations, so we assume that here.
char buf[4096]; char buf[4096];
ssize_t len = readlink(path, buf, sizeof(buf)); ssize_t len = readlink(path, buf, sizeof(buf));
if (len == -1) return false; if (len == -1) {
PLOG(ERROR) << "Readlink on " << fd << " failed.";
return false;
}
result->assign(buf, len); result->assign(buf, len);
return true; return true;