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

Commit 9c831a6b authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Fix check for whether a trace tag is enabled"" into main

parents b753d645 68a0d27a

libs/tracing_perfetto/include/tracing_perfetto.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ Result traceInstantForTrack(uint64_t category, const char* trackName, 




Result traceCounter(uint64_t category, const char* name, int64_t value);

Result traceCounter(uint64_t category, const char* name, int64_t value);





uint64_t getEnabledCategories();

bool isTagEnabled(uint64_t category);





}  // namespace tracing_perfetto

}  // namespace tracing_perfetto

libs/tracing_perfetto/tracing_perfetto.cpp

+6 −5
Original line number Original line Diff line number Diff line
@@ -130,12 +130,13 @@ Result traceCounter(uint64_t category, const char* name, int64_t value) { 
  }

  }

}

}





uint64_t getEnabledCategories() {

bool isTagEnabled(uint64_t category) {

  if (internal::isPerfettoRegistered()) {

  struct PerfettoTeCategory* perfettoTeCategory =

    // TODO(b/303199244): Return only enabled categories and not all registered ones

      internal::toPerfettoCategory(category);

    return internal::getDefaultCategories();

  if (perfettoTeCategory != nullptr) {

    return true;

  } else {

  } else {

    return atrace_get_enabled_tags();

    return (atrace_get_enabled_tags() & category) != 0;

  }

  }

}

}