<div dir="ltr"><div>Yes please.</div><div>Reverted change conflicted with sandboxes which block <span style="font-size:12.8px">GetTid calls. I am not sure how frequent this setup, but revert is definitely the safest approach.</span></div><div><span style="font-size:12.8px">Also it's unlikely that I will try to resubmit it, so 6.0 will have 4.0 format anyway.</span></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 10, 2017 at 3:39 PM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Should this be merged to 5.0?<br>
<div class="HOEnZb"><div class="h5"><br>
On Tue, Jul 25, 2017 at 9:56 AM, Vitaly Buka via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: vitalybuka<br>
> Date: Tue Jul 25 09:56:22 2017<br>
> New Revision: 308984<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=308984&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=308984&view=rev</a><br>
> Log:<br>
> Revert "[compiler-rt] Include thread ID into sanitizers logs"<br>
><br>
> This improvement introduce additional dependencies on sandboxed environments.<br>
><br>
> This reverts commit r308637.<br>
><br>
> Removed:<br>
> compiler-rt/trunk/test/<wbr>sanitizer_common/TestCases/<wbr>Linux/vreport.cc<br>
> Modified:<br>
> compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>printf.cc<br>
><br>
> Modified: compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>printf.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_printf.cc?rev=308984&r1=308983&r2=308984&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>printf.cc?rev=308984&r1=<wbr>308983&r2=308984&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>printf.cc (original)<br>
> +++ compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>printf.cc Tue Jul 25 09:56:22 2017<br>
> @@ -257,15 +257,15 @@ static void NOINLINE SharedPrintfCodeNoB<br>
> "Buffer in Report is too short!\n"); \<br>
> }<br>
> if (append_pid) {<br>
> + int pid = internal_getpid();<br>
> const char *exe_name = GetProcessName();<br>
> if (common_flags()->log_exe_name && exe_name) {<br>
> needed_length += internal_snprintf(buffer, buffer_size,<br>
> "==%s", exe_name);<br>
> CHECK_NEEDED_LENGTH<br>
> }<br>
> - needed_length +=<br>
> - internal_snprintf(buffer + needed_length, buffer_size - needed_length,<br>
> - "==%d:%d==", internal_getpid(), GetTid());<br>
> + needed_length += internal_snprintf(<br>
> + buffer + needed_length, buffer_size - needed_length, "==%d==", pid);<br>
> CHECK_NEEDED_LENGTH<br>
> }<br>
> needed_length += VSNPrintf(buffer + needed_length,<br>
> @@ -307,7 +307,7 @@ void Printf(const char *format, ...) {<br>
> va_end(args);<br>
> }<br>
><br>
> -// Like Printf, but prints the current PID:TID before the output string.<br>
> +// Like Printf, but prints the current PID before the output string.<br>
> FORMAT(1, 2)<br>
> void Report(const char *format, ...) {<br>
> va_list args;<br>
><br>
> Removed: compiler-rt/trunk/test/<wbr>sanitizer_common/TestCases/<wbr>Linux/vreport.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/vreport.cc?rev=308983&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/<wbr>test/sanitizer_common/<wbr>TestCases/Linux/vreport.cc?<wbr>rev=308983&view=auto</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- compiler-rt/trunk/test/<wbr>sanitizer_common/TestCases/<wbr>Linux/vreport.cc (original)<br>
> +++ compiler-rt/trunk/test/<wbr>sanitizer_common/TestCases/<wbr>Linux/vreport.cc (removed)<br>
> @@ -1,23 +0,0 @@<br>
> -// RUN: %clangxx -O0 %s -o %t && %env_tool_opts=verbosity=10 %run %t 2>&1 | FileCheck %s<br>
> -<br>
> -#include <pthread.h><br>
> -#include <stdio.h><br>
> -#include <sys/syscall.h><br>
> -#include <unistd.h><br>
> -<br>
> -void *thread(void *unused) {<br>
> - printf("PID: %d\n", getpid());<br>
> - printf("TID: %ld\n", syscall(SYS_gettid));<br>
> - fflush(stdout);<br>
> - return 0;<br>
> -}<br>
> -<br>
> -int main() {<br>
> - pthread_t t;<br>
> - pthread_create(&t, 0, thread, 0);<br>
> - pthread_join(t, 0);<br>
> - return 0;<br>
> -}<br>
> -// CHECK: PID: [[PID:[0-9]+]]<br>
> -// CHECK: TID: [[TID:[0-9]+]]<br>
> -// CHECK: ==[[PID]]:[[TID]]==<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>