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

Commit ddb90db0 authored by Fan Xu's avatar Fan Xu
Browse files

Temporarily disable detach and promote 

After disccusion, we decided that our migrationg will start with
detached buffer. Therefore, until we refractor both producer buffer and
detached buffer to use binder, it makes no sense to write a converter
between pdx and binder backend.

As detached buffer is neither used outside nor exposed via API, this
change should not have any negative effect.

Some tests are also disabled since after refractoring the behavior might
change, which means we have to rewrite them after refracting. Put TODOs
above them.

Change-Id: I937403a4a8ae9f3ea94718211e12326ace9060bf
Test: 'atest buffer_hub-test': passed
parent 7a0f33ea

libs/vr/libbufferhub/buffer_hub-test.cpp

+12 −0
Original line number Diff line number Diff line
@@ -729,6 +729,9 @@ TEST_F(LibBufferHubTest, TestOrphanedAcquire) { 
}



TEST_F(LibBufferHubTest, TestDetachBufferFromProducer) {

  // TODO(b/112338294) rewrite test after migration

  return;



  std::unique_ptr<BufferProducer> p = BufferProducer::Create(

      kWidth, kHeight, kFormat, kUsage, sizeof(uint64_t));

  std::unique_ptr<BufferConsumer> c =
@@ -834,6 +837,9 @@ TEST_F(LibBufferHubTest, TestCreateDetachedBuffer) { 
}



TEST_F(LibBufferHubTest, TestPromoteDetachedBuffer) {

  // TODO(b/112338294) rewrite test after migration

  return;



  auto b1 = DetachedBuffer::Create(kWidth, kHeight, kLayerCount, kFormat,

                                   kUsage, kUserMetadataSize);

  int b1_id = b1->id();
@@ -867,6 +873,9 @@ TEST_F(LibBufferHubTest, TestPromoteDetachedBuffer) { 
}



TEST_F(LibBufferHubTest, TestDetachThenPromote) {

  // TODO(b/112338294) rewrite test after migration

  return;



  std::unique_ptr<BufferProducer> p1 = BufferProducer::Create(

      kWidth, kHeight, kFormat, kUsage, sizeof(uint64_t));

  ASSERT_TRUE(p1.get() != nullptr);
@@ -942,6 +951,9 @@ TEST_F(LibBufferHubTest, TestDuplicateDetachedBuffer) { 
  EXPECT_TRUE(IsBufferGained(b1->buffer_state()));

  EXPECT_TRUE(IsBufferGained(b2->buffer_state()));



  // TODO(b/112338294) rewrite test after migration

  return;



  // Promote the detached buffer should fail as b1 is no longer the exclusive

  // owner of the buffer..

  status_or_handle = b1->Promote();

libs/vr/libbufferhub/detached_buffer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ int DetachedBuffer::Poll(int timeout_ms) { 
}



Status<LocalChannelHandle> DetachedBuffer::Promote() {

  // TODO(b/112338294) remove after migrate producer buffer to binder

  ALOGW("DetachedBuffer::Promote: not supported operation during migration");

  return {};



  ATRACE_NAME("DetachedBuffer::Promote");

  ALOGD_IF(TRACE, "DetachedBuffer::Promote: id=%d.", id_);

libs/vr/libbufferhub/producer_buffer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ std::unique_ptr<ProducerBuffer> ProducerBuffer::Import( 
}



Status<LocalChannelHandle> ProducerBuffer::Detach() {

  // TODO(b/112338294) remove after migrate producer buffer to binder

  ALOGW("ProducerBuffer::Detach: not supported operation during migration");

  return {};



  uint64_t buffer_state = buffer_state_->load();

  if (!BufferHubDefs::IsBufferGained(buffer_state)) {

    // Can only detach a ProducerBuffer when it's in gained state.