AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move _mesa_dl* functions into dlopen.h and inline them

Browse Source 
No point in having an extra function call for inlinable functions.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Matt Turner
2012-08-22 12:45:48 -07:00
parent 57c57df7b4
commit 179d8aa331
4 changed files with 75 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/SConscript
-1
View File
@@ -60,7 +60,6 @@ main_sources = [
'main/debug.c',
'main/depth.c',
'main/dlist.c',
'main/dlopen.c',
'main/drawpix.c',
'main/drawtex.c',
'main/enable.c',
src/mesa/main/dlopen.c
-112
View File
@@ -1,112 +0,0 @@
/*
* Mesa 3-D graphics library
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/**
* Wrapper functions for dlopen(), dlsym(), dlclose().
* Note that the #ifdef tests for various environments should be expanded.
*/
#include "compiler.h"
#include "dlopen.h"
#if defined(HAVE_DLOPEN)
#include <dlfcn.h>
#endif
#if defined(_WIN32)
#include <windows.h>
#endif
/**
* Wrapper for dlopen().
* Note that 'flags' isn't used at this time.
*/
void *
_mesa_dlopen(const char *libname, int flags)
{
#if defined(__blrts)
return NULL;
#elif defined(HAVE_DLOPEN)
flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
return dlopen(libname, flags);
#elif defined(__MINGW32__)
return LoadLibraryA(libname);
#else
return NULL;
#endif
}
/**
* Wrapper for dlsym() that does a cast to a generic function type,
* rather than a void *. This reduces the number of warnings that are
* generated.
*/
GenericFunc
_mesa_dlsym(void *handle, const char *fname)
{
union {
void *v;
GenericFunc f;
} u;
#if defined(__blrts)
u.v = NULL;
#elif defined(__DJGPP__)
/* need '_' prefix on symbol names */
char fname2[1000];
fname2[0] = '_';
strncpy(fname2 + 1, fname, 998);
fname2[999] = 0;
u.v = dlsym(handle, fname2);
#elif defined(HAVE_DLOPEN)
u.v = dlsym(handle, fname);
#elif defined(__MINGW32__)
u.v = (void *) GetProcAddress(handle, fname);
#else
u.v = NULL;
#endif
return u.f;
}
/**
* Wrapper for dlclose().
*/
void
_mesa_dlclose(void *handle)
{
#if defined(__blrts)
(void) handle;
#elif defined(HAVE_DLOPEN)
dlclose(handle);
#elif defined(__MINGW32__)
FreeLibrary(handle);
#else
(void) handle;
#endif
}
src/mesa/main/dlopen.h
+75 -8
View File
@@ -25,18 +25,85 @@
#ifndef DLOPEN_H
#define DLOPEN_H
/**
* Wrapper functions for dlopen(), dlsym(), dlclose().
* Note that the #ifdef tests for various environments should be expanded.
*/
#if defined(HAVE_DLOPEN)
#include <dlfcn.h>
#endif
#if defined(_WIN32)
#include <windows.h>
#endif
typedef void (*GenericFunc)(void);
/**
* Wrapper for dlopen().
* Note that 'flags' isn't used at this time.
*/
static inline void *
_mesa_dlopen(const char *libname, int flags)
{
#if defined(__blrts)
return NULL;
#elif defined(HAVE_DLOPEN)
flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
return dlopen(libname, flags);
#elif defined(__MINGW32__)
return LoadLibraryA(libname);
#else
return NULL;
#endif
}
extern void *
_mesa_dlopen(const char *libname, int flags);
extern GenericFunc
_mesa_dlsym(void *handle, const char *fname);
extern void
_mesa_dlclose(void *handle);
/**
* Wrapper for dlsym() that does a cast to a generic function type,
* rather than a void *. This reduces the number of warnings that are
* generated.
*/
static inline GenericFunc
_mesa_dlsym(void *handle, const char *fname)
{
union {
void *v;
GenericFunc f;
} u;
#if defined(__blrts)
u.v = NULL;
#elif defined(__DJGPP__)
/* need '_' prefix on symbol names */
char fname2[1000];
fname2[0] = '_';
strncpy(fname2 + 1, fname, 998);
fname2[999] = 0;
u.v = dlsym(handle, fname2);
#elif defined(HAVE_DLOPEN)
u.v = dlsym(handle, fname);
#elif defined(__MINGW32__)
u.v = (void *) GetProcAddress(handle, fname);
#else
u.v = NULL;
#endif
return u.f;
}
/**
* Wrapper for dlclose().
*/
static inline void
_mesa_dlclose(void *handle)
{
#if defined(__blrts)
(void) handle;
#elif defined(HAVE_DLOPEN)
dlclose(handle);
#elif defined(__MINGW32__)
FreeLibrary(handle);
#else
(void) handle;
#endif
}
#endif
src/mesa/sources.mak
-1
View File
@@ -32,7 +32,6 @@ MAIN_FILES = \
$(SRCDIR)main/debug.c \
$(SRCDIR)main/depth.c \
$(SRCDIR)main/dlist.c \
$(SRCDIR)main/dlopen.c \
$(SRCDIR)main/drawpix.c \
$(SRCDIR)main/drawtex.c \
$(SRCDIR)main/enable.c \