diff options
author | Alexey Samsonov <samsonov@google.com> | 2012-06-06 10:13:27 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2012-06-06 10:13:27 +0000 |
commit | 67a64dd8259fdbd867633b27f54d584f435f1ce6 (patch) | |
tree | d420a1fa3d1357d83a8c199b55e2267313d4f88a /lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc | |
parent | 9929ffd1c4737d2c50829dcefcb0b8f1926a05ff (diff) | |
download | compiler-rt-67a64dd8259fdbd867633b27f54d584f435f1ce6.tar.gz compiler-rt-67a64dd8259fdbd867633b27f54d584f435f1ce6.tar.bz2 compiler-rt-67a64dd8259fdbd867633b27f54d584f435f1ce6.tar.xz |
[TSan] run some renaming as a preparation for factoring out Printf implementation.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@158058 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc')
-rw-r--r-- | lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc b/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc index f7366423..2a01df69 100644 --- a/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc +++ b/lib/tsan/rtl/tsan_symbolize_addr2line_linux.cc @@ -50,12 +50,12 @@ struct DlIteratePhdrCtx { static void NOINLINE InitModule(ModuleDesc *m) { int outfd[2] = {}; if (pipe(&outfd[0])) { - Printf("ThreadSanitizer: outfd pipe() failed (%d)\n", errno); + TsanPrintf("ThreadSanitizer: outfd pipe() failed (%d)\n", errno); Die(); } int infd[2] = {}; if (pipe(&infd[0])) { - Printf("ThreadSanitizer: infd pipe() failed (%d)\n", errno); + TsanPrintf("ThreadSanitizer: infd pipe() failed (%d)\n", errno); Die(); } int pid = fork(); @@ -72,7 +72,7 @@ static void NOINLINE InitModule(ModuleDesc *m) { execl("/usr/bin/addr2line", "/usr/bin/addr2line", "-Cfe", m->fullname, 0); _exit(0); } else if (pid < 0) { - Printf("ThreadSanitizer: failed to fork symbolizer\n"); + TsanPrintf("ThreadSanitizer: failed to fork symbolizer\n"); Die(); } internal_close(outfd[0]); @@ -85,7 +85,7 @@ static int dl_iterate_phdr_cb(dl_phdr_info *info, size_t size, void *arg) { DlIteratePhdrCtx *ctx = (DlIteratePhdrCtx*)arg; InternalScopedBuf<char> tmp(128); if (ctx->is_first) { - Snprintf(tmp.Ptr(), tmp.Size(), "/proc/%d/exe", GetPid()); + SNPrintf(tmp.Ptr(), tmp.Size(), "/proc/%d/exe", GetPid()); info->dlpi_name = tmp.Ptr(); } ctx->is_first = false; @@ -158,16 +158,16 @@ ReportStack *SymbolizeCode(uptr addr) { ModuleDesc *m = s->module; uptr offset = addr - m->base; char addrstr[32]; - Snprintf(addrstr, sizeof(addrstr), "%p\n", (void*)offset); + SNPrintf(addrstr, sizeof(addrstr), "%p\n", (void*)offset); if (0 >= internal_write(m->out_fd, addrstr, internal_strlen(addrstr))) { - Printf("ThreadSanitizer: can't write from symbolizer (%d, %d)\n", + TsanPrintf("ThreadSanitizer: can't write from symbolizer (%d, %d)\n", m->out_fd, errno); Die(); } InternalScopedBuf<char> func(1024); ssize_t len = internal_read(m->inp_fd, func, func.Size() - 1); if (len <= 0) { - Printf("ThreadSanitizer: can't read from symbolizer (%d, %d)\n", + TsanPrintf("ThreadSanitizer: can't read from symbolizer (%d, %d)\n", m->inp_fd, errno); Die(); } @@ -198,7 +198,7 @@ ReportStack *SymbolizeData(uptr addr) { base = GetImageBase(); int res = 0; InternalScopedBuf<char> cmd(1024); - Snprintf(cmd, cmd.Size(), + SNPrintf(cmd, cmd.Size(), "nm -alC %s|grep \"%lx\"|awk '{printf(\"%%s\\n%%s\", $3, $4)}' > tsan.tmp2", exe, (addr - base)); if (system(cmd)) |