From 51c5df09105025dc696ac5c89a819b73cc52b687 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 1 Feb 2012 17:37:22 -0500 Subject: [PATCH] Remove old (now unused) loglevel control code entirely Signed-off-by: Mathieu Desnoyers --- include/lttng/ust-events.h | 45 +------ liblttng-ust/ltt-events.c | 73 ++--------- liblttng-ust/ltt-probes.c | 245 ++--------------------------------- liblttng-ust/lttng-ust-abi.c | 57 -------- 4 files changed, 23 insertions(+), 397 deletions(-) diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 4d1cace5..249f4236 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -189,33 +189,6 @@ struct tracepoint_loglevel_entry { long value; }; -struct loglevel_entry; - -/* - * Entry describing a per-session active loglevel, along with the event - * attribute and channel information configuring the events that need to - * be enabled. - */ -struct session_loglevel { - struct ltt_channel *chan; - struct lttng_ctx *ctx; /* TODO */ - struct lttng_ust_event event_param; - struct cds_list_head events; /* list of events enabled */ - struct cds_list_head list; /* per-session list of loglevels */ - struct cds_list_head session_list; - struct loglevel_entry *entry; - unsigned int enabled:1; -}; - -/* - * Entry describing an active loglevel (per name) for all sessions. - */ -struct loglevel_entry { - struct cds_hlist_node hlist; - struct cds_list_head session_list; - char name[0]; -}; - /* * Entry describing a per-session active wildcard, along with the event * attribute and channel information configuring the events that need to @@ -227,7 +200,7 @@ struct session_wildcard { struct lttng_ust_event event_param; struct cds_list_head events; /* list of events enabled */ struct cds_list_head list; /* per-session list of wildcards */ - struct cds_list_head session_list; + struct cds_list_head session_list; /* node of session wildcard list */ struct wildcard_entry *entry; unsigned int enabled:1; }; @@ -236,7 +209,9 @@ struct session_wildcard { * Entry describing an active wildcard (per name) for all sessions. */ struct wildcard_entry { + /* node of global wildcards list */ struct cds_list_head list; + /* head of session list to which this wildcard apply */ struct cds_list_head session_list; char name[0]; }; @@ -289,7 +264,6 @@ struct ltt_event { union { } u; struct cds_list_head list; /* Event list */ - struct cds_list_head loglevel_list; /* Event list for loglevel */ struct cds_list_head wildcard_list; /* Event list for wildcard */ struct ust_pending_probe *pending_probe; unsigned int metadata_dumped:1; @@ -367,7 +341,6 @@ struct ltt_session { struct ltt_channel *metadata; /* Metadata channel */ struct cds_list_head chan; /* Channel list head */ struct cds_list_head events; /* Event list head */ - struct cds_list_head loglevels; /* Loglevel list head */ struct cds_list_head wildcards; /* Wildcard list head */ struct cds_list_head list; /* Session list */ unsigned int free_chan_id; /* Next chan ID to allocate */ @@ -448,18 +421,6 @@ void ltt_probes_prune_event_list(struct lttng_ust_tracepoint_list *list); struct lttng_ust_tracepoint_iter * lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list); -struct loglevel_entry *get_loglevel(const char *name); -struct loglevel_entry *get_loglevel_value(int64_t value); -struct session_loglevel *add_loglevel(const char *name, - struct ltt_channel *chan, - struct lttng_ust_event *event_param); -void _remove_loglevel(struct session_loglevel *loglevel); -int ltt_loglevel_enable(struct session_loglevel *loglevel); -int ltt_loglevel_disable(struct session_loglevel *loglevel); -int ltt_loglevel_create(struct ltt_channel *chan, - struct lttng_ust_event *event_param, - struct session_loglevel **sl); - struct wildcard_entry *match_wildcard(const char *name); struct session_wildcard *add_wildcard(const char *name, struct ltt_channel *chan, diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c index 2f94d8c9..ea35f647 100644 --- a/liblttng-ust/ltt-events.c +++ b/liblttng-ust/ltt-events.c @@ -77,7 +77,6 @@ struct ust_pending_probe { }; static void _ltt_event_destroy(struct ltt_event *event); -static void _ltt_loglevel_destroy(struct session_loglevel *sl); static void _ltt_wildcard_destroy(struct session_wildcard *sw); static void _ltt_channel_destroy(struct ltt_channel *chan); static int _ltt_event_unregister(struct ltt_event *event); @@ -147,49 +146,13 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc) size_t name_len = strlen(name); uint32_t hash; - /* - * For this event, we need to lookup the loglevel. If active (in - * the active loglevels hash table), we must create the event. - */ - if (desc->loglevel) { - const struct tracepoint_loglevel_entry *ev_ll; - struct loglevel_entry *loglevel; - - ev_ll = *desc->loglevel; - loglevel = get_loglevel(ev_ll->identifier); - if (!loglevel) - loglevel = get_loglevel_value(ev_ll->value); - if (loglevel) { - struct session_loglevel *sl; - - cds_list_for_each_entry(sl, &loglevel->session_list, - session_list) { - struct ltt_event *ev; - int ret; - - memcpy(&event_param, &sl->event_param, - sizeof(event_param)); - memcpy(event_param.name, - desc->name, - sizeof(event_param.name)); - /* create event */ - ret = ltt_event_create(sl->chan, - &event_param, NULL, - &ev); - if (ret) { - DBG("Error creating event"); - continue; - } - cds_list_add(&ev->loglevel_list, - &sl->events); - } - } - } - /* Wildcard */ { struct wildcard_entry *wildcard; + /* TODO: get value from loglevel. */ + + /* TODO: check if loglevel match */ wildcard = match_wildcard(desc->name); if (strcmp(desc->name, "lttng_ust:metadata") && wildcard) { struct session_wildcard *sw; @@ -228,6 +191,9 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc) struct ltt_event *event; struct ltt_channel *chan; + /* TODO: get value from loglevel. */ + + /* TODO: check if loglevel match */ if (strncmp(name, e->name, LTTNG_UST_SYM_NAME_LEN - 1)) continue; event = e->event; @@ -262,7 +228,6 @@ struct ltt_session *ltt_session_create(void) return NULL; CDS_INIT_LIST_HEAD(&session->chan); CDS_INIT_LIST_HEAD(&session->events); - CDS_INIT_LIST_HEAD(&session->loglevels); CDS_INIT_LIST_HEAD(&session->wildcards); uuid_generate(session->uuid); cds_list_add(&session->list, &sessions); @@ -273,7 +238,6 @@ void ltt_session_destroy(struct ltt_session *session) { struct ltt_channel *chan, *tmpchan; struct ltt_event *event, *tmpevent; - struct session_loglevel *loglevel, *tmploglevel; struct session_wildcard *wildcard, *tmpwildcard; int ret; @@ -283,8 +247,6 @@ void ltt_session_destroy(struct ltt_session *session) WARN_ON(ret); } synchronize_trace(); /* Wait for in-flight events to complete */ - cds_list_for_each_entry_safe(loglevel, tmploglevel, &session->loglevels, list) - _ltt_loglevel_destroy(loglevel); cds_list_for_each_entry_safe(wildcard, tmpwildcard, &session->wildcards, list) _ltt_wildcard_destroy(wildcard); cds_list_for_each_entry_safe(event, tmpevent, &session->events, list) @@ -444,26 +406,6 @@ void _ltt_channel_destroy(struct ltt_channel *chan) chan->ops->channel_destroy(chan); } -int ltt_loglevel_create(struct ltt_channel *chan, - struct lttng_ust_event *event_param, - struct session_loglevel **_sl) -{ - struct session_loglevel *sl; - - sl = add_loglevel(event_param->name, chan, event_param); - if (!sl || IS_ERR(sl)) { - return PTR_ERR(sl); - } - *_sl = sl; - return 0; -} - -static -void _ltt_loglevel_destroy(struct session_loglevel *sl) -{ - _remove_loglevel(sl); -} - int ltt_wildcard_create(struct ltt_channel *chan, struct lttng_ust_event *event_param, struct session_wildcard **_sw) @@ -530,6 +472,9 @@ int ltt_event_create(struct ltt_channel *chan, switch (event_param->instrumentation) { case LTTNG_UST_TRACEPOINT: event->desc = ltt_event_get(event_param->name); + /* TODO: get value from loglevel. */ + + /* TODO: check if loglevel match */ if (event->desc) { ret = __tracepoint_probe_register(event_param->name, event->desc->probe_callback, diff --git a/liblttng-ust/ltt-probes.c b/liblttng-ust/ltt-probes.c index 98928cf3..903e0529 100644 --- a/liblttng-ust/ltt-probes.c +++ b/liblttng-ust/ltt-probes.c @@ -26,14 +26,6 @@ */ static CDS_LIST_HEAD(probe_list); -/* - * Loglevel hash table, containing the active loglevels. - * Protected by ust lock. - */ -#define LOGLEVEL_HASH_BITS 6 -#define LOGLEVEL_TABLE_SIZE (1 << LOGLEVEL_HASH_BITS) -static struct cds_hlist_head loglevel_table[LOGLEVEL_TABLE_SIZE]; - /* * Wildcard list, containing the active wildcards. * Protected by ust lock. @@ -220,227 +212,6 @@ struct lttng_ust_tracepoint_iter * return &entry->tp; } -/* - * Get loglevel if the loglevel is present in the loglevel hash table. - * Must be called with ust lock held. - * Returns NULL if not present. - */ -struct loglevel_entry *get_loglevel(const char *name) -{ - struct cds_hlist_head *head; - struct cds_hlist_node *node; - struct loglevel_entry *e; - size_t name_len = strlen(name); - uint32_t hash; - - if (name_len > LTTNG_UST_SYM_NAME_LEN - 1) { - WARN("Truncating loglevel name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN - 1); - name_len = LTTNG_UST_SYM_NAME_LEN - 1; - } - hash = jhash(name, name_len, 0); - head = &loglevel_table[hash & (LOGLEVEL_TABLE_SIZE - 1)]; - cds_hlist_for_each_entry(e, node, head, hlist) { - if (!strncmp(name, e->name, LTTNG_UST_SYM_NAME_LEN - 1)) - return e; - } - return NULL; -} - -struct loglevel_entry *get_loglevel_value(int64_t value) -{ - char name[LTTNG_UST_SYM_NAME_LEN]; - int ret; - - ret = snprintf(name, LTTNG_UST_SYM_NAME_LEN, "%lld", (long long) value); - if (ret < 0) - return NULL; - return get_loglevel(name); -} - -/* - * marshall all probes/all events and create those that fit the - * loglevel. Add them to the events list as created. - */ -static -void _probes_create_loglevel_events(struct loglevel_entry *entry, - struct session_loglevel *loglevel) -{ - struct lttng_probe_desc *probe_desc; - struct lttng_ust_event event_param; - int i; - - cds_list_for_each_entry(probe_desc, &probe_list, head) { - for (i = 0; i < probe_desc->nr_events; i++) { - const struct tracepoint_loglevel_entry *ev_ll; - const struct lttng_event_desc *event_desc; - int match = 0; - - event_desc = probe_desc->event_desc[i]; - if (!(event_desc->loglevel)) - continue; - ev_ll = *event_desc->loglevel; - if (isdigit(entry->name[0])) { - if (atoll(entry->name) == ev_ll->value) { - match = 1; - } - } else if (!strncmp(ev_ll->identifier, entry->name, - LTTNG_UST_SYM_NAME_LEN - 1)) { - match = 1; - } - - if (match) { - struct ltt_event *ev; - int ret; - - memcpy(&event_param, &loglevel->event_param, - sizeof(event_param)); - memcpy(event_param.name, - event_desc->name, - sizeof(event_param.name)); - /* create event */ - ret = ltt_event_create(loglevel->chan, - &event_param, NULL, - &ev); - if (ret) { - DBG("Error creating event"); - continue; - } - cds_list_add(&ev->loglevel_list, - &loglevel->events); - } - } - } -} - -/* - * Add the loglevel to the loglevel hash table. Must be called with - * ust lock held. - * TODO: should be integrated with events and wildcards. - */ -struct session_loglevel *add_loglevel(const char *name, - struct ltt_channel *chan, - struct lttng_ust_event *event_param) -{ - struct cds_hlist_head *head; - struct cds_hlist_node *node; - struct loglevel_entry *e; - struct session_loglevel *sl; - int found = 0; - size_t name_len = strlen(name); - uint32_t hash; - - if (name_len > LTTNG_UST_SYM_NAME_LEN - 1) { - WARN("Truncating loglevel name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN - 1); - name_len = LTTNG_UST_SYM_NAME_LEN - 1; - } - hash = jhash(name, name_len, 0); - /* loglevel entry */ - head = &loglevel_table[hash & (LOGLEVEL_TABLE_SIZE - 1)]; - cds_hlist_for_each_entry(e, node, head, hlist) { - if (!strncmp(name, e->name, LTTNG_UST_SYM_NAME_LEN - 1)) { - found = 1; - break; - } - } - - if (!found) { - /* - * Using zmalloc here to allocate a variable length element. Could - * cause some memory fragmentation if overused. - */ - e = zmalloc(sizeof(struct loglevel_entry) + name_len + 1); - if (!e) - return ERR_PTR(-ENOMEM); - memcpy(&e->name[0], name, name_len + 1); - e->name[name_len] = '\0'; - cds_hlist_add_head(&e->hlist, head); - CDS_INIT_LIST_HEAD(&e->session_list); - } - - /* session loglevel */ - cds_list_for_each_entry(sl, &e->session_list, session_list) { - if (chan == sl->chan) { - DBG("loglevel %s busy for this channel", name); - return ERR_PTR(-EEXIST); /* Already there */ - } - } - sl = zmalloc(sizeof(struct session_loglevel)); - if (!sl) - return ERR_PTR(-ENOMEM); - sl->chan = chan; - sl->enabled = 1; - memcpy(&sl->event_param, event_param, sizeof(sl->event_param)); - sl->event_param.instrumentation = LTTNG_UST_TRACEPOINT; - CDS_INIT_LIST_HEAD(&sl->events); - cds_list_add(&sl->list, &chan->session->loglevels); - cds_list_add(&sl->session_list, &e->session_list); - sl->entry = e; - _probes_create_loglevel_events(e, sl); - return sl; -} - -/* - * Remove the loglevel from the loglevel hash table. Must be called with - * ust_lock held. Only called at session teardown. - */ -void _remove_loglevel(struct session_loglevel *loglevel) -{ - struct ltt_event *ev, *tmp; - - /* - * Just remove the events owned (for enable/disable) by this - * loglevel from the list. The session teardown will take care - * of freeing the event memory. - */ - cds_list_for_each_entry_safe(ev, tmp, &loglevel->events, - loglevel_list) { - cds_list_del(&ev->loglevel_list); - } - cds_list_del(&loglevel->session_list); - cds_list_del(&loglevel->list); - if (cds_list_empty(&loglevel->entry->session_list)) { - cds_hlist_del(&loglevel->entry->hlist); - free(loglevel->entry); - } - free(loglevel); -} - -int ltt_loglevel_enable(struct session_loglevel *loglevel) -{ - struct ltt_event *ev; - int ret; - - if (loglevel->enabled) - return -EEXIST; - cds_list_for_each_entry(ev, &loglevel->events, loglevel_list) { - ret = ltt_event_enable(ev); - if (ret) { - DBG("Error: enable error.\n"); - return ret; - } - } - loglevel->enabled = 1; - return 0; -} - -int ltt_loglevel_disable(struct session_loglevel *loglevel) -{ - struct ltt_event *ev; - int ret; - - if (!loglevel->enabled) - return -EEXIST; - cds_list_for_each_entry(ev, &loglevel->events, loglevel_list) { - ret = ltt_event_disable(ev); - if (ret) { - DBG("Error: disable error.\n"); - return ret; - } - } - loglevel->enabled = 0; - return 0; -} - /* WILDCARDS */ /* @@ -488,6 +259,11 @@ void _probes_create_wildcard_events(struct wildcard_entry *entry, && (strlen(entry->name) == 1 || !strncmp(event_desc->name, entry->name, strlen(entry->name) - 1))) { + /* TODO: get value from loglevel. */ + + /* TODO: check if loglevel match */ + //if (event_desc->loglevel + // && (*event_desc->loglevel)->value ...) match = 1; } if (match) { @@ -515,7 +291,7 @@ void _probes_create_wildcard_events(struct wildcard_entry *entry, } /* - * Add the wildcard to the wildcard hash table. Must be called with + * Add the wildcard to the wildcard list. Must be called with * ust lock held. */ struct session_wildcard *add_wildcard(const char *name, @@ -527,7 +303,7 @@ struct session_wildcard *add_wildcard(const char *name, size_t name_len = strlen(name) + 1; int found = 0; - /* wildcard entry */ + /* try to find global wildcard entry */ cds_list_for_each_entry(e, &wildcard_list, list) { if (!strncmp(name, e->name, LTTNG_UST_SYM_NAME_LEN - 1)) { found = 1; @@ -537,8 +313,9 @@ struct session_wildcard *add_wildcard(const char *name, if (!found) { /* - * Using zmalloc here to allocate a variable length element. Could - * cause some memory fragmentation if overused. + * Create global wildcard entry if not found. Using + * zmalloc here to allocate a variable length element. + * Could cause some memory fragmentation if overused. */ e = zmalloc(sizeof(struct wildcard_entry) + name_len); if (!e) @@ -571,7 +348,7 @@ struct session_wildcard *add_wildcard(const char *name, } /* - * Remove the wildcard from the wildcard hash table. Must be called with + * Remove the wildcard from the wildcard list. Must be called with * ust_lock held. Only called at session teardown. */ void _remove_wildcard(struct session_wildcard *wildcard) diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c index baea8885..7e7078e0 100644 --- a/liblttng-ust/lttng-ust-abi.c +++ b/liblttng-ust/lttng-ust-abi.c @@ -203,7 +203,6 @@ static const struct lttng_ust_objd_ops lttng_session_ops; static const struct lttng_ust_objd_ops lttng_channel_ops; static const struct lttng_ust_objd_ops lttng_metadata_ops; static const struct lttng_ust_objd_ops lttng_event_ops; -static const struct lttng_ust_objd_ops lttng_loglevel_ops; static const struct lttng_ust_objd_ops lttng_wildcard_ops; static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops; static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops; @@ -968,62 +967,6 @@ static const struct lttng_ust_objd_ops lttng_event_ops = { .cmd = lttng_event_cmd, }; -/** - * lttng_loglevel_cmd - lttng control through object descriptors - * - * @objd: the object descriptor - * @cmd: the command - * @arg: command arg - * @uargs: UST arguments (internal) - * - * This object descriptor implements lttng commands: - * LTTNG_UST_CONTEXT - * Prepend a context field to each record of events of this - * loglevel. - * LTTNG_UST_ENABLE - * Enable recording for these loglevel events (weak enable) - * LTTNG_UST_DISABLE - * Disable recording for these loglevel events (strong disable) - */ -static -long lttng_loglevel_cmd(int objd, unsigned int cmd, unsigned long arg, - union ust_args *uargs) -{ - struct session_loglevel *loglevel = objd_private(objd); - - switch (cmd) { - case LTTNG_UST_CONTEXT: - return -ENOSYS; /* not implemented yet */ -#if 0 - return lttng_abi_add_context(objd, - (struct lttng_ust_context *) arg, - &loglevel->ctx, loglevel->chan->session); -#endif - case LTTNG_UST_ENABLE: - return ltt_loglevel_enable(loglevel); - case LTTNG_UST_DISABLE: - return ltt_loglevel_disable(loglevel); - default: - return -EINVAL; - } -} - -static -int lttng_loglevel_release(int objd) -{ - struct session_loglevel *loglevel = objd_private(objd); - - if (loglevel) - return lttng_ust_objd_unref(loglevel->chan->objd); - return 0; -} - -/* TODO: filter control ioctl */ -static const struct lttng_ust_objd_ops lttng_loglevel_ops = { - .release = lttng_loglevel_release, - .cmd = lttng_loglevel_cmd, -}; - /** * lttng_wildcard_cmd - lttng control through object descriptors * -- 2.34.1