BufferHubQueue rename DetachBuffer to RemoveBuffer
Test: buffer_hub_queue_producer-test, buffer_hub_queue-test, dvr_api-test
Bug: 37164481
Change-Id: I05ba0f9f96cf60b64cb8b76482301440d40aa82a
diff --git a/libs/vr/libbufferhub/include/private/dvr/bufferhub_rpc.h b/libs/vr/libbufferhub/include/private/dvr/bufferhub_rpc.h
index d79d96d..ca0e0e0 100644
--- a/libs/vr/libbufferhub/include/private/dvr/bufferhub_rpc.h
+++ b/libs/vr/libbufferhub/include/private/dvr/bufferhub_rpc.h
@@ -264,7 +264,7 @@
kOpCreateConsumerQueue,
kOpGetQueueInfo,
kOpProducerQueueAllocateBuffers,
- kOpProducerQueueDetachBuffer,
+ kOpProducerQueueRemoveBuffer,
kOpConsumerQueueImportBuffers,
};
@@ -312,7 +312,7 @@
std::vector<std::pair<LocalChannelHandle, size_t>>(
uint32_t width, uint32_t height, uint32_t layer_count,
uint32_t format, uint64_t usage, size_t buffer_count));
- PDX_REMOTE_METHOD(ProducerQueueDetachBuffer, kOpProducerQueueDetachBuffer,
+ PDX_REMOTE_METHOD(ProducerQueueRemoveBuffer, kOpProducerQueueRemoveBuffer,
void(size_t slot));
PDX_REMOTE_METHOD(ConsumerQueueImportBuffers, kOpConsumerQueueImportBuffers,
std::vector<std::pair<LocalChannelHandle, size_t>>(Void));
diff --git a/libs/vr/libbufferhubqueue/buffer_hub_queue_client.cpp b/libs/vr/libbufferhubqueue/buffer_hub_queue_client.cpp
index e59bbb5..bba075d 100644
--- a/libs/vr/libbufferhubqueue/buffer_hub_queue_client.cpp
+++ b/libs/vr/libbufferhubqueue/buffer_hub_queue_client.cpp
@@ -259,7 +259,7 @@
poll_status.get());
if (hangup_pending) {
- return DetachBuffer(slot);
+ return RemoveBuffer(slot);
} else {
// Clean up the bookkeeping for the event fd. This is a bit of paranoia to
// deal with the epoll set getting out of sync with the buffer slots.
@@ -323,11 +323,11 @@
if (buffers_[slot]) {
// Replace the buffer if the slot is occupied. This could happen when the
- // producer side replaced the slot with a newly allocated buffer. Detach the
+ // producer side replaced the slot with a newly allocated buffer. Remove the
// buffer before setting up with the new one.
- auto detach_status = DetachBuffer(slot);
- if (!detach_status)
- return detach_status.error_status();
+ auto remove_status = RemoveBuffer(slot);
+ if (!remove_status)
+ return remove_status.error_status();
}
epoll_event event = {.events = EPOLLIN | EPOLLET,
@@ -344,15 +344,15 @@
return {};
}
-Status<void> BufferHubQueue::DetachBuffer(size_t slot) {
- ALOGD_IF(TRACE, "BufferHubQueue::DetachBuffer: slot=%zu", slot);
+Status<void> BufferHubQueue::RemoveBuffer(size_t slot) {
+ ALOGD_IF(TRACE, "BufferHubQueue::RemoveBuffer: slot=%zu", slot);
if (buffers_[slot]) {
const int ret =
epoll_fd_.Control(EPOLL_CTL_DEL, buffers_[slot]->event_fd(), nullptr);
if (ret < 0) {
ALOGE(
- "BufferHubQueue::DetachBuffer: Failed to detach buffer from epoll "
+ "BufferHubQueue::RemoveBuffer: Failed to remove buffer from epoll "
"set: "
"%s",
strerror(-ret));
@@ -479,16 +479,16 @@
return Enqueue(buffer, slot);
}
-Status<void> ProducerQueue::DetachBuffer(size_t slot) {
+Status<void> ProducerQueue::RemoveBuffer(size_t slot) {
auto status =
- InvokeRemoteMethod<BufferHubRPC::ProducerQueueDetachBuffer>(slot);
+ InvokeRemoteMethod<BufferHubRPC::ProducerQueueRemoveBuffer>(slot);
if (!status) {
- ALOGE("ProducerQueue::DetachBuffer: Failed to detach producer buffer: %s",
+ ALOGE("ProducerQueue::RemoveBuffer: Failed to remove producer buffer: %s",
status.GetErrorMessage().c_str());
return status.error_status();
}
- return BufferHubQueue::DetachBuffer(slot);
+ return BufferHubQueue::RemoveBuffer(slot);
}
Status<std::shared_ptr<BufferProducer>> ProducerQueue::Dequeue(
diff --git a/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
index 4b3dd7a..7dd076a 100644
--- a/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
+++ b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
@@ -633,9 +633,9 @@
}
status_t BufferHubQueueProducer::RemoveBuffer(size_t slot) {
- auto status = queue_->DetachBuffer(slot);
+ auto status = queue_->RemoveBuffer(slot);
if (!status) {
- ALOGE("BufferHubQueueProducer::RemoveBuffer: Failed to detach buffer: %s",
+ ALOGE("BufferHubQueueProducer::RemoveBuffer: Failed to remove buffer: %s",
status.GetErrorMessage().c_str());
return INVALID_OPERATION;
}
diff --git a/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h b/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h
index e62e832..fa7aa04 100644
--- a/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h
+++ b/libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h
@@ -109,9 +109,9 @@
pdx::Status<void> AddBuffer(const std::shared_ptr<BufferHubBuffer>& buffer,
size_t slot);
- // Called by ProducerQueue::DetachBuffer and ConsumerQueue::DetachBuffer only
+ // Called by ProducerQueue::RemoveBuffer and ConsumerQueue::RemoveBuffer only
// to deregister a buffer for epoll and internal bookkeeping.
- virtual pdx::Status<void> DetachBuffer(size_t slot);
+ virtual pdx::Status<void> RemoveBuffer(size_t slot);
// Dequeue a buffer from the free queue, blocking until one is available. The
// timeout argument specifies the number of milliseconds that |Dequeue()| will
@@ -273,8 +273,8 @@
pdx::Status<void> AddBuffer(const std::shared_ptr<BufferProducer>& buffer,
size_t slot);
- // Detach producer buffer from the queue.
- pdx::Status<void> DetachBuffer(size_t slot) override;
+ // Remove producer buffer from the queue.
+ pdx::Status<void> RemoveBuffer(size_t slot) override;
// Dequeue a producer buffer to write. The returned buffer in |Gain|'ed mode,
// and caller should call Post() once it's done writing to release the buffer
diff --git a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp
index 064e3fd..228212e 100644
--- a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp
+++ b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue-test.cpp
@@ -167,7 +167,7 @@
}
}
-TEST_F(BufferHubQueueTest, TestDetach) {
+TEST_F(BufferHubQueueTest, TestRemoveBuffer) {
ASSERT_TRUE(CreateProducerQueue(config_builder_.Build(), UsagePolicy{}));
// Allocate buffers.
@@ -204,17 +204,17 @@
EXPECT_EQ(i, entry->slot);
}
- // Detach a buffer and make sure both queues reflect the change.
- ASSERT_TRUE(producer_queue_->DetachBuffer(buffers[0].slot));
+ // Remove a buffer and make sure both queues reflect the change.
+ ASSERT_TRUE(producer_queue_->RemoveBuffer(buffers[0].slot));
EXPECT_EQ(kBufferCount - 1, producer_queue_->capacity());
- // As long as the detached buffer is still alive the consumer queue won't know
+ // As long as the removed buffer is still alive the consumer queue won't know
// its gone.
EXPECT_EQ(kBufferCount, consumer_queue_->capacity());
EXPECT_FALSE(consumer_queue_->HandleQueueEvents());
EXPECT_EQ(kBufferCount, consumer_queue_->capacity());
- // Release the detached buffer.
+ // Release the removed buffer.
buffers[0].buffer = nullptr;
// Now the consumer queue should know it's gone.
@@ -233,8 +233,8 @@
EXPECT_FALSE(consumer_queue_->HandleQueueEvents());
EXPECT_EQ(kBufferCount, consumer_queue_->capacity());
- // Detach and allocate a buffer.
- ASSERT_TRUE(producer_queue_->DetachBuffer(buffers[1].slot));
+ // Remove and allocate a buffer.
+ ASSERT_TRUE(producer_queue_->RemoveBuffer(buffers[1].slot));
EXPECT_EQ(kBufferCount - 1, producer_queue_->capacity());
buffers[1].buffer = nullptr;
@@ -249,8 +249,8 @@
EXPECT_FALSE(consumer_queue_->HandleQueueEvents());
EXPECT_EQ(kBufferCount, consumer_queue_->capacity());
- // Detach and allocate a buffer, but don't free the buffer right away.
- ASSERT_TRUE(producer_queue_->DetachBuffer(buffers[2].slot));
+ // Remove and allocate a buffer, but don't free the buffer right away.
+ ASSERT_TRUE(producer_queue_->RemoveBuffer(buffers[2].slot));
EXPECT_EQ(kBufferCount - 1, producer_queue_->capacity());
AllocateBuffer(&slot);
@@ -263,7 +263,7 @@
EXPECT_EQ(kBufferCount, consumer_queue_->capacity());
// Release the producer buffer to trigger a POLLHUP event for an already
- // detached buffer.
+ // removed buffer.
buffers[2].buffer = nullptr;
EXPECT_EQ(kBufferCount, consumer_queue_->capacity());
EXPECT_FALSE(consumer_queue_->HandleQueueEvents());
diff --git a/libs/vr/libdvr/dvr_buffer_queue.cpp b/libs/vr/libdvr/dvr_buffer_queue.cpp
index d76eaf6..5543e73 100644
--- a/libs/vr/libdvr/dvr_buffer_queue.cpp
+++ b/libs/vr/libdvr/dvr_buffer_queue.cpp
@@ -112,11 +112,11 @@
// returned from |queue_->Dequeue| may still have the old buffer dimension
// or format. Retry up to BufferHubQueue::kMaxQueueCapacity times or until
// we dequeued a buffer with new configuration.
- auto detach_status = producer_queue_->DetachBuffer(slot);
- if (!detach_status) {
- ALOGE("DvrWriteBufferQueue::Dequeue: Failed to detach buffer: %s",
- detach_status.GetErrorMessage().c_str());
- return -detach_status.error();
+ auto remove_status = producer_queue_->RemoveBuffer(slot);
+ if (!remove_status) {
+ ALOGE("DvrWriteBufferQueue::Dequeue: Failed to remove buffer: %s",
+ remove_status.GetErrorMessage().c_str());
+ return -remove_status.error();
}
auto allocate_status = producer_queue_->AllocateBuffer(
diff --git a/services/vr/bufferhubd/producer_queue_channel.cpp b/services/vr/bufferhubd/producer_queue_channel.cpp
index 605b8fb..b8bb728 100644
--- a/services/vr/bufferhubd/producer_queue_channel.cpp
+++ b/services/vr/bufferhubd/producer_queue_channel.cpp
@@ -76,9 +76,9 @@
message);
return true;
- case BufferHubRPC::ProducerQueueDetachBuffer::Opcode:
- DispatchRemoteMethod<BufferHubRPC::ProducerQueueDetachBuffer>(
- *this, &ProducerQueueChannel::OnProducerQueueDetachBuffer, message);
+ case BufferHubRPC::ProducerQueueRemoveBuffer::Opcode:
+ DispatchRemoteMethod<BufferHubRPC::ProducerQueueRemoveBuffer>(
+ *this, &ProducerQueueChannel::OnProducerQueueRemoveBuffer, message);
return true;
default:
@@ -276,11 +276,11 @@
return {{std::move(buffer_handle), slot}};
}
-Status<void> ProducerQueueChannel::OnProducerQueueDetachBuffer(
+Status<void> ProducerQueueChannel::OnProducerQueueRemoveBuffer(
Message& /*message*/, size_t slot) {
if (buffers_[slot].expired()) {
ALOGE(
- "ProducerQueueChannel::OnProducerQueueDetachBuffer: trying to detach "
+ "ProducerQueueChannel::OnProducerQueueRemoveBuffer: trying to remove "
"an invalid buffer producer at slot %zu",
slot);
return ErrorStatus(EINVAL);
@@ -288,7 +288,7 @@
if (capacity_ == 0) {
ALOGE(
- "ProducerQueueChannel::OnProducerQueueDetachBuffer: trying to detach a "
+ "ProducerQueueChannel::OnProducerQueueRemoveBuffer: trying to remove a "
"buffer producer while the queue's capacity is already zero.");
return ErrorStatus(EINVAL);
}
diff --git a/services/vr/bufferhubd/producer_queue_channel.h b/services/vr/bufferhubd/producer_queue_channel.h
index 212a90d..fd519c5 100644
--- a/services/vr/bufferhubd/producer_queue_channel.h
+++ b/services/vr/bufferhubd/producer_queue_channel.h
@@ -40,7 +40,7 @@
// Detach a BufferHubProducer indicated by |slot|. Note that the buffer must
// be in Gain'ed state for the producer queue to detach.
- pdx::Status<void> OnProducerQueueDetachBuffer(pdx::Message& message,
+ pdx::Status<void> OnProducerQueueRemoveBuffer(pdx::Message& message,
size_t slot);
void AddConsumer(ConsumerQueueChannel* channel);