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
diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp
index a3165dd..a8b1a4c 100644
--- a/libs/gui/ISurfaceComposer.cpp
+++ b/libs/gui/ISurfaceComposer.cpp
@@ -69,7 +69,7 @@
const sp<IBinder>& applyToken,
const InputWindowCommands& commands,
int64_t desiredPresentTime,
- const cached_buffer_t& uncacheBuffer,
+ const client_cache_t& uncacheBuffer,
const std::vector<ListenerCallbacks>& listenerCallbacks) {
Parcel data, reply;
data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
@@ -88,8 +88,8 @@
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 @@
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> listenerCallbacks;
int32_t listenersSize = data.readInt32();
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 3077b21..075bb52 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -87,8 +87,8 @@
colorTransform.asArray(), 16 * sizeof(float));
output.writeFloat(cornerRadius);
output.writeBool(hasListenerCallbacks);
- output.writeStrongBinder(cachedBuffer.token);
- output.writeUint64(cachedBuffer.cacheId);
+ output.writeWeakBinder(cachedBuffer.token);
+ output.writeUint64(cachedBuffer.id);
output.writeParcelable(metadata);
output.writeFloat(bgColorAlpha);
@@ -157,8 +157,8 @@
colorTransform = mat4(static_cast<const float*>(input.readInplace(16 * sizeof(float))));
cornerRadius = input.readFloat();
hasListenerCallbacks = input.readBool();
- cachedBuffer.token = input.readStrongBinder();
- cachedBuffer.cacheId = input.readUint64();
+ cachedBuffer.token = input.readWeakBinder();
+ cachedBuffer.id = input.readUint64();
input.readParcelable(&metadata);
bgColorAlpha = input.readFloat();
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 611da89..a19be12 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -387,9 +387,9 @@
void SurfaceComposerClient::doUncacheBufferTransaction(uint64_t cacheId) {
sp<ISurfaceComposer> sf(ComposerService::getComposerService());
- cached_buffer_t uncacheBuffer;
+ client_cache_t uncacheBuffer;
uncacheBuffer.token = BufferCache::getInstance().getToken();
- uncacheBuffer.cacheId = cacheId;
+ uncacheBuffer.id = cacheId;
sf->setTransactionState({}, {}, 0, nullptr, {}, -1, uncacheBuffer, {});
}
@@ -422,7 +422,7 @@
}
s->what |= layer_state_t::eCachedBufferChanged;
s->cachedBuffer.token = BufferCache::getInstance().getToken();
- s->cachedBuffer.cacheId = cacheId;
+ s->cachedBuffer.id = cacheId;
// If we have more buffers than the size of the cache, we should stop caching so we don't
// evict other buffers in this transaction
diff --git a/libs/gui/include/gui/ISurfaceComposer.h b/libs/gui/include/gui/ISurfaceComposer.h
index 415b2d5..e8c7a39 100644
--- a/libs/gui/include/gui/ISurfaceComposer.h
+++ b/libs/gui/include/gui/ISurfaceComposer.h
@@ -44,7 +44,7 @@
namespace android {
// ----------------------------------------------------------------------------
-struct cached_buffer_t;
+struct client_cache_t;
struct ComposerState;
struct DisplayState;
struct DisplayInfo;
@@ -137,7 +137,7 @@
const sp<IBinder>& applyToken,
const InputWindowCommands& inputWindowCommands,
int64_t desiredPresentTime,
- const cached_buffer_t& uncacheBuffer,
+ const client_cache_t& uncacheBuffer,
const std::vector<ListenerCallbacks>& listenerCallbacks) = 0;
/* signal that we're done booting.
diff --git a/libs/gui/include/gui/LayerState.h b/libs/gui/include/gui/LayerState.h
index 2256497..f438eb3 100644
--- a/libs/gui/include/gui/LayerState.h
+++ b/libs/gui/include/gui/LayerState.h
@@ -40,9 +40,13 @@
class Parcel;
class ISurfaceComposerClient;
-struct cached_buffer_t {
- sp<IBinder> token = nullptr;
- uint64_t cacheId;
+struct client_cache_t {
+ wp<IBinder> token = nullptr;
+ uint64_t id;
+
+ bool operator==(const client_cache_t& other) const { return id == other.id; }
+
+ bool isValid() const { return token != nullptr; }
};
/*
@@ -187,7 +191,7 @@
InputWindowInfo inputInfo;
#endif
- cached_buffer_t cachedBuffer;
+ client_cache_t cachedBuffer;
LayerMetadata metadata;
diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp
index d5bdd74..014b1fa 100644
--- a/libs/gui/tests/Surface_test.cpp
+++ b/libs/gui/tests/Surface_test.cpp
@@ -561,8 +561,7 @@
const Vector<DisplayState>& /*displays*/, uint32_t /*flags*/,
const sp<IBinder>& /*applyToken*/,
const InputWindowCommands& /*inputWindowCommands*/,
- int64_t /*desiredPresentTime*/,
- const cached_buffer_t& /*cachedBuffer*/,
+ int64_t /*desiredPresentTime*/, const client_cache_t& /*cachedBuffer*/,
const std::vector<ListenerCallbacks>& /*listenerCallbacks*/) override {
}