From e7c2f7d827ad286dc826e483391e64b8ffe2720b Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 11 Aug 2015 02:17:37 +0200 Subject: Automatic HPM symbol sharing Signed-off-by: Haru --- src/common/HPM.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'src/common/HPM.c') diff --git a/src/common/HPM.c b/src/common/HPM.c index dcca6ae4c..a78f03daa 100644 --- a/src/common/HPM.c +++ b/src/common/HPM.c @@ -533,9 +533,6 @@ void hplugins_config_read(void) { if (libconfig->read_file(&plugins_conf, config_filename)) return; - if( HPM->symbol_defaults_sub ) - HPM->symbol_defaults_sub(); - plist = libconfig->lookup(&plugins_conf, "plugins_list"); for (i = 0; i < HPM->cmdline_plugins_count; i++) { config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING); @@ -748,37 +745,6 @@ void HPM_datacheck_final(void) { db_destroy(datacheck_db); } -void hplugins_share_defaults(void) { - /* core */ - HPM->share(core,"core"); - HPM->share(HPMiMalloc, "iMalloc"); - HPM->share(cmdline,"cmdline"); - /* console */ - HPM->share(console,"console"); - /* db */ - HPM->share(DB, "DB"); - /* nullpo */ - HPM->share(nullpo,"nullpo"); - /* showmsg */ - HPM->share(showmsg,"showmsg"); - /* socket */ - HPM->share(sockt,"sockt"); - /* strlib */ - HPM->share(strlib,"strlib"); - HPM->share(sv,"sv"); - HPM->share(StrBuf,"StrBuf"); - /* sql */ - HPM->share(SQL,"SQL"); - /* timer */ - HPM->share(timer,"timer"); - /* libconfig */ - HPM->share(libconfig,"libconfig"); - /* sysinfo */ - HPM->share(sysinfo,"sysinfo"); - /* utils */ - HPM->share(HCache,"HCache"); -} - void hpm_init(void) { unsigned int i; datacheck_db = NULL; @@ -810,8 +776,6 @@ void hpm_init(void) { HPM->packetsc[i] = 0; } - HPM->symbol_defaults(); - #ifdef CONSOLE_INPUT console->input->addCommand("plugins",CPCMD_A(plugins)); #endif @@ -906,9 +870,7 @@ void hpm_defaults(void) { HPM->iscompatible = hplugin_iscompatible; HPM->import_symbol = hplugin_import_symbol; HPM->share = hplugin_export_symbol; - HPM->symbol_defaults = hplugins_share_defaults; HPM->config_read = hplugins_config_read; - HPM->symbol_defaults_sub = NULL; HPM->pid2name = hplugins_id2name; HPM->parse_packets = hplugins_parse_packets; HPM->load_sub = NULL; -- cgit v1.2.3-70-g09d2