lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grab linux library callbacks locally before calling them. Refs #1120

Browse Source 
* This should prevent recursive calls from re-processing the same list of
  callbacks
This commit is contained in:
baldurk
2018-10-04 16:15:05 +01:00
parent 7a6580bb0f
commit b7855d371f
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/posix/linux/linux_hook.cpp
+13 -9
View File
@@ -100,12 +100,14 @@ static void CheckLoadedLibraries()
*hook.orig = dlsym(handle, hook.function.c_str());
}
for(FunctionLoadCallback cb : libraryCallbacks[libName])
if(cb)
cb(handle);
std::vector<FunctionLoadCallback> callbacks;
// don't call callbacks again if the library is dlopen'd again
libraryCallbacks[libName].clear();
libraryCallbacks[libName].swap(callbacks);
for(FunctionLoadCallback cb : callbacks)
if(cb)
cb(handle);
}
}
}
@@ -133,12 +135,14 @@ void *intercept_dlopen(const char *filename, int flag, void *ret)
*hook.orig = dlsym(ret, hook.function.c_str());
}
for(FunctionLoadCallback cb : libraryCallbacks[libName])
if(cb)
cb(ret);
std::vector<FunctionLoadCallback> callbacks;
// don't call the callbacks again
libraryCallbacks[libName].clear();
// don't call callbacks again if the library is dlopen'd again
libraryCallbacks[libName].swap(callbacks);
for(FunctionLoadCallback cb : callbacks)
if(cb)
cb(handle);
ret = realdlopen("librenderdoc.so", flag);
break;