Skip to content

Feature improved error handling and code cleanup v3 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eliasvan wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature improved error handling and code cleanup v3 #8

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b415a35
Remove code duplication by using C macros: add and use RETURN_ON_MATC…
Eliasvan Oct 18, 2016
4490ca6
Refactor the code by adding some currently unneeded error handling to…
Eliasvan Oct 2, 2016
acf1625
Error out when symbol was not found in dynamic library
Eliasvan Oct 2, 2016
dda8962
Remove code duplication: add load_func_from_next() and load_func_from…
Eliasvan Oct 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 48 additions & 42 deletions frametime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,19 @@ static void init_dlsym() {
void *dlsym(void *handle, const char *symbol) {
// High evil wrapping this function.

if (symbol && !strcmp(symbol, "glXGetProcAddressARB"))
return glXGetProcAddressARB;
if (symbol && !strcmp(symbol, "glXSwapBuffers"))
return glXSwapBuffers;
#ifndef NO_EGL
if (symbol && !strcmp(symbol, "eglSwapBuffers"))
return eglSwapBuffers;
#endif
# define RETURN_ON_MATCH(function_name) \
do { \
if (symbol && !strcmp(symbol, #function_name)) \
return function_name; \
} while (0)

RETURN_ON_MATCH(glXGetProcAddressARB);
RETURN_ON_MATCH(glXSwapBuffers);
# ifndef NO_EGL
RETURN_ON_MATCH(eglSwapBuffers);
# endif

# undef RETURN_ON_MATCH

if (!real_dlsym)
init_dlsym();
Expand Down Expand Up @@ -132,6 +137,36 @@ EGLBoolean eglSwapBuffers(EGLDisplay display, EGLSurface surface) {
}
#endif

static void *load_func_from_next(const char * const function_name) {

dlerror();
void * const real_function = real_dlsym(RTLD_NEXT, function_name);

const char * const err = dlerror();
if (err)
die(PREFIX "dlsym failed: %s\n", err);

return real_function;
}

static void *load_func_from_lib(const char * const function_name, const char * const library_name) {

// If possible, load from the next object such that we don't have to load the lib.
void *real_function = load_func_from_next(function_name);

if (!real_function) {
void * const lib = dlopen(library_name, RTLD_LAZY);
if (!lib)
die(PREFIX "Failed to open %s\n", library_name);

real_function = real_dlsym(lib, function_name);
if (!real_function)
die(PREFIX "Failed to find %s in %s\n", function_name, library_name);
}

return real_function;
}

static void init() __attribute__((constructor));
static void deinit() __attribute__((destructor));

Expand All @@ -148,40 +183,11 @@ static void init() {
if (!real_dlsym)
init_dlsym();

dlerror();
real_glXSwapBuffers = real_dlsym(RTLD_NEXT, "glXSwapBuffers");

const char *err = dlerror();
if (err)
die(PREFIX "dlsym failed: %s\n", err);

real_glXGetProcAddressARB = real_dlsym(RTLD_NEXT, "glXGetProcAddressARB");

// If the app loads libs dynamically, the symbol may be NULL.
if (!real_glXSwapBuffers) {
void *libgl = dlopen("libGL.so", RTLD_LAZY);
if (!libgl)
die(PREFIX "dynamic libGL failed\n");
real_glXSwapBuffers = real_dlsym(libgl, "glXSwapBuffers");
real_glXGetProcAddressARB = real_dlsym(libgl, "glXGetProcAddressARB");
}

#ifndef NO_EGL
dlerror();
real_eglSwapBuffers = real_dlsym(RTLD_NEXT, "eglSwapBuffers");

err = dlerror();
if (err)
die(PREFIX "dlsym failed: %s\n", err);

// If the app loads libs dynamically, the symbol may be NULL.
if (!real_eglSwapBuffers) {
void *libegl = dlopen("libEGL.so", RTLD_LAZY);
if (!libegl)
die(PREFIX "dynamic libEGL failed\n");
real_eglSwapBuffers = real_dlsym(libegl, "eglSwapBuffers");
}
#endif
real_glXGetProcAddressARB = load_func_from_lib("glXGetProcAddressARB", "libGL.so");
real_glXSwapBuffers = load_func_from_lib("glXSwapBuffers", "libGL.so");
# ifndef NO_EGL
real_eglSwapBuffers = load_func_from_lib("eglSwapBuffers", "libEGL.so");
# endif
}

static void deinit() {
Expand Down