Skip to content

Commit

Permalink
Improve dump_cfg
Browse files Browse the repository at this point in the history 
- dump_cfg exports the command-line options, e.g., the log path and
verbosity
- Make dump_cfg support plugins that allow multiple config command lines
- Make dump_cfg export the regex instead of schema at strgp_add if regex
was originally given.
  • Loading branch information
@nichamon
nichamon committed Aug 25, 2023
1 parent 277b379 commit 0aee254
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 32 deletions.
9 changes: 7 additions & 2 deletions ldms/src/ldmsd/ldmsd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -742,10 +742,15 @@ int process_config_file(const char *path, int *lineno, int trust);
#define LDMSD_MAX_PLUGIN_NAME_LEN 64
#define LDMSD_CFG_FILE_XPRT_MAX_REC 8192
struct attr_value_list;
struct avl_q_item {
struct attr_value_list *av_list;
TAILQ_ENTRY(avl_q_item) entry;
};
TAILQ_HEAD(avl_q, avl_q_item);
struct ldmsd_plugin {
char name[LDMSD_MAX_PLUGIN_NAME_LEN];
struct attr_value_list *av_list;
struct attr_value_list *kw_list;
struct avl_q avl_q;
struct avl_q kwl_q;
enum ldmsd_plugin_type {
LDMSD_PLUGIN_OTHER = 0,
LDMSD_PLUGIN_SAMPLER,
Expand Down
35 changes: 31 additions & 4 deletions ldms/src/ldmsd/ldmsd_config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ struct ldmsd_plugin_cfg *new_plugin(char *plugin_name,
if (!pi->libpath)
goto enomem;
pi->plugin = lpi;
TAILQ_INIT(&lpi->avl_q);
TAILQ_INIT(&lpi->kwl_q);
lpi->pi = pi;
pi->sample_interval_us = 1000000;
pi->sample_offset_us = 0;
Expand All @@ -204,10 +206,24 @@ struct ldmsd_plugin_cfg *new_plugin(char *plugin_name,

void destroy_plugin(struct ldmsd_plugin_cfg *p)
{
struct avl_q_item *avl;
struct avl_q_item *kwl;
free(p->libpath);
free(p->name);
av_free(p->plugin->av_list);
av_free(p->plugin->kw_list);

/*
* Assume that the length of av_list_q and
* the length of kw_list_q are equal.
*/
while ((avl = TAILQ_FIRST(&p->plugin->avl_q)) &&
(kwl = TAILQ_FIRST(&p->plugin->kwl_q))) {
TAILQ_REMOVE(&p->plugin->avl_q, avl, entry);
TAILQ_REMOVE(&p->plugin->kwl_q, kwl, entry);
free(avl->av_list);
free(avl);
free(kwl->av_list);
free(kwl);
}
LIST_REMOVE(p, entry);
dlclose(p->handle);
free(p);
Expand Down Expand Up @@ -309,15 +325,26 @@ int ldmsd_config_plugin(char *plugin_name,
{
int rc = 0;
struct ldmsd_plugin_cfg *pi;
struct avl_q_item *avl;
struct avl_q_item *kwl;

avl = calloc(1, sizeof(*avl));
kwl = calloc(1, sizeof(*kwl));
if (!avl || !kwl)
return ENOMEM;
avl->av_list = av_copy(_av_list);
kwl->av_list = av_copy(_kw_list);
if (!avl->av_list || !kwl->av_list)
return ENOMEM;

pi = ldmsd_get_plugin(plugin_name);
if (!pi)
return ENOENT;

pthread_mutex_lock(&pi->lock);
rc = pi->plugin->config(pi->plugin, _kw_list, _av_list);
pi->plugin->av_list = av_copy(_av_list);
pi->plugin->kw_list = av_copy(_kw_list);
TAILQ_INSERT_TAIL(&pi->plugin->kwl_q, kwl, entry);
TAILQ_INSERT_TAIL(&pi->plugin->avl_q, avl, entry);
pthread_mutex_unlock(&pi->lock);
return rc;
}
Expand Down
105 changes: 79 additions & 26 deletions ldms/src/ldmsd/ldmsd_request.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6156,18 +6156,26 @@ static int greeting_handler(ldmsd_req_ctxt_t reqc)
return 0;
}

extern char *logfile;
extern int log_level_thr;
extern char *max_mem_sz_str;
extern char *pidfile;
extern int banner;
extern int do_kernel;
extern char *setfile;
extern int ev_thread_count;
static int dump_cfg_handler(ldmsd_req_ctxt_t reqc)
{
FILE *fp = NULL;
char *filename = NULL;
extern struct plugin_list plugin_list;
struct ldmsd_plugin_cfg *p;
int rc;
extern struct plugin_list plugin_list;
struct ldmsd_plugin_cfg *p;
int rc;
int i;
char hostname[128], port_no[32];
rc = ldms_xprt_names(reqc->xprt->ldms.ldms, hostname, sizeof(hostname), port_no, sizeof(port_no),
NULL, 0, NULL, 0, NI_NAMEREQD | NI_NUMERICSERV);
reqc->errcode = 0;
reqc->errcode = 0;
filename = ldmsd_req_attr_str_value_get_by_id(reqc, LDMSD_ATTR_PATH);
if (!filename || strlen(filename) == 0) {
Snprintf(&reqc->line_buf, &reqc->line_len,
Expand All @@ -6186,6 +6194,30 @@ static int dump_cfg_handler(ldmsd_req_ctxt_t reqc)
"# no command line arguments.\n"
"# e.g. ldmsd -c %s\n\n", fullpath);

/* Miscellaneous, e.g., logfile, log verbosity */
fprintf(fp, "option");
if (logfile) {
fprintf(fp, " -l %s", logfile);
}
fprintf(fp, " -v %s", ovis_log_level_to_str(log_level_thr));
if (max_mem_sz_str)
fprintf(fp, " -m %s", max_mem_sz_str);
if (pidfile)
fprintf(fp, " -r %s", pidfile);
if (banner != -1)
fprintf(fp, " -B %d", banner);
fprintf(fp, " -P %d", ev_thread_count);
fprintf(fp, " -C %d", ldmsd_credits);
if (do_kernel) {
fprintf(fp, " -k");
if (setfile)
fprintf(fp, " -s %s", setfile);
}
const char *_name = ldmsd_myname_get();
if (_name[0] != '\0')
fprintf(fp, " -n %s", _name);
fprintf(fp, "\n");

/* Auth */
ldmsd_auth_t auth;
ldmsd_cfg_lock(LDMSD_CFGOBJ_AUTH);
Expand Down Expand Up @@ -6246,28 +6278,42 @@ static int dump_cfg_handler(ldmsd_req_ctxt_t reqc)
}
ldmsd_cfg_unlock(LDMSD_CFGOBJ_PRDCR);
/* Plugins */
LIST_FOREACH(p, &plugin_list, entry) {
struct avl_q_item *avl;
struct avl_q_item *kwl;
LIST_FOREACH(p, &plugin_list, entry) {
fprintf(fp, "load name=%s\n", p->name);
fprintf(fp, "config name=%s ", p->name);
for (i = 0; i < p->plugin->av_list->count; i++) {
struct attr_value *v = &p->plugin->av_list->list[i];
if (i > 0)
fprintf(fp, " ");
fprintf(fp, "%s=%s", v->name, v->value);
}
for (i = 0; i < p->plugin->kw_list->count; i++) {
struct attr_value *k = &p->plugin->kw_list->list[i];
if (i > 0)
fprintf(fp, " ");
fprintf(fp, "%s", k->name);
avl = TAILQ_FIRST(&p->plugin->avl_q);
kwl = TAILQ_FIRST(&p->plugin->kwl_q);
/* Assume that the lengths of av_list_q and kw_list_q are equal. */
while (avl) {
fprintf(fp, "config name=%s ", p->name);
for (i = 0; i < avl->av_list->count; i++) {
struct attr_value *v = &avl->av_list->list[i];
if (i > 0)
fprintf(fp, " ");
fprintf(fp, "%s=%s", v->name, v->value);
}
for (i = 0; i < kwl->av_list->count; i++) {
struct attr_value *k = &kwl->av_list->list[i];
if (i > 0)
fprintf(fp, " ");
fprintf(fp, "%s", k->name);
}
fprintf(fp, "\n");
avl = TAILQ_NEXT(avl, entry);
kwl = TAILQ_NEXT(kwl, entry);
}
fprintf(fp, "\n");
if (p->plugin->type == LDMSD_PLUGIN_SAMPLER)
fprintf(fp, "start name=%s interval=%ld offset=%ld\n",
p->plugin->name,
p->sample_interval_us,
p->sample_offset_us);
}

if (p->plugin->type == LDMSD_PLUGIN_SAMPLER) {
if (p->os) {
/* Plugin is running. */
fprintf(fp, "start name=%s interval=%ld offset=%ld\n",
p->plugin->name,
p->sample_interval_us,
p->sample_offset_us);
}
}
}
/* Updaters */
ldmsd_name_match_t match;
ldmsd_updtr_t updtr;
Expand Down Expand Up @@ -6327,18 +6373,25 @@ static int dump_cfg_handler(ldmsd_req_ctxt_t reqc)
fprintf(fp, "strgp_add name=%s "
"plugin=%s "
"container=%s "
"schema=%s "
"flush=%ld "
"perm=%d",
strgp->obj.name,
strgp->plugin_name,
strgp->container,
strgp->schema,
strgp->flush_interval.tv_sec,
strgp->obj.perm);
if (strgp->regex_s)
fprintf(fp, " regex=%s", strgp->regex_s);
else
fprintf(fp, " schema=%s", strgp->schema);
if (strgp->decomp)
fprintf(fp, " decomposition=%s", strgp->decomp_name);
fprintf(fp, "\n");
LIST_FOREACH(match, &strgp->prdcr_list, entry) {
fprintf(fp, "strgp_prdcr_add name=%s regex=%s\n",
strgp->obj.name,
match->regex_str);
}
if (strgp->state == LDMSD_STRGP_STATE_RUNNING)
fprintf(fp, "strgp_start name=%s\n", strgp->obj.name);
}
Expand Down

0 comments on commit 0aee254

Please sign in to comment.