luc = zmalloc(sizeof(struct ltt_ust_channel));
if (luc == NULL) {
- perror("ltt_ust_channel zmalloc");
+ PERROR("ltt_ust_channel zmalloc");
goto error;
}
/* Set trace output path */
ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
if (ret < 0) {
- perror("asprintf ust create channel");
+ PERROR("asprintf ust create channel");
goto error_free_channel;
}
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;
strncpy(lue->attr.name, ev->name, LTTNG_UST_SYM_NAME_LEN);
lue->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+ switch (ev->loglevel_type) {
+ case LTTNG_EVENT_LOGLEVEL_ALL:
+ lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+ lue->attr.loglevel = -1; /* Force to -1 */
+ break;
+ case LTTNG_EVENT_LOGLEVEL_RANGE:
+ lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
+ lue->attr.loglevel = ev->loglevel;
+ break;
+ case LTTNG_EVENT_LOGLEVEL_SINGLE:
+ lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
+ lue->attr.loglevel = ev->loglevel;
+ break;
+ default:
+ ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
+ goto error_free_event;
+ }
+
+
/* Init node */
lttng_ht_node_init_str(&lue->node, lue->attr.name);
/* Alloc context hash tables */
lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
- DBG2("Trace UST event %s created", lue->attr.name);
+ DBG2("Trace UST event %s, loglevel (%d,%d) created",
+ lue->attr.name, lue->attr.loglevel_type,
+ lue->attr.loglevel);
return lue;
lum = zmalloc(sizeof(struct ltt_ust_metadata));
if (lum == NULL) {
- perror("ust metadata zmalloc");
+ PERROR("ust metadata zmalloc");
goto error;
}
/* Set metadata trace path */
ret = snprintf(lum->pathname, PATH_MAX, "%s/metadata", path);
if (ret < 0) {
- perror("asprintf ust metadata");
+ PERROR("asprintf ust metadata");
goto error_free_metadata;
}
struct lttng_event_context *ctx)
{
struct ltt_ust_context *uctx;
+ enum lttng_ust_context_type utype;
+
+ switch (ctx->ctx) {
+ case LTTNG_EVENT_CONTEXT_VTID:
+ utype = LTTNG_UST_CONTEXT_VTID;
+ break;
+ case LTTNG_EVENT_CONTEXT_VPID:
+ utype = LTTNG_UST_CONTEXT_VPID;
+ break;
+ case LTTNG_EVENT_CONTEXT_PTHREAD_ID:
+ utype = LTTNG_UST_CONTEXT_PTHREAD_ID;
+ break;
+ case LTTNG_EVENT_CONTEXT_PROCNAME:
+ utype = LTTNG_UST_CONTEXT_PROCNAME;
+ break;
+ default:
+ ERR("Invalid UST context");
+ return NULL;
+ }
uctx = zmalloc(sizeof(struct ltt_ust_context));
if (uctx == NULL) {
goto error;
}
- uctx->ctx.ctx = ctx->ctx;
+ uctx->ctx.ctx = utype;
lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx);
return uctx;