commit f7ada95d3a1f1408bdf4851f65e0f99d52f92b46
author Calin Juravle <calin@google.com> Tue Mar 21 20:02:07 2017 -0700
committer Calin Juravle <calin@google.com> Wed Mar 22 09:10:20 2017 -0700
tree 80c13bbe180b00332397cd560460782517180793
parent 99b7c20caa1ad6f67b027f9fceecabd6e7b76bba

Log the errno code for failed flock() invocations

ScopedFlock was asserting the success of flock()
invocation without logging errno. This CL adds the errno log
before the abort.

Test: m
Bug: 36369345
Change-Id: I24209784b795c37463fb790fcd0793369eeab492

runtime/base/scoped_flock.cc

diff --git a/runtime/base/scoped_flock.cc b/runtime/base/scoped_flock.cc
index d4bb56b..5394e53 100644
--- a/runtime/base/scoped_flock.cc
+++ b/runtime/base/scoped_flock.cc
@@ -116,7 +116,10 @@
 ScopedFlock::~ScopedFlock() {
   if (file_.get() != nullptr) {
     int flock_result = TEMP_FAILURE_RETRY(flock(file_->Fd(), LOCK_UN));
-    CHECK_EQ(0, flock_result);
+    if (flock_result != 0) {
+      PLOG(FATAL) << "Unable to unlock file " << file_->GetPath();
+      UNREACHABLE();
+    }
     int close_result = -1;
     if (file_->ReadOnlyMode()) {
       close_result = file_->Close();