For the series:
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Tue, May 12, 2015 at 12:43 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
> The only user (egl_gallium) is not longer around.
>
> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
> ---
> src/egl/main/egldriver.c | 364
> ++---------------------------------------------
> 1 file changed, 13 insertions(+), 351 deletions(-)
>
> diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
> index 6983af9..4cadbc7 100644
> --- a/src/egl/main/egldriver.c
> +++ b/src/egl/main/egldriver.c
> @@ -45,21 +45,13 @@
> #include "egldriver.h"
> #include "egllog.h"
>
> -#if defined(_EGL_OS_UNIX)
> -#include <dlfcn.h>
> -#include <sys/types.h>
> -#include <dirent.h>
> -#include <unistd.h>
> -#endif
> -
> #ifdef _EGL_BUILT_IN_DRIVER_HAIKU
> _EGLDriver* _eglBuiltInDriverHaiku(const char* args);
> #endif
>
> typedef struct _egl_module {
> - char *Path;
> + char *Name;
> _EGLMain_t BuiltIn;
> - void *Handle;
> _EGLDriver *Driver;
> } _EGLModule;
>
> @@ -80,152 +72,23 @@ const struct {
> };
>
> /**
> - * Wrappers for dlopen/dlclose()
> - */
> -#if defined(_EGL_OS_WINDOWS)
> -
> -
> -typedef HMODULE lib_handle;
> -
> -static HMODULE
> -open_library(const char *filename)
> -{
> - return LoadLibrary(filename);
> -}
> -
> -static void
> -close_library(HMODULE lib)
> -{
> - FreeLibrary(lib);
> -}
> -
> -
> -static const char *
> -library_suffix(void)
> -{
> - return ".dll";
> -}
> -
> -
> -#elif defined(_EGL_OS_UNIX)
> -
> -
> -typedef void * lib_handle;
> -
> -static void *
> -open_library(const char *filename)
> -{
> - return dlopen(filename, RTLD_LAZY);
> -}
> -
> -static void
> -close_library(void *lib)
> -{
> - dlclose(lib);
> -}
> -
> -
> -static const char *
> -library_suffix(void)
> -{
> - return ".so";
> -}
> -
> -
> -#endif
> -
> -
> -/**
> - * Open the named driver and find its bootstrap function: _eglMain().
> - */
> -static _EGLMain_t
> -_eglOpenLibrary(const char *driverPath, lib_handle *handle)
> -{
> - lib_handle lib;
> - _EGLMain_t mainFunc = NULL;
> - const char *error = "unknown error";
> -
> - assert(driverPath);
> -
> - _eglLog(_EGL_DEBUG, "dlopen(%s)", driverPath);
> - lib = open_library(driverPath);
> -
> -#if defined(_EGL_OS_WINDOWS)
> - /* XXX untested */
> - if (lib)
> - mainFunc = (_EGLMain_t) GetProcAddress(lib, "_eglMain");
> -#elif defined(_EGL_OS_UNIX)
> - if (lib) {
> - union {
> - _EGLMain_t func;
> - void *ptr;
> - } tmp = { NULL };
> - /* direct cast gives a warning when compiled with -pedantic */
> - tmp.ptr = dlsym(lib, "_eglMain");
> - mainFunc = tmp.func;
> - if (!mainFunc)
> - error = dlerror();
> - }
> - else {
> - error = dlerror();
> - }
> -#endif
> -
> - if (!lib) {
> - _eglLog(_EGL_WARNING, "Could not open driver %s (%s)",
> - driverPath, error);
> - return NULL;
> - }
> -
> - if (!mainFunc) {
> - _eglLog(_EGL_WARNING, "_eglMain not found in %s (%s)",
> - driverPath, error);
> - if (lib)
> - close_library(lib);
> - return NULL;
> - }
> -
> - *handle = lib;
> - return mainFunc;
> -}
> -
> -
> -/**
> * Load a module and create the driver object.
> */
> static EGLBoolean
> _eglLoadModule(_EGLModule *mod)
> {
> - _EGLMain_t mainFunc;
> - lib_handle lib;
> _EGLDriver *drv;
>
> if (mod->Driver)
> return EGL_TRUE;
>
> - if (mod->BuiltIn) {
> - lib = (lib_handle) NULL;
> - mainFunc = mod->BuiltIn;
> - }
> - else {
> - mainFunc = _eglOpenLibrary(mod->Path, &lib);
> - if (!mainFunc)
> + if (!mod->BuiltIn)
> return EGL_FALSE;
> - }
>
> - drv = mainFunc(NULL);
> - if (!drv) {
> - if (lib)
> - close_library(lib);
> + drv = mod->BuiltIn(NULL);
> + if (!drv || !drv->Name)
> return EGL_FALSE;
> - }
> -
> - if (!drv->Name) {
> - _eglLog(_EGL_WARNING, "Driver loaded from %s has no name", mod->Path);
> - drv->Name = "UNNAMED";
> - }
>
> - mod->Handle = (void *) lib;
> mod->Driver = drv;
>
> return EGL_TRUE;
> @@ -243,20 +106,11 @@ _eglUnloadModule(_EGLModule *mod)
> if (mod->Driver && mod->Driver->Unload)
> mod->Driver->Unload(mod->Driver);
>
> - /*
> - * XXX At this point (atexit), the module might be the last reference to
> - * libEGL. Closing the module might unmap libEGL and give problems.
> - */
> -#if 0
> - if (mod->Handle)
> - close_library(mod->Handle);
> -#endif
> #elif defined(_EGL_OS_WINDOWS)
> /* XXX Windows unloads DLLs before atexit */
> #endif
>
> mod->Driver = NULL;
> - mod->Handle = NULL;
> }
>
>
> @@ -264,7 +118,7 @@ _eglUnloadModule(_EGLModule *mod)
> * Add a module to the module array.
> */
> static _EGLModule *
> -_eglAddModule(const char *path)
> +_eglAddModule(const char *name)
> {
> _EGLModule *mod;
> EGLint i;
> @@ -278,22 +132,22 @@ _eglAddModule(const char *path)
> /* find duplicates */
> for (i = 0; i < _eglModules->Size; i++) {
> mod = _eglModules->Elements[i];
> - if (strcmp(mod->Path, path) == 0)
> + if (strcmp(mod->Name, name) == 0)
> return mod;
> }
>
> /* allocate a new one */
> mod = calloc(1, sizeof(*mod));
> if (mod) {
> - mod->Path = _eglstrdup(path);
> - if (!mod->Path) {
> + mod->Name = _eglstrdup(name);
> + if (!mod->Name) {
> free(mod);
> mod = NULL;
> }
> }
> if (mod) {
> _eglAppendArray(_eglModules, (void *) mod);
> - _eglLog(_EGL_DEBUG, "added %s to module array", mod->Path);
> + _eglLog(_EGL_DEBUG, "added %s to module array", mod->Name);
> }
>
> return mod;
> @@ -309,155 +163,12 @@ _eglFreeModule(void *module)
> _EGLModule *mod = (_EGLModule *) module;
>
> _eglUnloadModule(mod);
> - free(mod->Path);
> + free(mod->Name);
> free(mod);
> }
>
>
> /**
> - * A loader function for use with _eglPreloadForEach. The loader data is the
> - * filename of the driver. This function stops on the first valid driver.
> - */
> -static EGLBoolean
> -_eglLoaderFile(const char *dir, size_t len, void *loader_data)
> -{
> - char path[1024];
> - const char *filename = (const char *) loader_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';
> -
> - if (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) {
> - /* overflow */
> - if (len + slen + 1 > sizeof(path))
> - return EGL_TRUE;
> - strcpy(path + len, suffix);
> - }
> - }
> -
> -#if defined(_EGL_OS_UNIX)
> - /* check if the file exists */
> - if (access(path, F_OK))
> - return EGL_TRUE;
> -#endif
> -
> - _eglAddModule(path);
> -
> - return EGL_TRUE;
> -}
> -
> -
> -/**
> - * Run the callback function on each driver directory.
> - *
> - * The process may end prematurely if the callback function returns false.
> - */
> -static void
> -_eglPreloadForEach(const char *search_path,
> - EGLBoolean (*loader)(const char *, size_t, void *),
> - void *loader_data)
> -{
> - const char *cur, *next;
> - size_t len;
> -
> - cur = search_path;
> - while (cur) {
> - next = strchr(cur, ':');
> - len = (next) ? next - cur : strlen(cur);
> -
> - if (!loader(cur, len, loader_data))
> - break;
> -
> - cur = (next) ? next + 1 : NULL;
> - }
> -}
> -
> -
> -/**
> - * Return a list of colon-separated driver directories.
> - */
> -static const char *
> -_eglGetSearchPath(void)
> -{
> - static char search_path[1024];
> -
> -#if defined(_EGL_OS_UNIX) || defined(_EGL_OS_WINDOWS)
> - if (search_path[0] == '\0') {
> - char *buf = search_path;
> - size_t len = sizeof(search_path);
> - EGLBoolean use_env;
> - char dir_sep;
> - int ret;
> -
> -#if defined(_EGL_OS_UNIX)
> - use_env = (geteuid() == getuid() && getegid() == getgid());
> - dir_sep = '/';
> -#else
> - use_env = EGL_TRUE;
> - dir_sep = '\\';
> -#endif
> -
> - if (use_env) {
> - char *p;
> -
> - /* extract the dirname from EGL_DRIVER */
> - p = getenv("EGL_DRIVER");
> - if (p && strchr(p, dir_sep)) {
> - ret = _eglsnprintf(buf, len, "%s", p);
> - if (ret > 0 && ret < len) {
> - p = strrchr(buf, dir_sep);
> - *p++ = ':';
> -
> - len -= p - buf;
> - buf = p;
> - }
> - }
> -
> - /* append EGL_DRIVERS_PATH */
> - p = getenv("EGL_DRIVERS_PATH");
> - if (p) {
> - ret = _eglsnprintf(buf, len, "%s:", p);
> - if (ret > 0 && ret < len) {
> - buf += ret;
> - len -= ret;
> - }
> - }
> - }
> - else {
> - _eglLog(_EGL_DEBUG,
> - "ignore EGL_DRIVERS_PATH for setuid/setgid binaries");
> - }
> -
> - ret = _eglsnprintf(buf, len, "%s", _EGL_DRIVER_SEARCH_DIR);
> - if (ret < 0 || ret >= len)
> - search_path[0] = '\0';
> -
> - _eglLog(_EGL_DEBUG, "EGL search path is %s", search_path);
> - }
> -#endif /* defined(_EGL_OS_UNIX) || defined(_EGL_OS_WINDOWS) */
> -
> - return search_path;
> -}
> -
> -
> -/**
> * Add the user driver to the module array.
> *
> * The user driver is specified by EGL_DRIVER.
> @@ -465,42 +176,15 @@ _eglGetSearchPath(void)
> static EGLBoolean
> _eglAddUserDriver(void)
> {
> - const char *search_path = _eglGetSearchPath();
> char *env;
> - size_t name_len = 0;
>
> env = getenv("EGL_DRIVER");
> -#if defined(_EGL_OS_UNIX)
> - if (env && strchr(env, '/')) {
> - search_path = "";
> - if ((geteuid() != getuid() || getegid() != getgid())) {
> - _eglLog(_EGL_DEBUG,
> - "ignore EGL_DRIVER for setuid/setgid binaries");
> - env = NULL;
> - }
> - }
> - else if (env) {
> - char *suffix = strchr(env, '.');
> - name_len = (suffix) ? suffix - env : strlen(env);
> - }
> -#else
> - if (env)
> - name_len = strlen(env);
> -#endif /* _EGL_OS_UNIX */
> -
> - /*
> - * Try built-in drivers first if we know the driver name. This makes sure
> - * we do not load the outdated external driver that is still on the
> - * filesystem.
> - */
> - if (name_len) {
> - _EGLModule *mod;
> + if (env) {
> EGLint i;
>
> for (i = 0; _eglBuiltInDrivers[i].name; i++) {
> - if (strlen(_eglBuiltInDrivers[i].name) == name_len &&
> - !strncmp(_eglBuiltInDrivers[i].name, env, name_len)) {
> - mod = _eglAddModule(env);
> + if (!strcmp(_eglBuiltInDrivers[i].name, env)) {
> + _EGLModule *mod = _eglAddModule(env);
> if (mod)
> mod->BuiltIn = _eglBuiltInDrivers[i].main;
>
> @@ -509,13 +193,6 @@ _eglAddUserDriver(void)
> }
> }
>
> - /* otherwise, treat env as a path */
> - if (env) {
> - _eglPreloadForEach(search_path, _eglLoaderFile, (void *) env);
> -
> - return EGL_TRUE;
> - }
> -
> return EGL_FALSE;
> }
>
> @@ -683,18 +360,3 @@ _eglUnloadDrivers(void)
> _eglModules = NULL;
> }
> }
> -
> -
> -/**
> - * Invoke a callback function on each EGL search path.
> - *
> - * The first argument of the callback function is the name of the search
> path.
> - * The second argument is the length of the name.
> - */
> -void
> -_eglSearchPathForEach(EGLBoolean (*callback)(const char *, size_t, void *),
> - void *callback_data)
> -{
> - const char *search_path = _eglGetSearchPath();
> - _eglPreloadForEach(search_path, callback, callback_data);
> -}
> --
> 2.3.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
