chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[libc] Add dl features in KConfig.

This commit is contained in:
Bernard Xiong 2018-04-25 23:26:20 +08:00
parent 3c31567f14
commit cdd12b7930
3 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/libc/Kconfig
View File

@ -27,6 +27,12 @@ if RT_USING_LIBC && RT_USING_DFS
bool "Enable AIO" bool "Enable AIO"
default n default n
endif endif
if RT_USING_MODULE
config RT_USING_LIBDL
bool "Enable dlopen/dlsym/dlclose feature"
default n
endif
endif endif
config HAVE_SYS_SIGNALS config HAVE_SYS_SIGNALS

1
components/libc/libdl/dlfcn.h
View File

@ -16,3 +16,4 @@ void *dlsym(void *handle, const char *symbol);
int dlclose (void *handle); int dlclose (void *handle);
#endif #endif

63
components/libc/libdl/dlopen.c
View File

@ -8,51 +8,50 @@
* http://www.rt-thread.org/license/LICENSE * http://www.rt-thread.org/license/LICENSE
* *
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2010-11-17 yi.qiu first version * 2010-11-17 yi.qiu first version
*/ */
#include <rtthread.h> #include <rtthread.h>
#include <rtm.h> #include <rtm.h>
#include <string.h> #include <string.h>
#define MODULE_ROOT_DIR "/module/lib" #define MODULE_ROOT_DIR "/modules"
void* dlopen(const char *filename, int flags) void* dlopen(const char *filename, int flags)
{ {
rt_module_t module; rt_module_t module;
char *fullpath; char *fullpath;
const char*def_path = MODULE_ROOT_DIR; const char*def_path = MODULE_ROOT_DIR;
/* check parameters */ /* check parameters */
RT_ASSERT(filename != RT_NULL); RT_ASSERT(filename != RT_NULL);
if (filename[0] != '/') /* it's a relative path, prefix with MODULE_ROOT_DIR */ if (filename[0] != '/') /* it's a relative path, prefix with MODULE_ROOT_DIR */
{ {
fullpath = rt_malloc(strlen(def_path) + strlen(filename) + 2); fullpath = rt_malloc(strlen(def_path) + strlen(filename) + 2);
/* join path and file name */ /* join path and file name */
rt_snprintf(fullpath, strlen(def_path) + strlen(filename) + 2, rt_snprintf(fullpath, strlen(def_path) + strlen(filename) + 2,
"%s/%s", def_path, filename); "%s/%s", def_path, filename);
} }
else else
{ {
fullpath = (char*)filename; /* absolute path, use it directly */ fullpath = (char*)filename; /* absolute path, use it directly */
} }
/* find in module list */ /* find in module list */
module = rt_module_find(fullpath); module = rt_module_find(fullpath);
if(module != RT_NULL) module->nref++;
else module = rt_module_open(fullpath);
if(fullpath != filename) if(module != RT_NULL) module->nref++;
{ else module = rt_module_open(fullpath);
rt_free(fullpath);
}
return (void*)module; if(fullpath != filename)
{
rt_free(fullpath);
}
return (void*)module;
} }
RTM_EXPORT(dlopen);
RTM_EXPORT(dlopen)