[ASan] Add process basename to log name and error message to simplify analysis of sanitized systems logs.

[ygribov]

Summary

This is a second try on http://reviews.llvm.org/D5724 which was approved and commited but later reverted after causing bugs in upstream. This patch is mostly identical (except for fixing the issue for OSX and rebasing). It relies on BlockinMutex patch in http://reviews.llvm.org/D7171

[ygribov]

Tested on Linux x64, both with and without LLVM_BUILD_EXTERNAL_COMPILER_RT=ON.

[samsonov]

lib/asan/asan_report.cc

56 ↗

(On Diff #18744)

Feel free to commit this part separately in a cleanup CL.

lib/sanitizer_common/sanitizer_common.cc

224 ↗

(On Diff #18744)

I forgot, why do you need this?

lib/sanitizer_common/sanitizer_linux.cc

754 ↗

(On Diff #18744)

Use default_module_name here.

lib/sanitizer_common/sanitizer_printf.cc

258 ↗

(On Diff #18744)

Hm, do we really want this? I believe some users may scrape logs by searching for ==%d== prefix.

test/asan/TestCases/verbose-log-path_test.cc

1 ↗

(On Diff #18744)

Why do you need this?

12 ↗

(On Diff #18744)

This test will not be run on Windows anyway - verbose-log-path is not set there.

[ygribov]

lib/sanitizer_common/sanitizer_common.cc

224 ↗

(On Diff #18744)

It's for Windows.

lib/sanitizer_common/sanitizer_printf.cc

258 ↗

(On Diff #18744)

Knowing pname may be useful when output from multiple processes gets printed into stderr. Perhaps do ==%d==%s==?

test/asan/TestCases/verbose-log-path_test.cc

1 ↗

(On Diff #18744)

I simply copy-pasted this from log-path_test.cc and thought that it's better to avoid changes. I could remove useless stuff if necessary.

12 ↗

(On Diff #18744)

Ditto.

[ygribov]

Yikes, looks like I accidentally closed this by a partial cleanup commit. Should I create a new review?

lib/asan/asan_report.cc

56 ↗

(On Diff #18744)

Landed in 227559.

compiler-rt/trunk/lib/asan/asan_report.cc

void AppendToErrorMessageBuffer(const char *buffer) {
   if (error_message_buffer) {
     uptr length = internal_strlen(buffer);
     CHECK_GE(error_message_buffer_size, error_message_buffer_pos);
     uptr remaining = error_message_buffer_size - error_message_buffer_pos;
     internal_strncpy(error_message_buffer + error_message_buffer_pos,
                      buffer, remaining);
     error_message_buffer[error_message_buffer_size - 1] = '\0';
     // FIXME: reallocate the buffer instead of truncating the message.
-    error_message_buffer_pos += remaining > length ? length : remaining;
+    error_message_buffer_pos += Min(remaining, length);
   }
 }
 
 // ---------------------- Decorator ------------------------------ {{{1
 class Decorator: public __sanitizer::SanitizerCommonDecorator {
  public:
   Decorator() : SanitizerCommonDecorator() { }
   const char *Access()     { return Blue(); }

compiler-rt/trunk/lib/msan/msan_interceptors.cc

INTERCEPTOR(SSIZE_T, recvfrom, int fd, void *buf, SIZE_T len, int flags,
   ENSURE_MSAN_INITED();
   SIZE_T srcaddr_sz;
   if (srcaddr) srcaddr_sz = *addrlen;
   SSIZE_T res = REAL(recvfrom)(fd, buf, len, flags, srcaddr, addrlen);
   if (res > 0) {
     __msan_unpoison(buf, res);
     if (srcaddr) {
       SIZE_T sz = *addrlen;
-      __msan_unpoison(srcaddr, (sz < srcaddr_sz) ? sz : srcaddr_sz);
+      __msan_unpoison(srcaddr, Min(sz, srcaddr_sz));
     }
   }
   return res;
 }
 
 INTERCEPTOR(void *, calloc, SIZE_T nmemb, SIZE_T size) {
   GET_MALLOC_STACK_TRACE;
   if (UNLIKELY(!msan_inited)) {