glave: Improve logging for anomalous conditions around Map and Unmap memory
diff --git a/glave-generate.py b/glave-generate.py
index b47ccc5..75ad624 100755
--- a/glave-generate.py
+++ b/glave-generate.py
@@ -330,6 +330,9 @@
um_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**) &(pPacket->pData), entry->size, entry->pData);')
um_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pData));')
um_body.append(' entry->pData = NULL;')
+ um_body.append(' } else')
+ um_body.append(' {')
+ um_body.append(' glv_LogError("Failed to copy app memory into trace packet (idx = %u) on xglUnmapMemory\n", pHeader->global_packet_index);')
um_body.append(' }')
um_body.append(' result = real_xglUnmapMemory(mem);')
um_body.append(' pPacket->mem = mem;')
@@ -1961,9 +1964,9 @@
rc_body.append(' }')
rc_body.append(' XGLAllocInfo &info = it->second;')
rc_body.append(' if (info.pData != NULL)')
- rc_body.append(' {')
rc_body.append(' glv_LogWarn("add_mapping_to_mapData() data already mapped overwrite old mapping\\n");')
- rc_body.append(' }')
+ rc_body.append(' else if (pData == NULL)')
+ rc_body.append(' glv_LogWarn("add_mapping_to_mapData() adding NULL pointer\\n");')
rc_body.append(' info.pData = pData;')
rc_body.append(' }')
rc_body.append(' void rm_entry_from_mapData(XGL_GPU_MEMORY handle)')
@@ -1981,7 +1984,10 @@
rc_body.append(' XGLAllocInfo &info = it->second;')
rc_body.append(' if (!pData || !info.pData)')
rc_body.append(' {')
- rc_body.append(' glv_LogWarn("rm_mapping_from_mapData() null src or dest pointers\\n");')
+ rc_body.append(' if (!pData)')
+ rc_body.append(' glv_LogWarn("rm_mapping_from_mapData() null src pointer\\n");')
+ rc_body.append(' else')
+ rc_body.append(' glv_LogWarn("rm_mapping_from_mapData() null dest pointer size=%u\\n", info.size);')
rc_body.append(' info.pData = NULL;')
rc_body.append(' return;')
rc_body.append(' }')