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

Commit 05cd77c4 authored by Michael Wright's avatar Michael Wright
Browse files

Revert PDX tracing. 

This broke full-eng / docs / m_e_arm-eng builds.

Test: lunch full-eng && m-j8
Change-Id: I79b0176738e4de35cca25e9618e64aa2bd4c4316
parent 52ea25cf

libs/vr/libbufferhubqueue/buffer_hub_queue_client.cpp

+0 −14
Original line number Original line Diff line number Diff line
@@ -176,11 +176,6 @@ bool BufferHubQueue::WaitForBuffers(int timeout) { 
      int32_t index;

      int32_t index;

      std::tie(event_fd, index) = Unstuff(events[i].data.u64);

      std::tie(event_fd, index) = Unstuff(events[i].data.u64);





      PDX_TRACE_FORMAT(

          "epoll_event|queue_id=%d;num_events=%d;event_index=%d;event_fd=%d;"

          "slot=%d|",

          id(), num_events, i, event_fd, index);



      ALOGD_IF(TRACE,

      ALOGD_IF(TRACE,

               "BufferHubQueue::WaitForBuffers: event %d: event_fd=%d index=%d",

               "BufferHubQueue::WaitForBuffers: event %d: event_fd=%d index=%d",

               i, event_fd, index);

               i, event_fd, index);
@@ -218,10 +213,6 @@ Status<void> BufferHubQueue::HandleBufferEvent(size_t slot, int event_fd, 
  }

  }





  const int events = status.get();

  const int events = status.get();

  PDX_TRACE_FORMAT(

      "buffer|queue_id=%d;buffer_id=%d;slot=%zu;event_fd=%d;poll_events=%x;"

      "events=%d|",

      id(), buffers_[slot]->id(), slot, event_fd, poll_events, events);





  if (events & EPOLLIN) {

  if (events & EPOLLIN) {

    return Enqueue({buffers_[slot], slot, buffers_[slot]->GetQueueIndex()});

    return Enqueue({buffers_[slot], slot, buffers_[slot]->GetQueueIndex()});
@@ -353,17 +344,12 @@ Status<std::shared_ptr<BufferHubBuffer>> BufferHubQueue::Dequeue(int timeout, 
  ALOGD_IF(TRACE, "BufferHubQueue::Dequeue: count=%zu, timeout=%d", count(),

  ALOGD_IF(TRACE, "BufferHubQueue::Dequeue: count=%zu, timeout=%d", count(),

           timeout);

           timeout);





  PDX_TRACE_FORMAT("BufferHubQueue::Dequeue|count=%zu|", count());



  if (count() == 0) {

  if (count() == 0) {

    if (!WaitForBuffers(timeout))

    if (!WaitForBuffers(timeout))

      return ErrorStatus(ETIMEDOUT);

      return ErrorStatus(ETIMEDOUT);

  }

  }





  auto& entry = available_buffers_.top();

  auto& entry = available_buffers_.top();

  PDX_TRACE_FORMAT("buffer|buffer_id=%d;slot=%zu|", entry.buffer->id(),

                   entry.slot);



  std::shared_ptr<BufferHubBuffer> buffer = std::move(entry.buffer);

  std::shared_ptr<BufferHubBuffer> buffer = std::move(entry.buffer);

  *slot = entry.slot;

  *slot = entry.slot;

libs/vr/libpdx/private/pdx/trace.h

+25 −72
Original line number Original line Diff line number Diff line 
#ifndef ANDROID_PDX_TRACE_H_

#ifndef ANDROID_PDX_TRACE_H_

#define ANDROID_PDX_TRACE_H_

#define ANDROID_PDX_TRACE_H_





#include <array>

// Tracing utilities for libpdx. Tracing in the service framework is enabled

// under these conditions:

//    1. ATRACE_TAG is defined, AND

//    2. ATRACE_TAG does not equal ATRACE_TAG_NEVER, AND

//    3. PDX_TRACE_ENABLED is defined, AND

//    4. PDX_TRACE_ENABLED is equal to logical true.

//

// If any of these conditions are not met tracing is completely removed from the

// library and headers.



// If ATRACE_TAG is not defined, default to never.

#ifndef ATRACE_TAG

#define ATRACE_TAG ATRACE_TAG_NEVER

#endif





// Include tracing functions after the trace tag is defined.

#include <utils/Trace.h>

#include <utils/Trace.h>





// Enables internal tracing in libpdx. This is disabled by default to avoid

// If PDX_TRACE_ENABLED is not defined, default to off.

// spamming the trace buffers during normal trace activities. libpdx must be

#ifndef PDX_TRACE_ENABLED

// built with this set to true to enable internal tracing.

#define PDX_TRACE_ENABLED 0

#ifndef PDX_LIB_TRACE_ENABLED

#define PDX_LIB_TRACE_ENABLED false

#endif

#endif





namespace android {

#if (ATRACE_TAG) != (ATRACE_TAG_NEVER) && (PDX_TRACE_ENABLED)

namespace pdx {

#define PDX_TRACE_NAME ATRACE_NAME



#else

// Utility to generate scoped tracers with arguments.

class ScopedTraceArgs {

 public:

  template <typename... Args>

  ScopedTraceArgs(uint64_t tag, const char* format, Args&&... args)

      : tag_{tag} {

    if (atrace_is_tag_enabled(tag_)) {

      std::array<char, 1024> buffer;

      snprintf(buffer.data(), buffer.size(), format,

               std::forward<Args>(args)...);

      atrace_begin(tag_, buffer.data());

    }

  }



  ~ScopedTraceArgs() { atrace_end(tag_); }



 private:

  uint64_t tag_;



  ScopedTraceArgs(const ScopedTraceArgs&) = delete;

  void operator=(const ScopedTraceArgs&) = delete;

};



// Utility to generate scoped tracers.

class ScopedTrace {

 public:

  template <typename... Args>

  ScopedTrace(uint64_t tag, bool enabled, const char* name)

      : tag_{tag}, enabled_{enabled} {

    if (enabled_)

      atrace_begin(tag_, name);

  }



  ~ScopedTrace() {

    if (enabled_)

      atrace_end(tag_);

  }



 private:

  uint64_t tag_;

  bool enabled_;



  ScopedTrace(const ScopedTrace&) = delete;

  void operator=(const ScopedTrace&) = delete;

};



}  // namespace pdx

}  // namespace android



// Macro to define a scoped tracer with arguments. Uses PASTE(x, y) macro

// defined in utils/Trace.h.

#define PDX_TRACE_FORMAT(format, ...)                         \

  ::android::pdx::ScopedTraceArgs PASTE(__tracer, __LINE__) { \

    ATRACE_TAG, format, ##__VA_ARGS__                         \

  }



// TODO(eieio): Rename this to PDX_LIB_TRACE_NAME() for internal use by libpdx

// and rename internal uses inside the library. This version is only enabled

// when PDX_LIB_TRACE_ENABLED is true.

#define PDX_TRACE_NAME(name) \

#define PDX_TRACE_NAME(name) \

  ::android::pdx::ScopedTrace PASTE(__tracer, __LINE__) { \

  do {                       \

    ATRACE_TAG, PDX_LIB_TRACE_ENABLED, name               \

  } while (0)

  }

#endif





#endif  // ANDROID_PDX_TRACE_H_
 
#endif  // ANDROID_PDX_TRACE_H_