/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * 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 published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _GNU_SOURCE
#include "trace-kernel.h"
#include "trace-ust.h"
+/*
+ * Add unique UST event based on the event name, filter bytecode and loglevel.
+ */
+static void add_unique_ust_event(struct lttng_ht *ht,
+ struct ltt_ust_event *event)
+{
+ struct cds_lfht_node *node_ptr;
+ struct ltt_ust_ht_key key;
+
+ assert(ht);
+ assert(ht->ht);
+ assert(event);
+
+ key.name = event->attr.name;
+ key.filter = (struct lttng_filter_bytecode *) event->filter;
+ key.loglevel = event->attr.loglevel;
+
+ node_ptr = cds_lfht_add_unique(ht->ht,
+ ht->hash_fct(event->node.key, lttng_ht_seed),
+ trace_ust_ht_match_event, &key, &event->node.node);
+ assert(node_ptr == &event->node.node);
+}
+
/*
* Setup a lttng_event used to enable *all* syscall tracing.
*/
kevent = trace_kernel_get_event_by_name(event_name, kchan);
if (kevent == NULL) {
- ret = LTTCOMM_NO_EVENT;
+ ret = LTTNG_ERR_NO_EVENT;
goto error;
}
ret = kernel_disable_event(kevent);
if (ret < 0) {
- ret = LTTCOMM_KERN_DISABLE_FAIL;
+ ret = LTTNG_ERR_KERN_DISABLE_FAIL;
goto error;
}
DBG("Kernel event %s disable for channel %s.",
kevent->event->name, kchan->channel->name);
- ret = LTTCOMM_OK;
+ ret = LTTNG_OK;
error:
return ret;
continue;
}
}
- ret = LTTCOMM_OK;
+ ret = LTTNG_OK;
return ret;
}
struct ltt_kernel_channel *kchan)
{
ERR("Cannot disable syscall tracing for existing session. Please destroy session instead.");
- return LTTCOMM_OK; /* Return OK so disable all succeeds */
+ return LTTNG_OK; /* Return OK so disable all succeeds */
}
/*
int ret;
ret = event_kernel_disable_all_tracepoints(ksession, kchan);
- if (ret != LTTCOMM_OK)
+ if (ret != LTTNG_OK)
return ret;
ret = event_kernel_disable_all_syscalls(ksession, kchan);
return ret;
if (kevent == NULL) {
ret = kernel_create_event(event, kchan);
if (ret < 0) {
- if (ret == -EEXIST) {
- ret = LTTCOMM_KERN_EVENT_EXIST;
- } else {
- ret = LTTCOMM_KERN_ENABLE_FAIL;
+ switch (-ret) {
+ case EEXIST:
+ ret = LTTNG_ERR_KERN_EVENT_EXIST;
+ break;
+ case ENOSYS:
+ ret = LTTNG_ERR_KERN_EVENT_ENOSYS;
+ break;
+ default:
+ ret = LTTNG_ERR_KERN_ENABLE_FAIL;
+ break;
}
goto end;
}
} else if (kevent->enabled == 0) {
ret = kernel_enable_event(kevent);
if (ret < 0) {
- ret = LTTCOMM_KERN_ENABLE_FAIL;
+ ret = LTTNG_ERR_KERN_ENABLE_FAIL;
goto end;
}
+ } else {
+ /* At this point, the event is considered enabled */
+ ret = LTTNG_ERR_KERN_EVENT_EXIST;
+ goto end;
}
- ret = LTTCOMM_OK;
+
+ ret = LTTNG_OK;
end:
return ret;
}
size = kernel_list_events(kernel_tracer_fd, &event_list);
if (size < 0) {
- ret = LTTCOMM_KERN_LIST_FAIL;
+ ret = LTTNG_ERR_KERN_LIST_FAIL;
goto end;
}
}
free(event_list);
- ret = LTTCOMM_OK;
+ ret = LTTNG_OK;
end:
return ret;
ret = kernel_create_event(&event, kchan);
if (ret < 0) {
if (ret == -EEXIST) {
- ret = LTTCOMM_KERN_EVENT_EXIST;
+ ret = LTTNG_ERR_KERN_EVENT_EXIST;
} else {
- ret = LTTCOMM_KERN_ENABLE_FAIL;
+ ret = LTTNG_ERR_KERN_ENABLE_FAIL;
}
goto end;
}
- ret = LTTCOMM_OK;
+ ret = LTTNG_OK;
end:
return ret;
}
int event_kernel_enable_all(struct ltt_kernel_session *ksession,
struct ltt_kernel_channel *kchan, int kernel_tracer_fd)
{
- int ret;
+ int tp_ret;
- ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd);
- if (ret != LTTCOMM_OK) {
+ tp_ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd);
+ if (tp_ret != LTTNG_OK) {
goto end;
}
- ret = event_kernel_enable_all_syscalls(ksession, kchan, kernel_tracer_fd);
+
+ /*
+ * Reaching this code path means that all tracepoints were enabled without
+ * errors so we ignore the error value of syscalls.
+ *
+ * At the moment, failing to enable syscalls on "lttng enable-event -a -k"
+ * is not considered an error that need to be returned to the client since
+ * tracepoints did not fail. Future work will allow us to send back
+ * multiple errors to the client in one API call.
+ */
+ (void) event_kernel_enable_all_syscalls(ksession, kchan, kernel_tracer_fd);
+
end:
- return ret;
+ return tp_ret;
}
/*
* Enable all UST tracepoints for a channel from a UST session.
*/
int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
- struct ltt_ust_channel *uchan)
+ struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter)
{
- int ret, i;
- size_t size;
+ int ret, i, size;
struct lttng_ht_iter iter;
struct ltt_ust_event *uevent = NULL;
struct lttng_event *events = NULL;
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_UST:
{
/* Get all UST available events */
size = ust_app_list_events(&events);
if (size < 0) {
- ret = LTTCOMM_UST_LIST_FAIL;
+ ret = LTTNG_ERR_UST_LIST_FAIL;
goto error;
}
* Check if event exist and if so, continue since it was enable
* previously.
*/
- uevent = trace_ust_find_event_by_name(uchan->events,
- events[i].name);
+ uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
+ events[i].loglevel);
if (uevent != NULL) {
ret = ust_app_enable_event_pid(usess, uchan, uevent,
events[i].pid);
if (ret < 0) {
- if (ret != -EEXIST) {
- ret = LTTCOMM_UST_ENABLE_FAIL;
+ if (ret != -LTTNG_UST_ERR_EXIST) {
+ ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
}
}
}
/* Create ust event */
- uevent = trace_ust_create_event(&events[i]);
+ uevent = trace_ust_create_event(&events[i], filter);
if (uevent == NULL) {
- ret = LTTCOMM_FATAL;
+ ret = LTTNG_ERR_FATAL;
goto error_destroy;
}
ret = ust_app_enable_event_pid(usess, uchan, uevent,
events[i].pid);
if (ret < 0) {
- if (ret == -EEXIST) {
- ret = LTTCOMM_UST_EVENT_EXIST;
+ if (ret == -LTTNG_UST_ERR_EXIST) {
+ ret = LTTNG_ERR_UST_EVENT_EXIST;
goto error;
} else {
- ret = LTTCOMM_UST_ENABLE_FAIL;
+ ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error_destroy;
}
}
uevent->enabled = 1;
/* Add ltt ust event to channel */
rcu_read_lock();
- lttng_ht_add_unique_str(uchan->events, &uevent->node);
+ add_unique_ust_event(uchan->events, uevent);
rcu_read_unlock();
}
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_UND;
+ ret = LTTNG_ERR_UND;
goto error;
}
- return LTTCOMM_OK;
+ rcu_read_unlock();
+ return LTTNG_OK;
error_destroy:
trace_ust_destroy_event(uevent);
error:
free(events);
+ rcu_read_unlock();
return ret;
}
* Enable UST tracepoint event for a channel from a UST session.
*/
int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain,
- struct ltt_ust_channel *uchan, struct lttng_event *event)
+ struct ltt_ust_channel *uchan, struct lttng_event *event,
+ struct lttng_filter_bytecode *filter)
{
- int ret = LTTCOMM_OK, to_create = 0;
+ int ret = LTTNG_OK, to_create = 0;
struct ltt_ust_event *uevent;
- uevent = trace_ust_find_event_by_name(uchan->events, event->name);
+ rcu_read_lock();
+
+ uevent = trace_ust_find_event(uchan->events, event->name, filter,
+ event->loglevel);
if (uevent == NULL) {
- uevent = trace_ust_create_event(event);
+ uevent = trace_ust_create_event(event, filter);
if (uevent == NULL) {
- ret = LTTCOMM_FATAL;
+ ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
}
+
/* Valid to set it after the goto error since uevent is still NULL */
to_create = 1;
}
if (uevent->enabled) {
/* It's already enabled so everything is OK */
+ ret = LTTNG_OK;
goto end;
}
}
if (ret < 0) {
- if (ret == -EEXIST) {
- ret = LTTCOMM_UST_EVENT_EXIST;
+ if (ret == -LTTNG_UST_ERR_EXIST) {
+ ret = LTTNG_ERR_UST_EVENT_EXIST;
goto end;
} else {
- ret = LTTCOMM_UST_ENABLE_FAIL;
+ ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
}
}
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_UND;
+ ret = LTTNG_ERR_UND;
goto end;
}
if (to_create) {
- rcu_read_lock();
/* Add ltt ust event to channel */
- lttng_ht_add_unique_str(uchan->events, &uevent->node);
- rcu_read_unlock();
+ add_unique_ust_event(uchan->events, uevent);
}
DBG("Event UST %s %s in channel %s", uevent->attr.name,
to_create ? "created" : "enabled", uchan->name);
- ret = LTTCOMM_OK;
+ ret = LTTNG_OK;
end:
+ rcu_read_unlock();
return ret;
error:
/* In this code path, the uevent was not added to the hash table */
trace_ust_destroy_event(uevent);
}
+ rcu_read_unlock();
return ret;
}
{
int ret;
struct ltt_ust_event *uevent;
+ struct lttng_ht_node_str *node;
+ struct lttng_ht_iter iter;
+ struct lttng_ht *ht;
- uevent = trace_ust_find_event_by_name(uchan->events, event_name);
- if (uevent == NULL) {
- ret = LTTCOMM_UST_EVENT_NOT_FOUND;
+ ht = uchan->events;
+
+ rcu_read_lock();
+
+ /*
+ * We use a custom lookup since we need the iterator for the next_duplicate
+ * call in the do while loop below.
+ */
+ cds_lfht_lookup(ht->ht, ht->hash_fct((void *) event_name, lttng_ht_seed),
+ trace_ust_ht_match_event_by_name, event_name, &iter.iter);
+ node = lttng_ht_iter_get_node_str(&iter);
+ if (node == NULL) {
+ DBG2("Trace UST event NOT found by name %s", event_name);
+ ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error;
}
- if (uevent->enabled == 0) {
- /* It's already enabled so everything is OK */
- ret = LTTCOMM_OK;
- goto end;
- }
+ do {
+ uevent = caa_container_of(node, struct ltt_ust_event, node);
+ assert(uevent);
- switch (domain) {
- case LTTNG_DOMAIN_UST:
- ret = ust_app_disable_event_glb(usess, uchan, uevent);
- if (ret < 0 && ret != -EEXIST) {
- ret = LTTCOMM_UST_DISABLE_FAIL;
- goto error;
+ if (uevent->enabled == 0) {
+ /* It's already disabled so everything is OK */
+ ret = LTTNG_OK;
+ continue;
}
- break;
+
+ switch (domain) {
+ case LTTNG_DOMAIN_UST:
+ ret = ust_app_disable_event_glb(usess, uchan, uevent);
+ if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
+ ret = LTTNG_ERR_UST_DISABLE_FAIL;
+ goto error;
+ }
+ break;
#if 0
- case LTTNG_DOMAIN_UST_EXEC_NAME:
- case LTTNG_DOMAIN_UST_PID:
- case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+ case LTTNG_DOMAIN_UST_EXEC_NAME:
+ case LTTNG_DOMAIN_UST_PID:
+ case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
- default:
- ret = LTTCOMM_UND;
- goto error;
- }
+ default:
+ ret = LTTNG_ERR_UND;
+ goto error;
+ }
- uevent->enabled = 0;
- ret = LTTCOMM_OK;
+ uevent->enabled = 0;
-end:
- DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
- uchan->name);
+ DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
+ uchan->name);
+
+ /* Get next duplicate event by name. */
+ cds_lfht_next_duplicate(ht->ht, trace_ust_ht_match_event_by_name,
+ event_name, &iter.iter);
+ node = lttng_ht_iter_get_node_str(&iter);
+ } while (node);
+
+ ret = LTTNG_OK;
error:
+ rcu_read_unlock();
return ret;
}
int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
struct ltt_ust_channel *uchan)
{
- int ret, i;
- size_t size;
+ int ret, i, size;
struct lttng_ht_iter iter;
struct ltt_ust_event *uevent = NULL;
struct lttng_event *events = NULL;
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_UST:
{
cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
node.node) {
if (uevent->enabled == 1) {
- ret = ust_app_disable_event_glb(usess, uchan, uevent);
+ ret = event_ust_disable_tracepoint(usess, domain, uchan,
+ uevent->attr.name);
if (ret < 0) {
continue;
}
- uevent->enabled = 0;
}
}
/* Get all UST available events */
size = ust_app_list_events(&events);
if (size < 0) {
- ret = LTTCOMM_UST_LIST_FAIL;
+ ret = LTTNG_ERR_UST_LIST_FAIL;
goto error;
}
for (i = 0; i < size; i++) {
- uevent = trace_ust_find_event_by_name(uchan->events,
+ ret = event_ust_disable_tracepoint(usess, domain, uchan,
events[i].name);
- if (uevent != NULL && uevent->enabled == 1) {
- ret = ust_app_disable_event_pid(usess, uchan, uevent,
- events[i].pid);
- if (ret < 0 && ret != -EEXIST) {
- ret = LTTCOMM_UST_DISABLE_FAIL;
- goto error;
- }
- uevent->enabled = 0;
+ if (ret != LTTNG_OK) {
+ /* Continue to disable the rest... */
continue;
}
}
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_UND;
+ ret = LTTNG_ERR_UND;
goto error;
}
- return LTTCOMM_OK;
+ rcu_read_unlock();
+ return LTTNG_OK;
error:
free(events);
+ rcu_read_unlock();
return ret;
}
projects / lttng-tools.git / blobdiff