<div class="gmail_extra"><div class="gmail_quote">On Wed, Aug 29, 2012 at 12:40 PM, Kostya Serebryany <span dir="ltr"><<a href="mailto:kcc@google.com" target="_blank">kcc@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: kcc<br>
Date: Wed Aug 29 03:40:36 2012<br>
New Revision: 162834<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=162834&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=162834&view=rev</a><br>
Log:<br>
[asan/tsan] use InternalScopedBuffer instead of stack arrays. Use mmap inseted of InternalAlloc in InternalScopedBuffer<br>
<br>
Modified:<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_printf.cc<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h?rev=162834&r1=162833&r2=162834&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h?rev=162834&r1=162833&r2=162834&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h Wed Aug 29 03:40:36 2012<br>
@@ -55,15 +55,17 @@<br>
<br>
// InternalScopedBuffer can be used instead of large stack arrays to<br>
// keep frame size low.<br>
+// FIXME: use InternalAlloc instead of MmapOrDie once<br>
+// InternalAlloc is made libc-free.<br>
template<typename T><br>
class InternalScopedBuffer {<br>
public:<br>
explicit InternalScopedBuffer(uptr cnt) {<br>
cnt_ = cnt;<br>
- ptr_ = (T*)InternalAlloc(cnt * sizeof(T));<br>
+ ptr_ = (T*)MmapOrDie(cnt * sizeof(T), "InternalScopedBuffer");<br></blockquote><div><br></div><div><br></div><div>Please make it using malloc again. It was always intended to be "scoped-malloc" and extensively used in tsan.</div>
<div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
}<br>
~InternalScopedBuffer() {<br>
- InternalFree(ptr_);<br>
+ UnmapOrDie(ptr_, cnt_ * sizeof(T));<br>
}<br>
operator T*() { return ptr_; }<br>
T &operator[](uptr i) { return ptr_[i]; }<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_printf.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_printf.cc?rev=162834&r1=162833&r2=162834&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_printf.cc?rev=162834&r1=162833&r2=162834&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_printf.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_printf.cc Wed Aug 29 03:40:36 2012<br>
@@ -149,16 +149,15 @@<br>
<br>
void Printf(const char *format, ...) {<br>
const int kLen = 1024 * 4;<br>
- char *buffer = (char*)MmapOrDie(kLen, __FUNCTION__);<br>
+ InternalScopedBuffer<char> buffer(kLen);<br>
va_list args;<br>
va_start(args, format);<br>
- int needed_length = VSNPrintf(buffer, kLen, format, args);<br>
+ int needed_length = VSNPrintf(buffer.data(), kLen, format, args);<br>
va_end(args);<br>
RAW_CHECK_MSG(needed_length < kLen, "Buffer in Printf is too short!\n");<br>
- RawWrite(buffer);<br>
+ RawWrite(buffer.data());<br>
if (PrintfAndReportCallback)<br>
- PrintfAndReportCallback(buffer);<br>
- UnmapOrDie(buffer, kLen);<br>
+ PrintfAndReportCallback(buffer.data());<br>
}<br>
<br>
// Writes at most "length" symbols to "buffer" (including trailing '\0').<br>
@@ -176,19 +175,19 @@<br>
// Like Printf, but prints the current PID before the output string.<br>
void Report(const char *format, ...) {<br>
const int kLen = 1024 * 4;<br>
- char *buffer = (char*)MmapOrDie(kLen, __FUNCTION__);<br>
- int needed_length = internal_snprintf(buffer, kLen, "==%d== ", GetPid());<br>
+ InternalScopedBuffer<char> buffer(kLen);<br>
+ int needed_length = internal_snprintf(buffer.data(),<br>
+ kLen, "==%d== ", GetPid());<br>
RAW_CHECK_MSG(needed_length < kLen, "Buffer in Report is too short!\n");<br>
va_list args;<br>
va_start(args, format);<br>
- needed_length += VSNPrintf(buffer + needed_length, kLen - needed_length,<br>
- format, args);<br>
+ needed_length += VSNPrintf(buffer.data() + needed_length,<br>
+ kLen - needed_length, format, args);<br>
va_end(args);<br>
RAW_CHECK_MSG(needed_length < kLen, "Buffer in Report is too short!\n");<br>
- RawWrite(buffer);<br>
+ RawWrite(buffer.data());<br>
if (PrintfAndReportCallback)<br>
- PrintfAndReportCallback(buffer);<br>
- UnmapOrDie(buffer, kLen);<br>
+ PrintfAndReportCallback(buffer.data());<br>
}<br>
<br>
} // namespace __sanitizer<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc?rev=162834&r1=162833&r2=162834&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc?rev=162834&r1=162833&r2=162834&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc Wed Aug 29 03:40:36 2012<br>
@@ -40,23 +40,23 @@<br>
bool symbolize, const char *strip_file_prefix,<br>
SymbolizeCallback symbolize_callback ) {<br>
MemoryMappingLayout proc_maps;<br>
+ InternalScopedBuffer<char> buff(kPageSize * 2);<br>
+ InternalScopedBuffer<AddressInfo> addr_frames(64);<br>
uptr frame_num = 0;<br>
for (uptr i = 0; i < size && addr[i]; i++) {<br>
uptr pc = patch_pc(addr[i]);<br>
if (symbolize_callback) {<br>
- char buff[4096];<br>
- symbolize_callback((void*)pc, buff, sizeof(buff));<br>
+ symbolize_callback((void*)pc, buff.data(), buff.size());<br>
// We can't know anything about the string returned by external<br>
// symbolizer, but if it starts with filename, try to strip path prefix<br>
// from it.<br>
Printf(" #%zu 0x%zx %s\n", frame_num, pc,<br>
- StripPathPrefix(buff, strip_file_prefix));<br>
+ StripPathPrefix(buff.data(), strip_file_prefix));<br>
frame_num++;<br>
continue;<br>
}<br>
- AddressInfo addr_frames[64];<br>
uptr addr_frames_num =<br>
- symbolize ? SymbolizeCode(pc, addr_frames, ARRAY_SIZE(addr_frames)) : 0;<br>
+ symbolize ? SymbolizeCode(pc, addr_frames.data(), addr_frames.size()) : 0;<br>
if (addr_frames_num > 0) {<br>
for (uptr j = 0; j < addr_frames_num; j++) {<br>
AddressInfo &info = addr_frames[j];<br>
@@ -77,11 +77,10 @@<br>
}<br>
} else {<br>
uptr offset;<br>
- char filename[4096];<br>
if (proc_maps.GetObjectNameAndOffset(pc, &offset,<br>
- filename, sizeof(filename))) {<br>
+ buff.data(), buff.size())) {<br>
Printf(" #%zu 0x%zx (%s+0x%zx)\n", frame_num, pc,<br>
- StripPathPrefix(filename, strip_file_prefix), offset);<br>
+ StripPathPrefix(buff.data(), strip_file_prefix), offset);<br>
} else {<br>
Printf(" #%zu 0x%zx\n", frame_num, pc);<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>