struct cds_lfht_iter iter;
rcu_read_lock();
- node = hashtable_lookup(ht, (void *) name, strlen(name), &iter);
+ node = hashtable_lookup(ht, (void *)name, strlen(name), &iter);
if (node == NULL) {
rcu_read_unlock();
goto error;
}
rcu_read_unlock();
- DBG2("Found UST event by name %s", name);
+ DBG2("Trace UST event found by name %s", name);
return caa_container_of(node, struct ltt_ust_event, node);
error:
+ DBG2("Trace UST event NOT found by name %s", name);
return NULL;
}
struct ltt_ust_session *lus;
/* Allocate a new ltt ust session */
- lus = malloc(sizeof(struct ltt_ust_session));
+ lus = zmalloc(sizeof(struct ltt_ust_session));
if (lus == NULL) {
- PERROR("create ust session malloc");
+ PERROR("create ust session zmalloc");
goto error;
}
/* Init data structure */
- lus->consumer_fds_sent = 0;
lus->uid = uid;
lus->start_trace = 0;
int ret;
struct ltt_ust_channel *luc;
- luc = malloc(sizeof(struct ltt_ust_channel));
+ luc = zmalloc(sizeof(struct ltt_ust_channel));
if (luc == NULL) {
- perror("ltt_ust_channel malloc");
+ perror("ltt_ust_channel zmalloc");
goto error;
}
}
/* Copy channel name */
- strncpy(luc->name, chan->name, sizeof(&luc->name));
+ strncpy(luc->name, chan->name, sizeof(luc->name));
luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
/* Init node */
hashtable_node_init(&luc->node, (void *) luc->name, strlen(luc->name));
/* Alloc hash tables */
luc->events = hashtable_new_str(0);
- luc->ctx = hashtable_new_str(0);
+ luc->ctx = hashtable_new(0);
/* Set trace output path */
ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
{
struct ltt_ust_event *lue;
- lue = malloc(sizeof(struct ltt_ust_event));
+ lue = zmalloc(sizeof(struct ltt_ust_event));
if (lue == NULL) {
- PERROR("ust event malloc");
+ PERROR("ust event zmalloc");
goto error;
}
case LTTNG_EVENT_TRACEPOINT:
lue->attr.instrumentation = LTTNG_UST_TRACEPOINT;
break;
+ case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+ lue->attr.instrumentation = LTTNG_UST_TRACEPOINT_LOGLEVEL;
+ break;
default:
ERR("Unknown ust instrumentation type (%d)", ev->type);
goto error_free_event;
hashtable_node_init(&lue->node, (void *) lue->attr.name,
strlen(lue->attr.name));
/* Alloc context hash tables */
- lue->ctx = hashtable_new_str(0);
+ lue->ctx = hashtable_new(0);
+
+ DBG2("Trace UST event %s created", lue->attr.name);
return lue;
lum = zmalloc(sizeof(struct ltt_ust_metadata));
if (lum == NULL) {
- perror("ust metadata malloc");
+ perror("ust metadata zmalloc");
goto error;
}
return NULL;
}
+/*
+ * Allocate and initialize an UST context.
+ *
+ * Return pointer to structure or NULL.
+ */
+struct ltt_ust_context *trace_ust_create_context(
+ struct lttng_event_context *ctx)
+{
+ struct ltt_ust_context *uctx;
+
+ uctx = zmalloc(sizeof(struct ltt_ust_context));
+ if (uctx == NULL) {
+ PERROR("zmalloc ltt_ust_context");
+ goto error;
+ }
+
+ uctx->ctx.ctx = ctx->ctx;
+ hashtable_node_init(&uctx->node, (void *)((unsigned long) uctx->ctx.ctx),
+ sizeof(void *));
+
+ return uctx;
+
+error:
+ return NULL;
+}
+
/*
* RCU safe free context structure.
*/
trace_ust_destroy_event(event);
}
-static void destroy_event(struct cds_lfht *ht)
+/*
+ * Cleanup UST events hashtable.
+ */
+static void destroy_event(struct cds_lfht *events)
{
int ret;
struct cds_lfht_node *node;
struct cds_lfht_iter iter;
- cds_lfht_for_each(ht, &iter, node) {
- ret = hashtable_del(ht, &iter);
+ cds_lfht_for_each(events, &iter, node) {
+ ret = hashtable_del(events, &iter);
if (!ret) {
call_rcu(&node->head, destroy_event_rcu);
}
}
- hashtable_destroy(ht);
+ hashtable_destroy(events);
}
/*