ART: Change SCOPED_TRACE implementation
Move to a LOG-like usage pattern. This improves usability in the
presence of lock annotations.
Demonstrate in the JIT compiler, where a lambda would require
a REQUIRES_SHARED annotation.
Test: m
Test: manual
Change-Id: I9da2bfb29ed11660dbeb6f114a3d6c7ffef3a26d
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 37a18cb..fc19b54 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -181,15 +181,10 @@
],
},
},
- target: {
- android: {
- // For atrace.
- shared_libs: ["libcutils"],
- },
- },
generated_sources: ["art_compiler_operator_srcs"],
shared_libs: [
"libbase",
+ "libcutils", // for atrace.
"liblzma",
],
include_dirs: ["art/disassembler"],
diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc
index 74603c6..88e3e5b 100644
--- a/compiler/jit/jit_compiler.cc
+++ b/compiler/jit/jit_compiler.cc
@@ -23,6 +23,7 @@
#include "art_method-inl.h"
#include "base/logging.h" // For VLOG
#include "base/stringpiece.h"
+#include "base/systrace.h"
#include "base/time_utils.h"
#include "base/timing_logger.h"
#include "base/unix_file/fd_file.h"
@@ -163,6 +164,8 @@
}
bool JitCompiler::CompileMethod(Thread* self, ArtMethod* method, bool osr) {
+ SCOPED_TRACE << "JIT compiling " << method->PrettyMethod();
+
DCHECK(!method->IsProxyMethod());
DCHECK(method->GetDeclaringClass()->IsResolved());
diff --git a/runtime/base/systrace.h b/runtime/base/systrace.h
index c6b6ff1..08ab93d 100644
--- a/runtime/base/systrace.h
+++ b/runtime/base/systrace.h
@@ -21,6 +21,7 @@
#include <cutils/trace.h>
#include <utils/Trace.h>
+#include <sstream>
#include <string>
#include "android-base/stringprintf.h"
@@ -46,10 +47,37 @@
}
};
-#define SCOPED_TRACE(fmtstr, ...) \
- ::art::ScopedTrace trace ## __LINE__([&]() { \
- return ::android::base::StringPrintf((fmtstr), __VA_ARGS__); \
- })
+// Helper for the SCOPED_TRACE macro. Do not use directly.
+class ScopedTraceNoStart {
+ public:
+ ScopedTraceNoStart() {
+ }
+
+ ~ScopedTraceNoStart() {
+ ATRACE_END();
+ }
+
+ // Message helper for the macro. Do not use directly.
+ class ScopedTraceMessageHelper {
+ public:
+ ScopedTraceMessageHelper() {
+ }
+ ~ScopedTraceMessageHelper() {
+ ATRACE_BEGIN(buffer_.str().c_str());
+ }
+
+ std::ostream& stream() {
+ return buffer_;
+ }
+
+ private:
+ std::ostringstream buffer_;
+ };
+};
+
+#define SCOPED_TRACE \
+ ::art::ScopedTraceNoStart trace ## __LINE__; \
+ (ATRACE_ENABLED()) && ::art::ScopedTraceNoStart::ScopedTraceMessageHelper().stream()
} // namespace art
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 271e213..154292d 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -283,7 +283,7 @@
bool allow_soft_failures,
HardFailLogMode log_level,
std::string* error) {
- SCOPED_TRACE("VerifyClass %s", PrettyDescriptor(dex_file->GetClassDescriptor(class_def)).c_str());
+ SCOPED_TRACE << "VerifyClass " << PrettyDescriptor(dex_file->GetClassDescriptor(class_def));
// A class must not be abstract and final.
if ((class_def.access_flags_ & (kAccAbstract | kAccFinal)) == (kAccAbstract | kAccFinal)) {