goldfish-opengl: threadID --> resourceId
The virtgpu resource ID is guranteed to be an system wide unique
identifier. Since all ASG ring buffers are backed by host coherent
memory, it makes to identify the ring based on the resource ID.
We can also use gettid(..) as well, but since we need to tie the
lifetime of the ASG external blob to the virtgpu resource, resource
ID along does the trick.
BUG=235485545
TEST=compile
Change-Id: I1b3c417358abd499186ba374935d79756648602b
diff --git a/shared/GoldfishAddressSpace/include/goldfish_address_space.h b/shared/GoldfishAddressSpace/include/goldfish_address_space.h
index ca888c2..1cafd0c 100644
--- a/shared/GoldfishAddressSpace/include/goldfish_address_space.h
+++ b/shared/GoldfishAddressSpace/include/goldfish_address_space.h
@@ -143,7 +143,7 @@
uint64_t offset;
uint64_t size;
uint64_t metadata;
- uint32_t threadID;
+ uint32_t resourceId;
uint32_t wait_fd;
uint32_t wait_flags;
uint32_t direction;
diff --git a/shared/GoldfishAddressSpace/include/goldfish_address_space_android.impl b/shared/GoldfishAddressSpace/include/goldfish_address_space_android.impl
index e3be37b..c77a802 100644
--- a/shared/GoldfishAddressSpace/include/goldfish_address_space_android.impl
+++ b/shared/GoldfishAddressSpace/include/goldfish_address_space_android.impl
@@ -90,7 +90,7 @@
{
struct address_space_ping request;
::memset(&request, 0, sizeof(request));
- request.threadID = sizeof(request);
+ request.resourceId = sizeof(request);
request.metadata = type;
long ret = ioctl_ping(fd, &request);
@@ -374,7 +374,7 @@
if (m_useSharedSlots) {
// shared memory slots are supported
::memset(&request, 0, sizeof(request));
- request.threadID = sizeof(request);
+ request.resourceId = sizeof(request);
request.size = size;
request.metadata = HOST_MEMORY_ALLOCATOR_COMMAND_ALLOCATE_ID;
@@ -395,7 +395,7 @@
}
::memset(&request, 0, sizeof(request));
- request.threadID = sizeof(request);
+ request.resourceId = sizeof(request);
request.offset = block->offset();
request.size = block->size();
request.metadata = HOST_MEMORY_ALLOCATOR_COMMAND_ALLOCATE_ID;
@@ -428,7 +428,7 @@
if (block->guestPtr()) {
struct address_space_ping request;
::memset(&request, 0, sizeof(request));
- request.threadID = sizeof(request);
+ request.resourceId = sizeof(request);
request.offset = block->offset();
request.metadata = HOST_MEMORY_ALLOCATOR_COMMAND_UNALLOCATE_ID;
@@ -561,11 +561,11 @@
// kVirtioGpuAddressSpaceContextCreateWithSubdevice | subdeviceType
const uint32_t kVirtioGpuAddressSpaceContextCreateWithSubdevice = 0x1001;
-// kVirtioGpuAddressSpacePing | offset_lo | offset_hi | size_lo | size_hi | metadata_lo | metadata_hi | threadID | wait_fd | wait_flags | direction
+// kVirtioGpuAddressSpacePing | offset_lo | offset_hi | size_lo | size_hi | metadata_lo | metadata_hi | resourceId | wait_fd | wait_flags | direction
// no output
const uint32_t kVirtioGpuAddressSpacePing = 0x1002;
-// kVirtioGpuAddressSpacePingWithResponse | resp_resid | offset_lo | offset_hi | metadata_lo | metadata_hi | threadID | wait_fd | wait_flags | direction
+// kVirtioGpuAddressSpacePingWithResponse | resp_resid | offset_lo | offset_hi | metadata_lo | metadata_hi | resourceId | wait_fd | wait_flags | direction
// out: same as input then | out: error
const uint32_t kVirtioGpuAddressSpacePingWithResponse = 0x1003;
@@ -577,7 +577,7 @@
(uint32_t)(info->offset), (uint32_t)(info->offset >> 32),
(uint32_t)(info->size), (uint32_t)(info->size >> 32),
(uint32_t)(info->metadata), (uint32_t)(info->metadata >> 32),
- (uint32_t)(info->threadID), (uint32_t)(info->wait_fd),
+ (uint32_t)(info->resourceId), (uint32_t)(info->wait_fd),
(uint32_t)(info->wait_flags), (uint32_t)(info->direction),
};
@@ -756,7 +756,7 @@
(uint32_t)(ping->offset), (uint32_t)(ping->offset >> 32),
(uint32_t)(ping->size), (uint32_t)(ping->size >> 32),
(uint32_t)(ping->metadata), (uint32_t)(ping->metadata >> 32),
- (uint32_t)(ping->threadID), (uint32_t)(ping->wait_fd),
+ (uint32_t)(ping->resourceId), (uint32_t)(ping->wait_fd),
(uint32_t)(ping->wait_flags), (uint32_t)(ping->direction),
};
@@ -792,7 +792,7 @@
ping->offset = buildu64(respWords[0], respWords[1]);
ping->size = buildu64(respWords[2], respWords[3]);
ping->metadata = buildu64(respWords[4], respWords[5]);
- ping->threadID = respWords[6];
+ ping->resourceId = respWords[6];
ping->wait_fd = respWords[7];
ping->wait_flags = respWords[8];
ping->direction = respWords[9];
diff --git a/system/OpenglSystemCommon/AddressSpaceStream.cpp b/system/OpenglSystemCommon/AddressSpaceStream.cpp
index 59e4518..b5a5da5 100644
--- a/system/OpenglSystemCommon/AddressSpaceStream.cpp
+++ b/system/OpenglSystemCommon/AddressSpaceStream.cpp
@@ -673,7 +673,7 @@
AEMU_SCOPED_TRACE("PING");
struct address_space_ping request;
request.metadata = ASG_NOTIFY_AVAILABLE;
- request.threadID = m_threadID;
+ request.resourceId = m_resourceId;
m_ops.ping(m_handle, &request);
++m_notifs;
}
diff --git a/system/OpenglSystemCommon/AddressSpaceStream.h b/system/OpenglSystemCommon/AddressSpaceStream.h
index a6f269a..9871c0c 100644
--- a/system/OpenglSystemCommon/AddressSpaceStream.h
+++ b/system/OpenglSystemCommon/AddressSpaceStream.h
@@ -63,8 +63,8 @@
#endif
}
- void setThreadID(uint32_t id) {
- m_threadID = id;
+ void setResourceId(uint32_t id) {
+ m_resourceId = id;
}
private:
@@ -113,7 +113,7 @@
uint64_t m_backoffFactor;
size_t m_ringStorageSize;
- uint32_t m_threadID = 0;
+ uint32_t m_resourceId = 0;
};
#endif
