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

Commit 4a3863d0 authored by Okan Arikan's avatar Okan Arikan
Browse files

Fix the spammy sensord. 

Bug: 38509839
Test: Flash the device and observe the lack of pose service warnings
about missing buffers.

Change-Id: I4bfdd02530427fe147ae78eee1d850bb310a937f
parent 9b8c084f

libs/vr/libdisplay/include/private/dvr/shared_buffer_helpers.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ class CPUMappedBuffer { 
  // If we just own the IonBuffer outright, it's here.

  std::unique_ptr<IonBuffer> owned_buffer_ = nullptr;



  // The last time we connected to the display service.

  int64_t last_display_service_connection_ns_ = 0;



  // If we do not own the IonBuffer, it's here

  IonBuffer* buffer_ = nullptr;

libs/vr/libdisplay/shared_buffer_helpers.cpp

+17 −3
Original line number Diff line number Diff line 
#include <private/dvr/clock_ns.h>

#include <private/dvr/shared_buffer_helpers.h>



namespace android {

namespace dvr {

namespace {



// We will not poll the display service for buffers more frequently than this.

constexpr size_t kDisplayServiceTriesPerSecond = 2;

}  // namespace



CPUMappedBuffer::CPUMappedBuffer(DvrGlobalBufferKey key, CPUUsageMode mode)

    : buffer_key_(key), usage_mode_(mode) {
@@ -30,8 +36,16 @@ CPUMappedBuffer::~CPUMappedBuffer() { 
void CPUMappedBuffer::TryMapping() {

  // Do we have an IonBuffer for this shared memory object?

  if (buffer_ == nullptr) {

    // Has it been too long since we last connected to the display service?

    const auto current_time_ns = GetSystemClockNs();

    if ((current_time_ns - last_display_service_connection_ns_) <

        (1e9 / kDisplayServiceTriesPerSecond)) {

      // Early exit.

      return;

    }

    last_display_service_connection_ns_ = current_time_ns;



    // Create a display client and get the buffer.

    // TODO(okana): We might want to throttle this.

    auto display_client = display::DisplayClient::Create();

    if (display_client) {

      auto get_result = display_client->GetGlobalBuffer(buffer_key_);
@@ -39,8 +53,8 @@ void CPUMappedBuffer::TryMapping() { 
        owned_buffer_ = get_result.take();

        buffer_ = owned_buffer_.get();

      } else {

        ALOGW("Could not get named buffer from pose service : %s(%d)",

              get_result.GetErrorMessage().c_str(), get_result.error());

        // The buffer has not been created yet. This is OK, we will keep

        // retrying.

      }

    } else {

      ALOGE("Unable to create display client for shared buffer access");