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

Commit ee723f5f authored by Tianyu Jiang's avatar Tianyu Jiang
Browse files

Remove Acquire(LocalHandle* ready_fence, Meta* meta) 

This function is useless for now and in foreseeable future because user
metadata will be in ashmen, and there won't be custom metadata on the
Acquire() interface.

Test: buffer_hub-test buffer_hub_queue-test
buffer_hub_queue_producer-test dvr_api-test dvr_buffer_queue-test
Test: master branch with Marlin
Test: oc-dr1-daydream-dev branch with Vega
Bug: 70048475

Change-Id: I5222ea1034d1fc011055d75a4b814a005913bbd1
parent 6bdb3cac

libs/vr/libbufferhub/buffer_hub-test.cpp

+8 −9
Original line number Diff line number Diff line
@@ -214,13 +214,12 @@ TEST_F(LibBufferHubTest, TestStateTransitions) { 
      ConsumerBuffer::Import(p->CreateConsumer());

  ASSERT_TRUE(c.get() != nullptr);



  uint64_t context;

  LocalHandle fence;



  // The producer buffer starts in gained state.



  // Acquire, release, and gain in gained state should fail.

  EXPECT_EQ(-EBUSY, c->Acquire(&fence, &context));

  EXPECT_EQ(-EBUSY, c->Acquire(&fence));

  EXPECT_EQ(-EBUSY, c->Release(LocalHandle()));

  EXPECT_EQ(-EALREADY, p->Gain(&fence));
@@ -233,10 +232,10 @@ TEST_F(LibBufferHubTest, TestStateTransitions) { 
  EXPECT_EQ(-EBUSY, p->Gain(&fence));



  // Acquire in posted state should succeed.

  EXPECT_LE(0, c->Acquire(&fence, &context));

  EXPECT_LE(0, c->Acquire(&fence));



  // Acquire, post, and gain in acquired state should fail.

  EXPECT_EQ(-EBUSY, c->Acquire(&fence, &context));

  EXPECT_EQ(-EBUSY, c->Acquire(&fence));

  EXPECT_EQ(-EBUSY, p->Post(LocalHandle()));

  EXPECT_EQ(-EBUSY, p->Gain(&fence));
@@ -246,14 +245,14 @@ TEST_F(LibBufferHubTest, TestStateTransitions) { 


  // Release, acquire, and post in released state should fail.

  EXPECT_EQ(-EBUSY, c->Release(LocalHandle()));

  EXPECT_EQ(-EBUSY, c->Acquire(&fence, &context));

  EXPECT_EQ(-EBUSY, c->Acquire(&fence));

  EXPECT_EQ(-EBUSY, p->Post(LocalHandle()));



  // Gain in released state should succeed.

  EXPECT_EQ(0, p->Gain(&fence));



  // Acquire, release, and gain in gained state should fail.

  EXPECT_EQ(-EBUSY, c->Acquire(&fence, &context));

  EXPECT_EQ(-EBUSY, c->Acquire(&fence));

  EXPECT_EQ(-EBUSY, c->Release(LocalHandle()));

  EXPECT_EQ(-EALREADY, p->Gain(&fence));

}
@@ -491,7 +490,7 @@ TEST_F(LibBufferHubTest, TestWithCustomMetadata) { 
  EXPECT_LE(0, RETRY_EINTR(c->Poll(kPollTimeoutMs)));

  LocalHandle fence;

  Metadata m2 = {};

  EXPECT_EQ(0, c->Acquire(&fence, &m2));

  EXPECT_EQ(0, c->Acquire(&fence, &m2, sizeof(m2)));

  EXPECT_EQ(m.field1, m2.field1);

  EXPECT_EQ(m.field2, m2.field2);

  EXPECT_EQ(0, c->Release(LocalHandle()));
@@ -552,11 +551,11 @@ TEST_F(LibBufferHubTest, TestAcquireWithWrongMetaSize) { 


  // It is illegal to acquire metadata larger than originally requested during

  // buffer allocation.

  EXPECT_NE(0, c->Acquire(&fence, &e));

  EXPECT_NE(0, c->Acquire(&fence, &e, sizeof(e)));



  // It is ok to acquire metadata smaller than originally requested during

  // buffer allocation.

  EXPECT_EQ(0, c->Acquire(&fence, &sequence));

  EXPECT_EQ(0, c->Acquire(&fence, &sequence, sizeof(sequence)));

  EXPECT_EQ(m.field1, sequence);

}

libs/vr/libbufferhub/include/private/dvr/consumer_buffer.h

+0 −9
Original line number Diff line number Diff line
@@ -45,15 +45,6 @@ class ConsumerBuffer : public pdx::ClientBase<ConsumerBuffer, BufferHubBase> { 
  // Returns zero on success, or a negative errno code otherwise.

  int Acquire(LocalHandle* ready_fence, void* meta, size_t user_metadata_size);



  // Attempt to retrieve a post event from buffer hub. If successful,

  // |ready_fence| is set to a fence to wait on until the buffer is ready. This

  // call will only succeed after the fd is signaled. This returns zero or a

  // negative unix error code.

  template <typename Meta>

  int Acquire(LocalHandle* ready_fence, Meta* meta) {

    return Acquire(ready_fence, meta, sizeof(*meta));

  }



  // Asynchronously acquires a bufer.

  int AcquireAsync(DvrNativeBufferMetadata* out_meta, LocalHandle* out_fence);