commit 06f08e405777bd3b710fd1d7cf73b06f5347db36
author Elliott Hughes <enh@google.com> Tue May 12 21:25:36 2015 -0700
committer Elliott Hughes <enh@google.com> Tue May 12 21:25:36 2015 -0700
tree 7aa97dbe837127c3676cfc3e0390e373bf20bca2
parent 23d358b621dbe11d6da918ab310ed3f1a5fc0558

Silence unused result warnings in art.

This lets us turn on _FORTIFY_SOURCE=2 for the host.

The logging change is basically a trick (since we're still ignoring the
result unless it's an EINTR failure).

The profiler change is in a function whose error checking is a mess; the
fd is leaked, and it's not clear what's supposed to happen about the flock
on failure. I didn't exit if the ftruncate fails because the rest of the
function just blunders on, and error handling here needs a deeper rethink.

Bug: http://b/20558757
Change-Id: I7a2873fce08e37f4af826a04b4701d7ac6a8e3fa

runtime/base/logging.cc

diff --git a/runtime/base/logging.cc b/runtime/base/logging.cc
index 0ae7863..859de4b 100644
--- a/runtime/base/logging.cc
+++ b/runtime/base/logging.cc
@@ -289,17 +289,17 @@
   CHECK_EQ(strlen(log_characters), INTERNAL_FATAL + 1U);
 
   const char* program_name = ProgramInvocationShortName();
-  write(STDERR_FILENO, program_name, strlen(program_name));
-  write(STDERR_FILENO, " ", 1);
-  write(STDERR_FILENO, &log_characters[log_severity], 1);
-  write(STDERR_FILENO, " ", 1);
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, program_name, strlen(program_name)));
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, " ", 1));
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, &log_characters[log_severity], 1));
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, " ", 1));
   // TODO: pid and tid.
-  write(STDERR_FILENO, file, strlen(file));
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, file, strlen(file)));
   // TODO: line.
   UNUSED(line);
-  write(STDERR_FILENO, "] ", 2);
-  write(STDERR_FILENO, message, strlen(message));
-  write(STDERR_FILENO, "\n", 1);
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, "] ", 2));
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, message, strlen(message)));
+  TEMP_FAILURE_RETRY(write(STDERR_FILENO, "\n", 1));
 #endif
 }
 

runtime/profiler.cc

diff --git a/runtime/profiler.cc b/runtime/profiler.cc
index 90a47b3..63a3843 100644
--- a/runtime/profiler.cc
+++ b/runtime/profiler.cc
@@ -300,7 +300,9 @@
   } while (length > 0);
 
   // Truncate the file to the new length.
-  ftruncate(fd, full_length);
+  if (ftruncate(fd, full_length) == -1) {
+    LOG(ERROR) << "Failed to truncate profile file " << full_name;
+  }
 
   // Now unlock the file, allowing another process in.
   err = flock(fd, LOCK_UN);