/*
* 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
*
* Return pointer to structure or NULL.
*/
-struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
- struct lttng_domain *domain)
+struct ltt_ust_session *trace_ust_create_session(char *path,
+ unsigned int session_id, struct lttng_domain *domain)
{
int ret;
struct ltt_ust_session *lus;
/* Alloc UST global domain channels' HT */
lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
+ lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
+ if (lus->consumer == NULL) {
+ goto error;
+ }
+
+ /*
+ * The tmp_consumer stays NULL until a set_consumer_uri command is
+ * executed. At this point, the consumer should be nullify until an
+ * enable_consumer command. This assignment is symbolic since we've zmalloc
+ * the struct.
+ */
+ lus->tmp_consumer = NULL;
+
+ /* Use the default consumer output which is the tracing session path. */
+ ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX, "%s/ust", path);
+ if (ret < 0) {
+ PERROR("snprintf UST consumer trace path");
+ goto error;
+ }
+
/* Set session path */
ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
if (ret < 0) {
return lus;
error_free_session:
+ lttng_ht_destroy(lus->domain_global.channels);
+ lttng_ht_destroy(lus->domain_exec);
+ lttng_ht_destroy(lus->domain_pid);
free(lus);
error:
return NULL;
luc = zmalloc(sizeof(struct ltt_ust_channel));
if (luc == NULL) {
- perror("ltt_ust_channel zmalloc");
+ PERROR("ltt_ust_channel zmalloc");
goto error;
}
luc->attr.num_subbuf = chan->attr.num_subbuf;
luc->attr.switch_timer_interval = chan->attr.switch_timer_interval;
luc->attr.read_timer_interval = chan->attr.read_timer_interval;
- luc->attr.output = chan->attr.output;
+ luc->attr.output = (enum lttng_ust_output) chan->attr.output;
/* Translate to UST output enum */
switch (luc->attr.output) {
/* 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;
}
return luc;
error_free_channel:
+ lttng_ht_destroy(luc->ctx);
+ lttng_ht_destroy(luc->events);
free(luc);
error:
return NULL;
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);
+ if (lue->ctx == NULL) {
+ ERR("Unable to create context hash table for event %s", ev->name);
+ goto error_free_event;
+ }
- 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;
{
DBG2("Trace destroy UST event %s", event->attr.name);
destroy_contexts(event->ctx);
-
+ free(event->filter);
free(event);
}
*/
void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
{
+ if (!metadata->handle) {
+ return;
+ }
DBG2("Trace UST destroy metadata %d", metadata->handle);
-
free(metadata);
}
rcu_read_lock();
- DBG2("Trace UST destroy session %d", session->id);
+ DBG2("Trace UST destroy session %u", session->id);
/* Cleaning up UST domain */
destroy_domain_global(&session->domain_global);
projects / lttng-tools.git / blobdiff