commit ab3f016ea7f0d3c5e1c8e69d88da9c35eadb69f5
author Jiyong Park <jiyong@google.com> Tue Jul 23 16:53:24 2024 +0900
committer Jiyong Park <jiyong@google.com> Tue Jul 23 22:16:53 2024 +0900
tree e6de4d192f88b9b339766a702be49150819980f0
parent 6a37dca5ff5f8b48660b4821e5c9acbf4cb9bde2

Distinguish error messages from scanout surface and cursor surface

... by naming them differently.

Bug: N/A
Test: m

Change-Id: I928fa3702a035bbfd3f20fc98d2bbf085e986477

libs/android_display_backend/crosvm_android_display_client.cpp

diff --git a/libs/android_display_backend/crosvm_android_display_client.cpp b/libs/android_display_backend/crosvm_android_display_client.cpp
index 1ea5832..cb39377 100644
--- a/libs/android_display_backend/crosvm_android_display_client.cpp
+++ b/libs/android_display_backend/crosvm_android_display_client.cpp
@@ -68,7 +68,7 @@
 // other end of the DisplayService is not in the foreground / is paused.
 class AndroidDisplaySurface {
 public:
-    AndroidDisplaySurface() = default;
+    AndroidDisplaySurface(const std::string& name) : mName(name) {}
     virtual ~AndroidDisplaySurface() = default;
 
     void setSurface(Surface* surface) {
@@ -171,12 +171,16 @@
         return {};
     }
 
+    const std::string& name() const { return mName; }
+
 private:
     // Note: crosvm always uses BGRA8888 or BGRX8888. See devices/src/virtio/gpu/mod.rs in
     // crosvm where the SetScanoutBlob command is handled. Let's use BGRA not BGRX with a hope
     // that we will need alpha blending for the cursor surface.
     static constexpr const int kFormat = HAL_PIXEL_FORMAT_BGRA_8888;
 
+    std::string mName;
+
     std::mutex mSurfaceMutex;
     std::unique_ptr<Surface> mNativeSurface;
     std::condition_variable mNativeSurfaceReady;
@@ -224,8 +228,8 @@
     }
 
 private:
-    AndroidDisplaySurface mScanout;
-    AndroidDisplaySurface mCursor;
+    AndroidDisplaySurface mScanout{"scanout"};
+    AndroidDisplaySurface mCursor{"cursor"};
     ndk::ScopedFileDescriptor mCursorStream;
 };
 
@@ -309,7 +313,8 @@
     }
 
     if (auto ret = displaySurface->configure(width, height); !ret.ok()) {
-        ctx->errorf(ret.error().message().c_str());
+        ctx->errorf("Failed to configure surface %s: %s", displaySurface->name().c_str(),
+                    ret.error().message().c_str());
     }
 
     displaySurface->waitForNativeSurface(); // this can block
@@ -339,7 +344,8 @@
 
     auto ret = surface->lock(out_buffer);
     if (!ret.ok()) {
-        ctx->errorf("Failed to lock surface: %s", ret.error().message().c_str());
+        ctx->errorf("Failed to lock surface %s: %s", surface->name().c_str(),
+                    ret.error().message().c_str());
         return false;
     }
 
@@ -370,7 +376,7 @@
 
     auto ret = surface->unlockAndPost();
     if (!ret.ok()) {
-        ctx->errorf("Failed to unlock and post AndroidDisplaySurface: %s",
+        ctx->errorf("Failed to unlock and post for surface %s: %s", surface->name().c_str(),
                     ret.error().message().c_str());
     }
     return;