From 947d34ecad84bdaf496748eeb9f6e35b33deb339 Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Fri, 29 Mar 2019 14:03:53 -0700 Subject: Change slot generation for BufferState BufferState layers now do slot generation with buffer death considered appropriately. When a buffer dies, the slot will be pushed onto a stack of available slots to be reused at the next opportunity. This should mimic BufferQueue slot behavior and prevent Composer Resources from growing too large. Test: build, boot, manual Bug: 129351223 Change-Id: Icef9592593cacb0b5c6b12f6679fc2c4dabdcd19 --- libs/gui/ISurfaceComposer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/gui/ISurfaceComposer.cpp') diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp index a3165ddb9e..a8b1a4c7af 100644 --- a/libs/gui/ISurfaceComposer.cpp +++ b/libs/gui/ISurfaceComposer.cpp @@ -69,7 +69,7 @@ public: const sp& applyToken, const InputWindowCommands& commands, int64_t desiredPresentTime, - const cached_buffer_t& uncacheBuffer, + const client_cache_t& uncacheBuffer, const std::vector& listenerCallbacks) { Parcel data, reply; data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor()); @@ -88,8 +88,8 @@ public: data.writeStrongBinder(applyToken); commands.write(data); data.writeInt64(desiredPresentTime); - data.writeStrongBinder(uncacheBuffer.token); - data.writeUint64(uncacheBuffer.cacheId); + data.writeWeakBinder(uncacheBuffer.token); + data.writeUint64(uncacheBuffer.id); if (data.writeVectorSize(listenerCallbacks) == NO_ERROR) { for (const auto& [listener, callbackIds] : listenerCallbacks) { @@ -991,9 +991,9 @@ status_t BnSurfaceComposer::onTransact( int64_t desiredPresentTime = data.readInt64(); - cached_buffer_t uncachedBuffer; - uncachedBuffer.token = data.readStrongBinder(); - uncachedBuffer.cacheId = data.readUint64(); + client_cache_t uncachedBuffer; + uncachedBuffer.token = data.readWeakBinder(); + uncachedBuffer.id = data.readUint64(); std::vector listenerCallbacks; int32_t listenersSize = data.readInt32(); -- cgit v1.2.3-59-g8ed1b