diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-02-20 13:10:52 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-02-20 15:16:00 -0700 |
| commit | 7f206e69208524a749f70b1c2d4a2d1f34f4262a (patch) | |
| tree | 22e0c4abaa0b961f1d5ad70c501ea704a2dd3ac6 | |
| parent | 104a4e737e0544f9fa5888f8ee3a49a653b9dded (diff) | |
| download | usermoji-7f206e69208524a749f70b1c2d4a2d1f34f4262a.tar.xz | |
glave: Improve logging for anomalous conditions around Map and Unmap memory
| -rwxr-xr-x | glave-generate.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/glave-generate.py b/glave-generate.py index b47ccc55..75ad6244 100755 --- a/glave-generate.py +++ b/glave-generate.py @@ -330,6 +330,9 @@ class Subcommand(object): 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 @@ class Subcommand(object): 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 @@ class Subcommand(object): 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(' }') |