/*
* Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License, version 2 only, as
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
-#include <string.h>
#include <inttypes.h>
#include <urcu/list.h>
#include <urcu/uatomic.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/relayd/relayd.h>
#include <common/utils.h>
+#include <common/compat/string.h>
#include "channel.h"
#include "consumer.h"
}
}
+static void increment_extended_len(const char *filter_expression,
+ size_t *extended_len)
+{
+ *extended_len += sizeof(struct lttcomm_event_extended_header);
+
+ if (filter_expression) {
+ *extended_len += strlen(filter_expression) + 1;
+ }
+}
+
+static void append_extended_info(const char *filter_expression,
+ void **extended_at)
+{
+ struct lttcomm_event_extended_header extended_header;
+ size_t filter_len = 0;
+
+ if (filter_expression) {
+ filter_len = strlen(filter_expression) + 1;
+ }
+
+ extended_header.filter_len = filter_len;
+ memcpy(*extended_at, &extended_header, sizeof(extended_header));
+ *extended_at += sizeof(extended_header);
+ memcpy(*extended_at, filter_expression, filter_len);
+ *extended_at += filter_len;
+}
+
/*
* Create a list of agent domain events.
*
* Return number of events in list on success or else a negative value.
*/
static int list_lttng_agent_events(struct agent *agt,
- struct lttng_event **events)
+ struct lttng_event **events, size_t *total_size)
{
int i = 0, ret = 0;
unsigned int nb_event = 0;
struct agent_event *event;
struct lttng_event *tmp_events;
struct lttng_ht_iter iter;
+ size_t extended_len = 0;
+ void *extended_at;
assert(agt);
assert(events);
rcu_read_unlock();
if (nb_event == 0) {
ret = nb_event;
+ *total_size = 0;
goto error;
}
- tmp_events = zmalloc(nb_event * sizeof(*tmp_events));
+ /* Compute required extended infos size */
+ extended_len = nb_event * sizeof(struct lttcomm_event_extended_header);
+
+ /*
+ * This is only valid because the commands which add events are
+ * processed in the same thread as the listing.
+ */
+ rcu_read_lock();
+ cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
+ increment_extended_len(event->filter_expression, &extended_len);
+ }
+ rcu_read_unlock();
+
+ *total_size = nb_event * sizeof(*tmp_events) + extended_len;
+ tmp_events = zmalloc(*total_size);
if (!tmp_events) {
PERROR("zmalloc agent events session");
ret = -LTTNG_ERR_FATAL;
goto error;
}
+ extended_at = ((uint8_t *) tmp_events) +
+ nb_event * sizeof(struct lttng_event);
+
rcu_read_lock();
cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
strncpy(tmp_events[i].name, event->name, sizeof(tmp_events[i].name));
tmp_events[i].name[sizeof(tmp_events[i].name) - 1] = '\0';
tmp_events[i].enabled = event->enabled;
- tmp_events[i].loglevel = event->loglevel;
+ tmp_events[i].loglevel = event->loglevel_value;
tmp_events[i].loglevel_type = event->loglevel_type;
i++;
+
+ /* Append extended info */
+ append_extended_info(event->filter_expression, &extended_at);
}
rcu_read_unlock();
* Create a list of ust global domain events.
*/
static int list_lttng_ust_global_events(char *channel_name,
- struct ltt_ust_domain_global *ust_global, struct lttng_event **events)
+ struct ltt_ust_domain_global *ust_global,
+ struct lttng_event **events, size_t *total_size)
{
int i = 0, ret = 0;
unsigned int nb_event = 0;
struct ltt_ust_channel *uchan;
struct ltt_ust_event *uevent;
struct lttng_event *tmp;
+ size_t extended_len = 0;
+ void *extended_at;
DBG("Listing UST global events for channel %s", channel_name);
node = lttng_ht_iter_get_node_str(&iter);
if (node == NULL) {
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
- goto error;
+ goto end;
}
uchan = caa_container_of(&node->node, struct ltt_ust_channel, node.node);
nb_event = lttng_ht_get_count(uchan->events);
if (nb_event == 0) {
ret = nb_event;
- goto error;
+ *total_size = 0;
+ goto end;
}
DBG3("Listing UST global %d events", nb_event);
- tmp = zmalloc(nb_event * sizeof(struct lttng_event));
+ /* Compute required extended infos size */
+ cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
+ if (uevent->internal) {
+ nb_event--;
+ continue;
+ }
+
+ increment_extended_len(uevent->filter_expression,
+ &extended_len);
+ }
+ if (nb_event == 0) {
+ /* All events are internal, skip. */
+ ret = 0;
+ *total_size = 0;
+ goto end;
+ }
+
+ *total_size = nb_event * sizeof(struct lttng_event) + extended_len;
+ tmp = zmalloc(*total_size);
if (tmp == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
}
+ extended_at = ((uint8_t *) tmp) + nb_event * sizeof(struct lttng_event);
+
cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
if (uevent->internal) {
/* This event should remain hidden from clients */
- nb_event--;
continue;
}
strncpy(tmp[i].name, uevent->attr.name, LTTNG_SYMBOL_NAME_LEN);
tmp[i].exclusion = 1;
}
i++;
+
+ /* Append extended info */
+ append_extended_info(uevent->filter_expression, &extended_at);
}
ret = nb_event;
*events = tmp;
-
-error:
+end:
rcu_read_unlock();
return ret;
}
* Fill lttng_event array of all kernel events in the channel.
*/
static int list_lttng_kernel_events(char *channel_name,
- struct ltt_kernel_session *kernel_session, struct lttng_event **events)
+ struct ltt_kernel_session *kernel_session,
+ struct lttng_event **events, size_t *total_size)
{
int i = 0, ret;
unsigned int nb_event;
struct ltt_kernel_event *event;
struct ltt_kernel_channel *kchan;
+ size_t extended_len = 0;
+ void *extended_at;
kchan = trace_kernel_get_channel_by_name(channel_name, kernel_session);
if (kchan == NULL) {
DBG("Listing events for channel %s", kchan->channel->name);
if (nb_event == 0) {
+ *total_size = 0;
*events = NULL;
goto syscall;
}
- *events = zmalloc(nb_event * sizeof(struct lttng_event));
+ /* Compute required extended infos size */
+ cds_list_for_each_entry(event, &kchan->events_list.head, list) {
+ increment_extended_len(event->filter_expression, &extended_len);
+ }
+
+ *total_size = nb_event * sizeof(struct lttng_event) + extended_len;
+ *events = zmalloc(*total_size);
if (*events == NULL) {
ret = LTTNG_ERR_FATAL;
goto error;
}
+ extended_at = ((uint8_t *) events) +
+ nb_event * sizeof(struct lttng_event);
+
/* Kernel channels */
cds_list_for_each_entry(event, &kchan->events_list.head , list) {
strncpy((*events)[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN);
break;
}
i++;
+
+ /* Append extended info */
+ append_extended_info(event->filter_expression, &extended_at);
}
syscall:
assert(attr);
assert(domain);
- len = strnlen(attr->name, sizeof(attr->name));
+ len = lttng_strnlen(attr->name, sizeof(attr->name));
/* Validate channel name */
if (attr->name[0] == '.' ||
break;
}
case LTTNG_DOMAIN_UST:
+ case LTTNG_DOMAIN_JUL:
+ case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_DOMAIN_PYTHON:
{
struct ltt_ust_channel *uchan;
+ /*
+ * FIXME
+ *
+ * Current agent implementation limitations force us to allow
+ * only one channel at once in "agent" subdomains. Each
+ * subdomain has a default channel name which must be strictly
+ * adhered to.
+ */
+ if (domain->type == LTTNG_DOMAIN_JUL) {
+ if (strncmp(attr->name, DEFAULT_JUL_CHANNEL_NAME,
+ LTTNG_SYMBOL_NAME_LEN)) {
+ ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+ goto error;
+ }
+ } else if (domain->type == LTTNG_DOMAIN_LOG4J) {
+ if (strncmp(attr->name, DEFAULT_LOG4J_CHANNEL_NAME,
+ LTTNG_SYMBOL_NAME_LEN)) {
+ ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+ goto error;
+ }
+ } else if (domain->type == LTTNG_DOMAIN_PYTHON) {
+ if (strncmp(attr->name, DEFAULT_PYTHON_CHANNEL_NAME,
+ LTTNG_SYMBOL_NAME_LEN)) {
+ ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+ goto error;
+ }
+ }
+
chan_ht = usess->domain_global.channels;
uchan = trace_ust_find_channel_by_name(chan_ht, attr->name);
switch (event->type) {
case LTTNG_EVENT_ALL:
- ret = event_kernel_disable_event_all(kchan);
- if (ret != LTTNG_OK) {
- goto error_unlock;
- }
- break;
- case LTTNG_EVENT_TRACEPOINT: /* fall-through */
+ case LTTNG_EVENT_TRACEPOINT:
case LTTNG_EVENT_SYSCALL:
- if (!strcmp(event_name, "*")) {
- ret = event_kernel_disable_event_type(kchan,
- event->type);
+ case LTTNG_EVENT_PROBE:
+ case LTTNG_EVENT_FUNCTION:
+ case LTTNG_EVENT_FUNCTION_ENTRY:/* fall-through */
+ if (event_name[0] == '\0') {
+ ret = event_kernel_disable_event(kchan,
+ NULL, event->type);
} else {
ret = event_kernel_disable_event(kchan,
- event_name);
- }
- if (ret != LTTNG_OK) {
- goto error_unlock;
+ event_name, event->type);
}
- break;
- case LTTNG_EVENT_PROBE:
- case LTTNG_EVENT_FUNCTION:
- case LTTNG_EVENT_FUNCTION_ENTRY:
- ret = event_kernel_disable_event(kchan, event_name);
if (ret != LTTNG_OK) {
goto error_unlock;
}
/*
* If a non-default channel has been created in the
- * session, explicitely require that -c chan_name needs
+ * session, explicitly require that -c chan_name needs
* to be provided.
*/
if (usess->has_non_default_channel && channel_name[0] == '\0') {
switch (event->type) {
case LTTNG_EVENT_ALL:
- ret = event_ust_disable_tracepoint(usess, uchan, event_name);
+ /*
+ * An empty event name means that everything
+ * should be disabled.
+ */
+ if (event->name[0] == '\0') {
+ ret = event_ust_disable_all_tracepoints(usess, uchan);
+ } else {
+ ret = event_ust_disable_tracepoint(usess, uchan,
+ event_name);
+ }
if (ret != LTTNG_OK) {
goto error_unlock;
}
ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error_unlock;
}
- /* The wild card * means that everything should be disabled. */
- if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
+ /*
+ * An empty event name means that everything
+ * should be disabled.
+ */
+ if (event->name[0] == '\0') {
ret = event_agent_disable_all(usess, agt);
} else {
ret = event_agent_disable(usess, agt, event_name);
char *channel_name, struct lttng_event_context *ctx, int kwpipe)
{
int ret, chan_kern_created = 0, chan_ust_created = 0;
+ char *app_ctx_provider_name = NULL, *app_ctx_name = NULL;
+
+ if (ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
+ app_ctx_provider_name = ctx->u.app_ctx.provider_name;
+ app_ctx_name = ctx->u.app_ctx.ctx_name;
+ }
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
goto error;
}
break;
+ case LTTNG_DOMAIN_JUL:
+ case LTTNG_DOMAIN_LOG4J:
+ {
+ /*
+ * Validate channel name.
+ * If no channel name is given and the domain is JUL or LOG4J,
+ * set it to the appropriate domain-specific channel name. If
+ * a name is provided but does not match the expexted channel
+ * name, return an error.
+ */
+ if (domain == LTTNG_DOMAIN_JUL && *channel_name &&
+ strcmp(channel_name,
+ DEFAULT_JUL_CHANNEL_NAME)) {
+ ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+ goto error;
+ } else if (domain == LTTNG_DOMAIN_LOG4J && *channel_name &&
+ strcmp(channel_name,
+ DEFAULT_LOG4J_CHANNEL_NAME)) {
+ ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+ goto error;
+ }
+ /* break is _not_ missing here. */
+ }
case LTTNG_DOMAIN_UST:
{
struct ltt_ust_session *usess = session->ust_session;
}
ret = context_ust_add(usess, domain, ctx, channel_name);
+ free(app_ctx_provider_name);
+ free(app_ctx_name);
+ app_ctx_name = NULL;
+ app_ctx_provider_name = NULL;
if (ret != LTTNG_OK) {
goto error;
}
goto error;
}
- return LTTNG_OK;
+ ret = LTTNG_OK;
+ goto end;
error:
if (chan_kern_created) {
uchan);
trace_ust_destroy_channel(uchan);
}
+end:
+ free(app_ctx_provider_name);
+ free(app_ctx_name);
return ret;
}
DBG("Enable event command for event \'%s\'", event->name);
+ rcu_read_lock();
+
ret = validate_event_name(event->name);
if (ret) {
goto error;
}
- rcu_read_lock();
-
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
{
event->type = LTTNG_EVENT_SYSCALL; /* Hack */
ret = event_kernel_enable_event(kchan, event,
filter_expression_a, filter_a);
+ /* We have passed ownership */
+ filter_expression_a = NULL;
+ filter_a = NULL;
if (ret != LTTNG_OK) {
- free(filter_expression_a);
- free(filter_a);
goto error;
}
break;
filter_expression = NULL;
filter = NULL;
exclusion = NULL;
- if (ret != LTTNG_OK) {
+ if (ret == LTTNG_ERR_UST_EVENT_ENABLED) {
+ goto already_enabled;
+ } else if (ret != LTTNG_OK) {
goto error;
}
break;
filter_copy = zmalloc(filter_size);
if (!filter_copy) {
ret = LTTNG_ERR_NOMEM;
+ goto error;
}
memcpy(filter_copy, filter, filter_size);
filter_copy, NULL, wpipe);
}
- if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
+ if (ret == LTTNG_ERR_UST_EVENT_ENABLED) {
+ goto already_enabled;
+ } else if (ret != LTTNG_OK) {
goto error;
}
ret = LTTNG_OK;
+already_enabled:
error:
free(filter_expression);
free(filter);
* Create session in no output mode with URIs set to NULL. The uris we've
* received are for a default snapshot output if one.
*/
- ret = cmd_create_session_uri(name, NULL, 0, creds, -1);
+ ret = cmd_create_session_uri(name, NULL, 0, creds, 0);
if (ret != LTTNG_OK) {
goto error;
}
*/
ssize_t cmd_list_events(enum lttng_domain_type domain,
struct ltt_session *session, char *channel_name,
- struct lttng_event **events)
+ struct lttng_event **events, size_t *total_size)
{
int ret = 0;
ssize_t nb_event = 0;
case LTTNG_DOMAIN_KERNEL:
if (session->kernel_session != NULL) {
nb_event = list_lttng_kernel_events(channel_name,
- session->kernel_session, events);
+ session->kernel_session, events,
+ total_size);
}
break;
case LTTNG_DOMAIN_UST:
{
if (session->ust_session != NULL) {
nb_event = list_lttng_ust_global_events(channel_name,
- &session->ust_session->domain_global, events);
+ &session->ust_session->domain_global, events,
+ total_size);
}
break;
}
rcu_read_lock();
cds_lfht_for_each_entry(session->ust_session->agents->ht,
&iter.iter, agt, node.node) {
- nb_event = list_lttng_agent_events(agt, events);
+ if (agt->domain == domain) {
+ nb_event = list_lttng_agent_events(
+ agt, events,
+ total_size);
+ break;
+ }
}
rcu_read_unlock();
}
projects / lttng-tools.git / blobdiff