Use generic libpdx event bits facility in libvrflinger and bufferhubd.
Use the generic event bits abstraction to support UDS and ServiceFS
backends properly.
Bug: 34466748
Test: start/stop basicvr repeatedly; observe stable bufferhub counts.
Change-Id: I9f2ea67c25860ad7fb931938991a29a37f3391fc
diff --git a/services/vr/bufferhubd/producer_channel.cpp b/services/vr/bufferhubd/producer_channel.cpp
index c1ef22c..98a419f 100644
--- a/services/vr/bufferhubd/producer_channel.cpp
+++ b/services/vr/bufferhubd/producer_channel.cpp
@@ -60,8 +60,9 @@
}
ProducerChannel::~ProducerChannel() {
- ALOGD_IF(TRACE, "ProducerChannel::~ProducerChannel: channel_id=%d",
- channel_id());
+ ALOGD_IF(TRACE,
+ "ProducerChannel::~ProducerChannel: channel_id=%d buffer_id=%d",
+ channel_id(), buffer_id());
for (auto consumer : consumer_channels_)
consumer->OnProducerClosed();
}
@@ -274,8 +275,9 @@
// Attempt to merge the fences if necessary.
if (release_fence) {
if (returned_fence_) {
- LocalFence merged_fence(sync_merge(
- "bufferhub_merged", returned_fence_.get_fd(), release_fence.get_fd()));
+ LocalFence merged_fence(sync_merge("bufferhub_merged",
+ returned_fence_.get_fd(),
+ release_fence.get_fd()));
const int error = errno;
if (!merged_fence) {
ALOGE("ProducerChannel::OnConsumerRelease: Failed to merge fences: %s",
@@ -366,10 +368,9 @@
bool ProducerChannel::CheckParameters(int width, int height, int format,
int usage, size_t meta_size_bytes,
size_t slice_count) {
- return slices_.size() == slice_count &&
- meta_size_bytes == meta_size_bytes_ && slices_[0].width() == width &&
- slices_[0].height() == height && slices_[0].format() == format &&
- slices_[0].usage() == usage;
+ return slices_.size() == slice_count && meta_size_bytes == meta_size_bytes_ &&
+ slices_[0].width() == width && slices_[0].height() == height &&
+ slices_[0].format() == format && slices_[0].usage() == usage;
}
} // namespace dvr