Skip to content

mod_so: Add -D DUMP_MODULE_DATA to print module data in structured format #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

mod_so: Add -D DUMP_MODULE_DATA to print module data in structured format #537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions modules/core/mod_so.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,12 +361,26 @@ static module *ap_find_loaded_module_symbol(server_rec *s, const char *modname)
return NULL;
}

/* Print structured module data in TOML format for -D DUMP_MODULE_DATA
* output. */
static void print_mod_data(apr_file_t *out, int is_static,
const ap_module_symbol_t *modsym)
{
const char *name = modsym->name;
const module *mod = modsym->modp;

apr_file_printf(out, "%s.static = %d\n", name, is_static);
apr_file_printf(out, "%s.source = \"%s\"\n", name, mod->name);
apr_file_printf(out, "%s.major = %d\n", name, mod->version);
apr_file_printf(out, "%s.minor = %d\n", name, mod->minor_version);
}

static void dump_loaded_modules(apr_pool_t *p, server_rec *s)
{
ap_module_symbol_t *modie;
ap_module_symbol_t *modi;
so_server_conf *sconf;
int i;
int i, toml = ap_exists_config_define("DUMP_MODULE_DATA");
apr_file_t *out = NULL;

if (!ap_exists_config_define("DUMP_MODULES")) {
Expand All @@ -375,14 +389,17 @@ static void dump_loaded_modules(apr_pool_t *p, server_rec *s)

apr_file_open_stdout(&out, p);

apr_file_printf(out, "Loaded Modules:\n");
if (!toml) apr_file_printf(out, "Loaded Modules:\n");

sconf = (so_server_conf *)ap_get_module_config(s->module_config,
&so_module);
for (i = 0; ; i++) {
modi = &ap_prelinked_module_symbols[i];
if (modi->name != NULL) {
apr_file_printf(out, " %s (static)\n", modi->name);
if (toml)
print_mod_data(out, 1, modi);
else
apr_file_printf(out, " %s (static)\n", modi->name);
}
else {
break;
Expand All @@ -393,7 +410,10 @@ static void dump_loaded_modules(apr_pool_t *p, server_rec *s)
for (i = 0; i < sconf->loaded_modules->nelts; i++) {
modi = &modie[i];
if (modi->name != NULL) {
apr_file_printf(out, " %s (shared)\n", modi->name);
if (toml)
print_mod_data(out, 0, modi);
else
apr_file_printf(out, " %s (shared)\n", modi->name);
}
}
}
Expand Down