From 5d8646c41ff3022692fa9d7f5f1644a2a60641e4 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 2 Feb 2010 15:34:55 +0800 Subject: egl: Add EGL_DRIVERS_PATH environment variable. EGL_DRIVERS_PATH gives a list of colon-separated directories. The given directories will be searched when preloading drivers. This is based on Mike Stroyan's patch, which honors the variable in _eglPreloadDisplayDrivers. It is extended to honor the variable also in _eglPreloadUserDriver and _eglPreloadDefaultDriver in this version. --- src/egl/main/egldriver.c | 290 +++++++++++++++++++++++++++++++---------------- 1 file changed, 191 insertions(+), 99 deletions(-) (limited to 'src/egl/main/egldriver.c') diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 1dadbf783b..139f839685 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -25,6 +25,7 @@ #include #include #include +#include #endif @@ -55,21 +56,7 @@ close_library(HMODULE lib) static const char * library_suffix(void) { - return "dll"; -} - - -static EGLBoolean -make_library_path(char *buf, unsigned int size, const char *name) -{ - EGLBoolean need_suffix; - const char *suffix = ".dll"; - int ret; - - need_suffix = (strchr(name, '.') == NULL); - ret = snprintf(buf, size, "%s%s", name, (need_suffix) ? suffix : ""); - - return ((unsigned int) ret < size); + return ".dll"; } @@ -96,30 +83,13 @@ close_library(void *lib) static const char * library_suffix(void) { - return "so"; -} - - -static EGLBoolean -make_library_path(char *buf, unsigned int size, const char *name) -{ - EGLBoolean need_dir, need_suffix; - const char *suffix = ".so"; - int ret; - - need_dir = (strchr(name, '/') == NULL); - need_suffix = (strchr(name, '.') == NULL); - - ret = snprintf(buf, size, "%s%s%s", - (need_dir) ? _EGL_DRIVER_SEARCH_DIR"/" : "", name, - (need_suffix) ? suffix : ""); - - return ((unsigned int) ret < size); + return ".so"; } #else /* _EGL_PLATFORM_NO_OS */ + static const char DefaultDriverName[] = "builtin"; typedef void *lib_handle; @@ -143,14 +113,6 @@ library_suffix(void) } -static EGLBoolean -make_library_path(char *buf, unsigned int size, const char *name) -{ - int ret = snprintf(buf, size, name); - return ((unsigned int) ret < size); -} - - #endif @@ -298,6 +260,178 @@ _eglMatchDriver(_EGLDisplay *dpy) } +/** + * A preload function for use with _eglPreloadForEach. The preload data is the + * filename of the driver. This function stops on the first valid driver. + */ +static EGLBoolean +_eglPreloadFile(const char *dir, size_t len, void *preload_data) +{ + _EGLDriver *drv; + char path[1024]; + const char *filename = (const char *) preload_data; + size_t flen = strlen(filename); + + /* make a full path */ + if (len + flen + 2 > sizeof(path)) + return EGL_TRUE; + if (len) { + memcpy(path, dir, len); + path[len++] = '/'; + } + memcpy(path + len, filename, flen); + len += flen; + path[len] = '\0'; + + drv = _eglLoadDriver(path, NULL); + /* fix the path and load again */ + if (!drv && library_suffix()) { + const char *suffix = library_suffix(); + size_t slen = strlen(suffix); + const char *p; + EGLBoolean need_suffix; + + p = filename + flen - slen; + need_suffix = (p < filename || strcmp(p, suffix) != 0); + if (need_suffix && len + slen + 1 <= sizeof(path)) { + strcpy(path + len, suffix); + drv = _eglLoadDriver(path, NULL); + } + } + if (!drv) + return EGL_TRUE; + + /* remember the driver and stop */ + _eglGlobal.Drivers[_eglGlobal.NumDrivers++] = drv; + return EGL_FALSE; +} + + +/** + * A preload function for use with _eglPreloadForEach. The preload data is the + * pattern (prefix) of the files to look for. + */ +static EGLBoolean +_eglPreloadPattern(const char *dir, size_t len, void *preload_data) +{ +#if defined(_EGL_PLATFORM_POSIX) + const char *prefix, *suffix; + size_t prefix_len, suffix_len; + DIR *dirp; + struct dirent *dirent; + char path[1024]; + + if (len + 2 > sizeof(path)) + return EGL_TRUE; + if (len) { + memcpy(path, dir, len); + path[len++] = '/'; + } + path[len] = '\0'; + + dirp = opendir(path); + if (!dirp) + return EGL_TRUE; + + prefix = (const char *) preload_data; + prefix_len = strlen(prefix); + suffix = library_suffix(); + suffix_len = (suffix) ? strlen(suffix) : 0; + + while ((dirent = readdir(dirp))) { + _EGLDriver *drv; + size_t dirent_len = strlen(dirent->d_name); + const char *p; + + /* match the prefix */ + if (strncmp(dirent->d_name, prefix, prefix_len) != 0) + continue; + /* match the suffix */ + p = dirent->d_name + dirent_len - suffix_len; + if (p < dirent->d_name || strcmp(p, suffix) != 0) + continue; + + /* make a full path and load the driver */ + if (len + dirent_len + 1 <= sizeof(path)) { + strcpy(path + len, dirent->d_name); + drv = _eglLoadDriver(path, NULL); + if (drv) + _eglGlobal.Drivers[_eglGlobal.NumDrivers++] = drv; + } + } + + closedir(dirp); + + return EGL_TRUE; +#else /* _EGL_PLATFORM_POSIX */ + /* stop immediately */ + return EGL_FALSE; +#endif +} + + +/** + * Run the preload function on each driver directory and return the number of + * drivers loaded. + * + * The process may end prematurely if the callback function returns false. + */ +static EGLint +_eglPreloadForEach(const char *search_path, + EGLBoolean (*preload)(const char *, size_t, void *), + void *preload_data) +{ + const char *cur, *next; + size_t len; + EGLint num_drivers = _eglGlobal.NumDrivers; + + cur = search_path; + while (cur) { + next = strchr(cur, ':'); + len = (next) ? next - cur : strlen(cur); + + if (!preload(cur, len, preload_data)) + break; + + cur = (next) ? next + 1 : NULL; + } + + return (_eglGlobal.NumDrivers - num_drivers); +} + + +/** + * Return a list of colon-separated driver directories. + */ +static const char * +_eglGetSearchPath(void) +{ + static const char *search_path; + +#if defined(_EGL_PLATFORM_POSIX) || defined(_EGL_PLATFORM_WINDOWS) + if (!search_path) { + static char buffer[1024]; + const char *p; + int ret; + + p = getenv("EGL_DRIVERS_PATH"); + if (p) { + ret = snprintf(buffer, sizeof(buffer), + "%s:%s", p, _EGL_DRIVER_SEARCH_DIR); + if (ret > 0 && ret < sizeof(buffer)) + search_path = buffer; + } + } + if (!search_path) + search_path = _EGL_DRIVER_SEARCH_DIR; +#else + search_path = ""; +#endif + + return search_path; +} + + /** * Preload a user driver. * @@ -307,25 +441,22 @@ static EGLBoolean _eglPreloadUserDriver(void) { #if defined(_EGL_PLATFORM_POSIX) || defined(_EGL_PLATFORM_WINDOWS) - _EGLDriver *drv; - char path[1024]; + const char *search_path = _eglGetSearchPath(); char *env; env = getenv("EGL_DRIVER"); +#if defined(_EGL_PLATFORM_POSIX) + if (env && strchr(env, '/')) + search_path = ""; +#endif if (!env) return EGL_FALSE; - if (!make_library_path(path, sizeof(path), env)) - return EGL_FALSE; - - drv = _eglLoadDriver(path, NULL); - if (!drv) { + if (!_eglPreloadForEach(search_path, _eglPreloadFile, (void *) env)) { _eglLog(_EGL_WARNING, "EGL_DRIVER is set to an invalid driver"); return EGL_FALSE; } - _eglGlobal.Drivers[_eglGlobal.NumDrivers++] = drv; - return EGL_TRUE; #else /* _EGL_PLATFORM_POSIX || _EGL_PLATFORM_WINDOWS */ return EGL_FALSE; @@ -346,10 +477,9 @@ static EGLBoolean _eglPreloadDisplayDrivers(void) { #if defined(_EGL_PLATFORM_POSIX) - const char *dpy, *suffix; - char path[1024], prefix[32]; - DIR *dirp; - struct dirent *dirent; + const char *dpy; + char prefix[32]; + int ret; dpy = getenv("EGL_DISPLAY"); if (!dpy || !dpy[0]) @@ -357,39 +487,12 @@ _eglPreloadDisplayDrivers(void) if (!dpy || !dpy[0]) return EGL_FALSE; - snprintf(prefix, sizeof(prefix), "egl_%s_", dpy); - suffix = library_suffix(); - - dirp = opendir(_EGL_DRIVER_SEARCH_DIR); - if (!dirp) + ret = snprintf(prefix, sizeof(prefix), "egl_%s_", dpy); + if (ret < 0 || ret >= sizeof(prefix)) return EGL_FALSE; - while ((dirent = readdir(dirp))) { - _EGLDriver *drv; - const char *p; - - /* match the prefix */ - if (strncmp(dirent->d_name, prefix, strlen(prefix)) != 0) - continue; - - /* match the suffix */ - p = strrchr(dirent->d_name, '.'); - if ((p && !suffix) || (!p && suffix)) - continue; - else if (p && suffix && strcmp(p + 1, suffix) != 0) - continue; - - snprintf(path, sizeof(path), - _EGL_DRIVER_SEARCH_DIR"/%s", dirent->d_name); - - drv = _eglLoadDriver(path, NULL); - if (drv) - _eglGlobal.Drivers[_eglGlobal.NumDrivers++] = drv; - } - - closedir(dirp); - - return (_eglGlobal.NumDrivers > 0); + return (_eglPreloadForEach(_eglGetSearchPath(), + _eglPreloadPattern, (void *) prefix) > 0); #else /* _EGL_PLATFORM_POSIX */ return EGL_FALSE; #endif @@ -402,19 +505,8 @@ _eglPreloadDisplayDrivers(void) static EGLBoolean _eglPreloadDefaultDriver(void) { - _EGLDriver *drv; - char path[1024]; - - if (!make_library_path(path, sizeof(path), DefaultDriverName)) - return EGL_FALSE; - - drv = _eglLoadDriver(path, NULL); - if (!drv) - return EGL_FALSE; - - _eglGlobal.Drivers[_eglGlobal.NumDrivers++] = drv; - - return EGL_TRUE; + return (_eglPreloadForEach(_eglGetSearchPath(), + _eglPreloadFile, (void *) DefaultDriverName) > 0); } -- cgit v1.2.3