diff --git a/include/debug_logger.h b/include/debug_logger.h index 6e2ff8935ec9d479a1aae1855c80aaf975cbfcdc..001506eb1f1fe9c4a7ae284a330f15fb2a9974d0 100755 --- a/include/debug_logger.h +++ b/include/debug_logger.h @@ -283,45 +283,7 @@ private: #endif #undef assert -class LogMessage { -public: - LogMessage(DebugLevel level = LEVEL_VERBOSE, bool showError = false) - : level_(level), showError_(showError) - { - } - std::ostream &Stream() - { - return buffer_; - } - ~LogMessage() - { - if (!DebugLogger::logDisabled_) { - if (!showError_) { - DebugLogger::GetInstance()->Log(level_, HILOG_TAG, "%s\n", buffer_.str().c_str()); - } else { - DebugLogger::GetInstance()->Log(level_, HILOG_TAG, "%s (errno %d)\n", - buffer_.str().c_str(), errno); - } - } - } - -private: - DebugLevel level_; - bool showError_; - std::ostringstream buffer_; -}; -#define HLOGMESSAGE(level, error) \ - LogMessage(level, error).Stream() \ - << HILOG_TAG_NAME << "/" << LOG_LEVEL(level) << "<" << gettid() << ">[" << SHORT_FILENAME \ - << ":" << __LINE__ << "]" << __FUNCTION__ << ":" - -#define HLOGS(level) HLOGMESSAGE(level, false) - -#define HLOGSP(level) HLOGMESSAGE(level, true) #else -#define HLOGS(...) std::ostringstream() -#define HLOGSP(...) std::ostringstream() - #define HLOGDUMMY(...) \ do { \ } while (0) diff --git a/include/perf_file_format.h b/include/perf_file_format.h index a267e223a1d87c0278d35c6309d9b792024122f7..4dc62a398f48a7db23b73703e4e4a42a2215ea54 100755 --- a/include/perf_file_format.h +++ b/include/perf_file_format.h @@ -131,6 +131,7 @@ public: explicit PerfFileSection(const FEATURE featureId) : featureId_(featureId) { header.size = 0; + header.offset = 0; } static std::string GetFeatureName(FEATURE featureId); diff --git a/include/perf_file_writer.h b/include/perf_file_writer.h index ddbe1304478149f8fe6f95e8bd7f9b51af1893ab..0a41b491e1fd5febea66e6b91ef9881532b7542a 100755 --- a/include/perf_file_writer.h +++ b/include/perf_file_writer.h @@ -38,6 +38,7 @@ public: attrSection_.offset = 0; attrSection_.size = 0; defaultEventAttr_.branch_sample_type = 0; + defaultEventAttr_.namespaces = 0; }; ~PerfFileWriter();