#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
-#include <urcu-bp.h>
-#include <urcu/compiler.h>
-#include <urcu/uatomic.h>
#include <uuid/uuid.h>
-#include <lttng/tracepoint.h>
#include <errno.h>
#include <sys/shm.h>
#include <sys/ipc.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <urcu-bp.h>
+#include <urcu/compiler.h>
+#include <urcu/uatomic.h>
+#include <urcu/arch.h>
+
+#include <lttng/tracepoint.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
-#include "lttng/core.h"
+
+#include <usterr-signal-safe.h>
+#include <helper.h>
+#include "error.h"
+
#include "ltt-tracer.h"
#include "ltt-tracer-core.h"
#include "wait.h"
#include "../libringbuffer/shm.h"
-#include <stdint.h>
-#include <stddef.h>
-#include <urcu/arch.h>
+#include "jhash.h"
/*
* The sessions mutex is the centralized mutex across UST tracing
* control and probe registration. All operations within this file are
* called by the communication thread, under ust_lock protection.
*/
-static DEFINE_MUTEX(sessions_mutex);
+static pthread_mutex_t sessions_mutex = PTHREAD_MUTEX_INITIALIZER;
void ust_lock(void)
{
};
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);
static
struct cds_hlist_head *head;
struct ust_pending_probe *e;
size_t name_len = strlen(name) + 1;
- u32 hash = jhash(name, name_len - 1, 0);
+ uint32_t hash = jhash(name, name_len - 1, 0);
head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
e = zmalloc(sizeof(struct ust_pending_probe) + name_len);
struct ust_pending_probe *e;
const char *name = desc->name;
size_t name_len = strlen(name) + 1;
- u32 hash = jhash(name, name_len - 1, 0);
+ uint32_t hash = jhash(name, name_len - 1, 0);
int ret = 0;
+ struct lttng_ust_event event_param;
+
+ /*
+ * 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;
+
+ wildcard = match_wildcard(desc->name);
+ if (strcmp(desc->name, "lttng_ust:metadata") && wildcard) {
+ struct session_wildcard *sw;
+
+ cds_list_for_each_entry(sw, &wildcard->session_list,
+ session_list) {
+ struct ltt_event *ev;
+ int ret;
+
+ memcpy(&event_param, &sw->event_param,
+ sizeof(event_param));
+ memcpy(event_param.name,
+ desc->name,
+ sizeof(event_param.name));
+ /* create event */
+ ret = ltt_event_create(sw->chan,
+ &event_param, NULL,
+ &ev);
+ if (ret) {
+ DBG("Error creating event");
+ continue;
+ }
+ cds_list_add(&ev->wildcard_list,
+ &sw->events);
+ }
+ }
+ }
head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
cds_hlist_for_each_entry_safe(e, node, p, head, node) {
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);
return session;
{
struct ltt_channel *chan, *tmpchan;
struct ltt_event *event, *tmpevent;
+ struct session_loglevel *loglevel, *tmploglevel;
+ struct session_wildcard *wildcard, *tmpwildcard;
int ret;
CMM_ACCESS_ONCE(session->active) = 0;
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)
_ltt_event_destroy(event);
cds_list_for_each_entry_safe(chan, tmpchan, &session->chan, list)
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)
+{
+ struct session_wildcard *sw;
+
+ sw = add_wildcard(event_param->name, chan, event_param);
+ if (!sw || IS_ERR(sw)) {
+ return PTR_ERR(sw);
+ }
+ *_sw = sw;
+ return 0;
+}
+
+static
+void _ltt_wildcard_destroy(struct session_wildcard *sw)
+{
+ _remove_wildcard(sw);
+}
+
/*
* Supports event creation while tracing session is active.
*/
-struct ltt_event *ltt_event_create(struct ltt_channel *chan,
- struct lttng_ust_event *event_param,
- void *filter)
+int ltt_event_create(struct ltt_channel *chan,
+ struct lttng_ust_event *event_param,
+ void *filter,
+ struct ltt_event **_event)
{
struct ltt_event *event;
- int ret;
+ int ret = 0;
- if (chan->used_event_id == -1UL)
+ if (chan->used_event_id == -1UL) {
+ ret = -ENOMEM;
goto full;
+ }
/*
* This is O(n^2) (for each event, the loop is called at event
* creation). Might require a hash if we have lots of events.
*/
- cds_list_for_each_entry(event, &chan->session->events, list)
- if (event->desc && !strcmp(event->desc->name, event_param->name))
+ cds_list_for_each_entry(event, &chan->session->events, list) {
+ if (event->desc && !strcmp(event->desc->name, event_param->name)) {
+ ret = -EEXIST;
goto exist;
+ }
+ }
event = zmalloc(sizeof(struct ltt_event));
- if (!event)
+ if (!event) {
+ ret = -ENOMEM;
goto cache_error;
+ }
event->chan = chan;
event->filter = filter;
/*
goto add_pending_error;
}
break;
+ case LTTNG_UST_TRACEPOINT_LOGLEVEL:
+ assert(0);
+ break;
default:
WARN_ON_ONCE(1);
}
goto statedump_error;
}
cds_list_add(&event->list, &chan->session->events);
- return event;
+ *_event = event;
+ return 0;
statedump_error:
if (event->desc) {
cache_error:
exist:
full:
- return NULL;
+ return ret;
}
/*
if (ret)
goto end;
+ if (event->desc->loglevel) {
+ const struct tracepoint_loglevel_entry *ll_entry;
+
+ ll_entry = *event->desc->loglevel;
+ ret = lttng_metadata_printf(session,
+ " loglevel.identifier = \"%s\";\n"
+ " loglevel.value = %lld;\n",
+ ll_entry->identifier,
+ (long long) ll_entry->value);
+ if (ret)
+ goto end;
+ }
+
if (event->ctx) {
ret = lttng_metadata_printf(session,
" context := struct {\n");
projects / lttng-ust.git / blobdiff