database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

report a plugin loading offset at dlopen time

Browse Source 
not an address of some arbitrarily chosen symbol;
not when plugin is successfully loaded (which means - no info
  when plugin->init failed);
This commit is contained in:
Sergei Golubchik
2015-03-30 14:16:34 +02:00
parent beea778695
commit 9bda4bc52a
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_plugin.cc
View File

@ -43,6 +43,10 @@
#define REPORT_TO_LOG 1 #define REPORT_TO_LOG 1
#define REPORT_TO_USER 2 #define REPORT_TO_USER 2
#ifdef HAVE_LINK_H
#include <link.h>
#endif
extern struct st_maria_plugin *mysql_optional_plugins[]; extern struct st_maria_plugin *mysql_optional_plugins[];
extern struct st_maria_plugin *mysql_mandatory_plugins[]; extern struct st_maria_plugin *mysql_mandatory_plugins[];
@ -767,6 +771,14 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
} }
dlopen_count++; dlopen_count++;
#ifdef HAVE_LINK_H
if (global_system_variables.log_warnings > 2)
{
struct link_map *lm = (struct link_map*) plugin_dl.handle;
sql_print_information("Loaded '%s' with offset 0x%lx", dl->str, lm->l_addr);
}
#endif
/* Checks which plugin interface present and reads info */ /* Checks which plugin interface present and reads info */
if (!(sym= dlsym(plugin_dl.handle, maria_plugin_interface_version_sym))) if (!(sym= dlsym(plugin_dl.handle, maria_plugin_interface_version_sym)))
{ {
@ -1385,16 +1397,6 @@ static int plugin_initialize(MEM_ROOT *tmp_root, struct st_plugin_int *plugin,
goto err; goto err;
} }
if (plugin->plugin_dl && global_system_variables.log_warnings >= 9)
{
void *sym= dlsym(plugin->plugin_dl->handle,
plugin->plugin_dl->mariaversion ?
maria_plugin_declarations_sym : plugin_declarations_sym);
DBUG_ASSERT(sym);
sql_print_information("Plugin %s loaded at %p",
plugin->name.str, sym);
}
if (plugin_type_initialize[plugin->plugin->type]) if (plugin_type_initialize[plugin->plugin->type])
{ {
if ((*plugin_type_initialize[plugin->plugin->type])(plugin)) if ((*plugin_type_initialize[plugin->plugin->type])(plugin))