Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 677ab57b authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge "Fix ATRACE_TAG redefinition in SysTrace.h" am: 5b999ecd am:... 

Merge "Fix ATRACE_TAG redefinition in SysTrace.h" am: 5b999ecd am: 9aa4f149 am: bda05a0a am: 0d25702a am: 5d66d97b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2190736



Change-Id: I82612ab6e791b7f31889cf151992fd8c9434378c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18554a64 5d66d97b

cmds/idmap2/include/idmap2/SysTrace.h

+6 −9
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#ifndef IDMAP2_INCLUDE_IDMAP2_SYSTRACE_H_

#define IDMAP2_INCLUDE_IDMAP2_SYSTRACE_H_



#define ATRACE_TAG ATRACE_TAG_RRO



#include <sstream>

#include <vector>
@@ -29,16 +27,12 @@ namespace android::idmap2::utils { 


class ScopedTraceNoStart {

 public:

  ~ScopedTraceNoStart() {

    ATRACE_END();

  }

  ~ScopedTraceNoStart();

};



class ScopedTraceMessageHelper {

 public:

  ~ScopedTraceMessageHelper() {

    ATRACE_BEGIN(buffer_.str().c_str());

  }

  ~ScopedTraceMessageHelper();



  std::ostream& stream() {

    return buffer_;
@@ -48,9 +42,12 @@ class ScopedTraceMessageHelper { 
  std::ostringstream buffer_;

};



bool atrace_enabled();



#define SYSTRACE                                               \

  android::idmap2::utils::ScopedTraceNoStart _trace##__LINE__; \

  (ATRACE_ENABLED()) && android::idmap2::utils::ScopedTraceMessageHelper().stream()

  android::idmap2::utils::atrace_enabled() \

  && android::idmap2::utils::ScopedTraceMessageHelper().stream()



#else

cmds/idmap2/libidmap2/SysTrace.cpp

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define ATRACE_TAG ATRACE_TAG_RRO



#include "idmap2/SysTrace.h"



#ifdef __ANDROID__

namespace android::idmap2::utils {



ScopedTraceNoStart::~ScopedTraceNoStart() {

    ATRACE_END();

};



ScopedTraceMessageHelper::~ScopedTraceMessageHelper() {

    ATRACE_BEGIN(buffer_.str().c_str());

}



bool atrace_enabled() {

    return ATRACE_ENABLED();

}

}  // namespace android::idmap2::utils

#endif