#include <sys/types.h>
#include <unistd.h>
+#include <urcu/compiler.h>
+
#include <lttngerr.h>
+#include <lttng-ht.h>
#include <lttng-share.h>
-#include "hashtable.h"
+#include "common/runas.h"
#include "ust-app.h"
#include "ust-consumer.h"
#include "ust-ctl.h"
+/*
+ * Delete ust context safely. RCU read lock must be held before calling
+ * this function.
+ */
+static
+void delete_ust_app_ctx(int sock, struct ust_app_ctx *ua_ctx)
+{
+ if (ua_ctx->obj) {
+ ustctl_release_object(sock, ua_ctx->obj);
+ free(ua_ctx->obj);
+ }
+ free(ua_ctx);
+}
+
/*
* Delete ust app event safely. RCU read lock must be held before calling
* this function.
*/
-static void delete_ust_app_event(int sock, struct ust_app_event *ua_event)
+static
+void delete_ust_app_event(int sock, struct ust_app_event *ua_event)
{
- /* TODO : remove context */
- //struct ust_app_ctx *ltctx;
- //cds_lfht_for_each_entry(lte->ctx, &iter, ltctx, node) {
- // delete_ust_app_ctx(sock, ltctx);
- //}
+ int ret;
+ struct lttng_ht_iter iter;
+ struct ust_app_ctx *ua_ctx;
+
+ /* Destroy each context of event */
+ cds_lfht_for_each_entry(ua_event->ctx->ht, &iter.iter, ua_ctx,
+ node.node) {
+ ret = lttng_ht_del(ua_event->ctx, &iter);
+ assert(!ret);
+ delete_ust_app_ctx(sock, ua_ctx);
+ }
+ lttng_ht_destroy(ua_event->ctx);
- ustctl_release_object(sock, ua_event->obj);
+ if (ua_event->obj != NULL) {
+ ustctl_release_object(sock, ua_event->obj);
+ free(ua_event->obj);
+ }
free(ua_event);
}
* Delete ust app stream safely. RCU read lock must be held before calling
* this function.
*/
-static void delete_ust_app_stream(int sock, struct ltt_ust_stream *stream)
+static
+void delete_ust_app_stream(int sock, struct ltt_ust_stream *stream)
{
- //TODO
- //stream is used for passing to consumer.
- //send_channel_streams is responsible for freeing the streams.
- //note that this will not play well with flight recorder mode:
- //we might need a criterion to discard the streams.
+ if (stream->obj) {
+ ustctl_release_object(sock, stream->obj);
+ free(stream->obj);
+ }
+ free(stream);
}
/*
* Delete ust app channel safely. RCU read lock must be held before calling
* this function.
*/
-static void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan)
+static
+void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan)
{
int ret;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app_event *ua_event;
+ struct ust_app_ctx *ua_ctx;
struct ltt_ust_stream *stream, *stmp;
+ /* Wipe stream */
cds_list_for_each_entry_safe(stream, stmp, &ua_chan->streams.head, list) {
+ cds_list_del(&stream->list);
delete_ust_app_stream(sock, stream);
}
- /* TODO : remove channel context */
- //cds_lfht_for_each_entry(ltc->ctx, &iter, ltctx, node) {
- // hashtable_del(ltc->ctx, &iter);
- // delete_ust_app_ctx(sock, ltctx);
- //}
- //ret = hashtable_destroy(ltc->ctx);
+ /* Wipe context */
+ cds_lfht_for_each_entry(ua_chan->ctx->ht, &iter.iter, ua_ctx, node.node) {
+ ret = lttng_ht_del(ua_chan->ctx, &iter);
+ assert(!ret);
+ delete_ust_app_ctx(sock, ua_ctx);
+ }
+ lttng_ht_destroy(ua_chan->ctx);
- cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) {
- hashtable_del(ua_chan->events, &iter);
+ /* Wipe events */
+ cds_lfht_for_each_entry(ua_chan->events->ht, &iter.iter, ua_event,
+ node.node) {
+ ret = lttng_ht_del(ua_chan->events, &iter);
+ assert(!ret);
delete_ust_app_event(sock, ua_event);
}
+ lttng_ht_destroy(ua_chan->events);
- ret = hashtable_destroy(ua_chan->events);
- if (ret < 0) {
- ERR("UST app destroy session hashtable failed");
- goto error;
+ if (ua_chan->obj != NULL) {
+ ustctl_release_object(sock, ua_chan->obj);
+ free(ua_chan->obj);
}
-
-error:
- return;
+ free(ua_chan);
}
/*
* Delete ust app session safely. RCU read lock must be held before calling
* this function.
*/
-static void delete_ust_app_session(int sock,
- struct ust_app_session *ua_sess)
+static
+void delete_ust_app_session(int sock, struct ust_app_session *ua_sess)
{
int ret;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app_channel *ua_chan;
if (ua_sess->metadata) {
- /*
- * We do NOT release the stream object and metadata object since they
- * are release when fds are sent to the consumer.
- */
+ if (ua_sess->metadata->stream_obj) {
+ ustctl_release_object(sock, ua_sess->metadata->stream_obj);
+ free(ua_sess->metadata->stream_obj);
+ }
+ if (ua_sess->metadata->obj) {
+ ustctl_release_object(sock, ua_sess->metadata->obj);
+ free(ua_sess->metadata->obj);
+ }
}
- cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) {
- hashtable_del(ua_sess->channels, &iter);
+ cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
+ node.node) {
+ ret = lttng_ht_del(ua_sess->channels, &iter);
+ assert(!ret);
delete_ust_app_channel(sock, ua_chan);
}
+ lttng_ht_destroy(ua_sess->channels);
- ret = hashtable_destroy(ua_sess->channels);
- if (ret < 0) {
- ERR("UST app destroy session hashtable failed");
- goto error;
+ if (ua_sess->handle != -1) {
+ ustctl_release_handle(sock, ua_sess->handle);
}
-
-error:
- return;
+ free(ua_sess);
}
/*
* Delete a traceable application structure from the global list. Never call
* this function outside of a call_rcu call.
*/
-static void delete_ust_app(struct ust_app *app)
+static
+void delete_ust_app(struct ust_app *app)
{
- int ret;
- struct cds_lfht_node *node;
- struct cds_lfht_iter iter;
+ int ret, sock;
+ struct lttng_ht_iter iter;
struct ust_app_session *ua_sess;
- int sock;
rcu_read_lock();
- /* Remove from key hash table */
- node = hashtable_lookup(ust_app_sock_key_map,
- (void *) ((unsigned long) app->key.sock), sizeof(void *), &iter);
- if (node == NULL) {
- /* Not suppose to happen */
- ERR("UST app key %d not found in key hash table", app->key.sock);
- goto end;
- }
-
- ret = hashtable_del(ust_app_sock_key_map, &iter);
- if (ret) {
- ERR("UST app unable to delete app sock %d from key hash table",
- app->key.sock);
- } else {
- DBG2("UST app pair sock %d key %d deleted",
- app->key.sock, app->key.pid);
- }
-
- /* Socket is already closed at this point */
-
/* Delete ust app sessions info */
sock = app->key.sock;
app->key.sock = -1;
- cds_lfht_for_each_entry(app->sessions, &iter, ua_sess, node) {
- hashtable_del(app->sessions, &iter);
+ /* Wipe sessions */
+ cds_lfht_for_each_entry(app->sessions->ht, &iter.iter, ua_sess,
+ node.node) {
+ ret = lttng_ht_del(app->sessions, &iter);
+ assert(!ret);
delete_ust_app_session(app->key.sock, ua_sess);
}
-
- ret = hashtable_destroy(app->sessions);
- if (ret < 0) {
- ERR("UST app destroy session hashtable failed");
- goto end;
- }
+ lttng_ht_destroy(app->sessions);
/*
- * Wait until we have removed the key from the sock hash table
- * before closing this socket, otherwise an application could
- * re-use the socket ID and race with the teardown, using the
- * same hash table entry.
+ * Wait until we have removed the key from the sock hash table before
+ * closing this socket, otherwise an application could re-use the socket ID
+ * and race with the teardown, using the same hash table entry.
*/
close(sock);
DBG2("UST app pid %d deleted", app->key.pid);
free(app);
-end:
+
rcu_read_unlock();
}
/*
* URCU intermediate call to delete an UST app.
*/
-static void delete_ust_app_rcu(struct rcu_head *head)
+static
+void delete_ust_app_rcu(struct rcu_head *head)
{
- struct cds_lfht_node *node =
- caa_container_of(head, struct cds_lfht_node, head);
+ struct lttng_ht_node_ulong *node =
+ caa_container_of(head, struct lttng_ht_node_ulong, head);
struct ust_app *app =
caa_container_of(node, struct ust_app, node);
+ DBG3("Call RCU deleting app PID %d", app->key.pid);
delete_ust_app(app);
}
+/*
+ * Alloc new UST app session.
+ */
+static
+struct ust_app_session *alloc_ust_app_session(void)
+{
+ struct ust_app_session *ua_sess;
+
+ /* Init most of the default value by allocating and zeroing */
+ ua_sess = zmalloc(sizeof(struct ust_app_session));
+ if (ua_sess == NULL) {
+ PERROR("malloc");
+ goto error;
+ }
+
+ ua_sess->handle = -1;
+ ua_sess->channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
+
+ return ua_sess;
+
+error:
+ return NULL;
+}
+
+/*
+ * Alloc new UST app channel.
+ */
+static
+struct ust_app_channel *alloc_ust_app_channel(char *name,
+ struct lttng_ust_channel *attr)
+{
+ struct ust_app_channel *ua_chan;
+
+ /* Init most of the default value by allocating and zeroing */
+ ua_chan = zmalloc(sizeof(struct ust_app_channel));
+ if (ua_chan == NULL) {
+ PERROR("malloc");
+ goto error;
+ }
+
+ /* Setup channel name */
+ strncpy(ua_chan->name, name, sizeof(ua_chan->name));
+ ua_chan->name[sizeof(ua_chan->name) - 1] = '\0';
+
+ ua_chan->enabled = 1;
+ ua_chan->handle = -1;
+ ua_chan->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+ ua_chan->events = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
+ lttng_ht_node_init_str(&ua_chan->node, ua_chan->name);
+
+ CDS_INIT_LIST_HEAD(&ua_chan->streams.head);
+
+ /* Copy attributes */
+ if (attr) {
+ memcpy(&ua_chan->attr, attr, sizeof(ua_chan->attr));
+ }
+
+ DBG3("UST app channel %s allocated", ua_chan->name);
+
+ return ua_chan;
+
+error:
+ return NULL;
+}
+
+/*
+ * Alloc new UST app event.
+ */
+static
+struct ust_app_event *alloc_ust_app_event(char *name,
+ struct lttng_ust_event *attr)
+{
+ struct ust_app_event *ua_event;
+
+ /* Init most of the default value by allocating and zeroing */
+ ua_event = zmalloc(sizeof(struct ust_app_event));
+ if (ua_event == NULL) {
+ PERROR("malloc");
+ goto error;
+ }
+
+ ua_event->enabled = 1;
+ strncpy(ua_event->name, name, sizeof(ua_event->name));
+ ua_event->name[sizeof(ua_event->name) - 1] = '\0';
+ ua_event->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+ lttng_ht_node_init_str(&ua_event->node, ua_event->name);
+
+ /* Copy attributes */
+ if (attr) {
+ memcpy(&ua_event->attr, attr, sizeof(ua_event->attr));
+ }
+
+ DBG3("UST app event %s allocated", ua_event->name);
+
+ return ua_event;
+
+error:
+ return NULL;
+}
+
+/*
+ * Alloc new UST app context.
+ */
+static
+struct ust_app_ctx *alloc_ust_app_ctx(struct lttng_ust_context *uctx)
+{
+ struct ust_app_ctx *ua_ctx;
+
+ ua_ctx = zmalloc(sizeof(struct ust_app_ctx));
+ if (ua_ctx == NULL) {
+ goto error;
+ }
+
+ if (uctx) {
+ memcpy(&ua_ctx->ctx, uctx, sizeof(ua_ctx->ctx));
+ }
+
+ DBG3("UST app context %d allocated", ua_ctx->ctx.ctx);
+
+error:
+ return ua_ctx;
+}
+
/*
* Find an ust_app using the sock and return it. RCU read side lock must be
* held before calling this helper function.
*/
-static struct ust_app *find_app_by_sock(int sock)
+static
+struct ust_app *find_app_by_sock(int sock)
{
- struct cds_lfht_node *node;
+ struct lttng_ht_node_ulong *node;
struct ust_app_key *key;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
- node = hashtable_lookup(ust_app_sock_key_map,
- (void *)((unsigned long) sock), sizeof(void *), &iter);
+ lttng_ht_lookup(ust_app_sock_key_map, (void *)((unsigned long) sock),
+ &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
DBG2("UST app find by sock %d key not found", sock);
goto error;
}
-
key = caa_container_of(node, struct ust_app_key, node);
- node = hashtable_lookup(ust_app_ht,
- (void *)((unsigned long) key->pid), sizeof(void *), &iter);
+ lttng_ht_lookup(ust_app_ht, (void *)((unsigned long) key->pid), &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
DBG2("UST app find by sock %d not found", sock);
goto error;
return NULL;
}
+/*
+ * Create the channel context on the tracer.
+ */
+static
+int create_ust_channel_context(struct ust_app_channel *ua_chan,
+ struct ust_app_ctx *ua_ctx, struct ust_app *app)
+{
+ int ret;
+
+ ret = ustctl_add_context(app->key.sock, &ua_ctx->ctx,
+ ua_chan->obj, &ua_ctx->obj);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ua_ctx->handle = ua_ctx->obj->handle;
+
+ DBG2("UST app context added to channel %s successfully", ua_chan->name);
+
+error:
+ return ret;
+}
+
+/*
+ * Create the event context on the tracer.
+ */
+static
+int create_ust_event_context(struct ust_app_event *ua_event,
+ struct ust_app_ctx *ua_ctx, struct ust_app *app)
+{
+ int ret;
+
+ ret = ustctl_add_context(app->key.sock, &ua_ctx->ctx,
+ ua_event->obj, &ua_ctx->obj);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ua_ctx->handle = ua_ctx->obj->handle;
+
+ DBG2("UST app context added to event %s successfully", ua_event->name);
+
+error:
+ return ret;
+}
+
+/*
+ * Disable the specified event on to UST tracer for the UST session.
+ */
+static int disable_ust_event(struct ust_app *app,
+ struct ust_app_session *ua_sess, struct ust_app_event *ua_event)
+{
+ int ret;
+
+ ret = ustctl_disable(app->key.sock, ua_event->obj);
+ if (ret < 0) {
+ ERR("UST app event %s disable failed for app (pid: %d) "
+ "and session handle %d with ret %d",
+ ua_event->attr.name, app->key.pid, ua_sess->handle, ret);
+ goto error;
+ }
+
+ DBG2("UST app event %s disabled successfully for app (pid: %d)",
+ ua_event->attr.name, app->key.pid);
+
+error:
+ return ret;
+}
+
+/*
+ * Disable the specified channel on to UST tracer for the UST session.
+ */
+static int disable_ust_channel(struct ust_app *app,
+ struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan)
+{
+ int ret;
+
+ ret = ustctl_disable(app->key.sock, ua_chan->obj);
+ if (ret < 0) {
+ ERR("UST app channel %s disable failed for app (pid: %d) "
+ "and session handle %d with ret %d",
+ ua_chan->name, app->key.pid, ua_sess->handle, ret);
+ goto error;
+ }
+
+ DBG2("UST app channel %s disabled successfully for app (pid: %d)",
+ ua_chan->name, app->key.pid);
+
+error:
+ return ret;
+}
+
+/*
+ * Enable the specified channel on to UST tracer for the UST session.
+ */
+static int enable_ust_channel(struct ust_app *app,
+ struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan)
+{
+ int ret;
+
+ ret = ustctl_enable(app->key.sock, ua_chan->obj);
+ if (ret < 0) {
+ ERR("UST app channel %s enable failed for app (pid: %d) "
+ "and session handle %d with ret %d",
+ ua_chan->name, app->key.pid, ua_sess->handle, ret);
+ goto error;
+ }
+
+ ua_chan->enabled = 1;
+
+ DBG2("UST app channel %s enabled successfully for app (pid: %d)",
+ ua_chan->name, app->key.pid);
+
+error:
+ return ret;
+}
+
+/*
+ * Enable the specified event on to UST tracer for the UST session.
+ */
+static int enable_ust_event(struct ust_app *app,
+ struct ust_app_session *ua_sess, struct ust_app_event *ua_event)
+{
+ int ret;
+
+ ret = ustctl_enable(app->key.sock, ua_event->obj);
+ if (ret < 0) {
+ ERR("UST app event %s enable failed for app (pid: %d) "
+ "and session handle %d with ret %d",
+ ua_event->attr.name, app->key.pid, ua_sess->handle, ret);
+ goto error;
+ }
+
+ DBG2("UST app event %s enabled successfully for app (pid: %d)",
+ ua_event->attr.name, app->key.pid);
+
+error:
+ return ret;
+}
+
/*
* Open metadata onto the UST tracer for a UST session.
*/
ret = ustctl_open_metadata(app->key.sock, ua_sess->handle, &uattr,
&ua_sess->metadata->obj);
if (ret < 0) {
- ERR("UST app open metadata failed for app pid:%d",
- app->key.pid);
+ ERR("UST app open metadata failed for app pid:%d with ret %d",
+ app->key.pid, ret);
goto error;
}
+ ua_sess->metadata->handle = ua_sess->metadata->obj->handle;
+
error:
return ret;
}
ret = ustctl_create_channel(app->key.sock, ua_sess->handle,
(struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj);
if (ret < 0) {
- DBG("Error creating channel %s for app (pid: %d, sock: %d) "
+ ERR("Creating channel %s for app (pid: %d, sock: %d) "
"and session handle %d with ret %d",
ua_chan->name, app->key.pid, app->key.sock,
ua_sess->handle, ret);
}
ua_chan->handle = ua_chan->obj->handle;
- ua_chan->attr.shm_fd = ua_chan->obj->shm_fd;
- ua_chan->attr.wait_fd = ua_chan->obj->wait_fd;
- ua_chan->attr.memory_map_size = ua_chan->obj->memory_map_size;
DBG2("UST app channel %s created successfully for pid:%d and sock:%d",
ua_chan->name, app->key.pid, app->key.sock);
+ /* If channel is not enabled, disable it on the tracer */
+ if (!ua_chan->enabled) {
+ ret = disable_ust_channel(app, ua_sess, ua_chan);
+ if (ret < 0) {
+ goto error;
+ }
+ }
+
error:
return ret;
}
/*
* Create the specified event onto the UST tracer for a UST session.
*/
-static int create_ust_event(struct ust_app *app,
- struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan,
- struct ust_app_event *ua_event)
+static
+int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
+ struct ust_app_channel *ua_chan, struct ust_app_event *ua_event)
{
int ret = 0;
ret = ustctl_create_event(app->key.sock, &ua_event->attr, ua_chan->obj,
&ua_event->obj);
if (ret < 0) {
+ if (ret == -EEXIST) {
+ ret = 0;
+ goto error;
+ }
ERR("Error ustctl create event %s for app pid: %d with ret %d",
ua_event->attr.name, app->key.pid, ret);
goto error;
}
ua_event->handle = ua_event->obj->handle;
- ua_event->enabled = 1;
DBG2("UST app event %s created successfully for pid:%d",
ua_event->attr.name, app->key.pid);
-error:
- return ret;
-}
-
-/*
- * Alloc new UST app session.
- */
-static struct ust_app_session *alloc_ust_app_session(void)
-{
- struct ust_app_session *ua_sess;
-
- /* Init most of the default value by allocating and zeroing */
- ua_sess = zmalloc(sizeof(struct ust_app_session));
- if (ua_sess == NULL) {
- PERROR("malloc");
- goto error;
- }
-
- ua_sess->handle = -1;
- ua_sess->channels = hashtable_new_str(0);
-
- return ua_sess;
-
-error:
- return NULL;
-}
-
-/*
- * Alloc new UST app channel.
- */
-static struct ust_app_channel *alloc_ust_app_channel(char *name,
- struct lttng_ust_channel *attr)
-{
- struct ust_app_channel *ua_chan;
-
- /* Init most of the default value by allocating and zeroing */
- ua_chan = zmalloc(sizeof(struct ust_app_channel));
- if (ua_chan == NULL) {
- PERROR("malloc");
- goto error;
- }
-
- /* Setup channel name */
- strncpy(ua_chan->name, name, sizeof(ua_chan->name));
- ua_chan->name[sizeof(ua_chan->name) - 1] = '\0';
-
- ua_chan->handle = -1;
- ua_chan->ctx = hashtable_new(0);
- ua_chan->events = hashtable_new_str(0);
- hashtable_node_init(&ua_chan->node, (void *) ua_chan->name,
- strlen(ua_chan->name));
-
- CDS_INIT_LIST_HEAD(&ua_chan->streams.head);
-
- /* Copy attributes */
- if (attr) {
- memcpy(&ua_chan->attr, attr, sizeof(ua_chan->attr));
- }
-
- DBG3("UST app channel %s allocated", ua_chan->name);
-
- return ua_chan;
-
-error:
- return NULL;
-}
-
-/*
- * Alloc new UST app event.
- */
-static struct ust_app_event *alloc_ust_app_event(char *name,
- struct lttng_ust_event *attr)
-{
- struct ust_app_event *ua_event;
-
- /* Init most of the default value by allocating and zeroing */
- ua_event = zmalloc(sizeof(struct ust_app_event));
- if (ua_event == NULL) {
- PERROR("malloc");
- goto error;
- }
-
- strncpy(ua_event->name, name, sizeof(ua_event->name));
- ua_event->name[sizeof(ua_event->name) - 1] = '\0';
- ua_event->ctx = hashtable_new(0);
- hashtable_node_init(&ua_event->node, (void *) ua_event->name,
- strlen(ua_event->name));
-
- /* Copy attributes */
- if (attr) {
- memcpy(&ua_event->attr, attr, sizeof(ua_event->attr));
+ /* If event not enabled, disable it on the tracer */
+ if (ua_event->enabled == 0) {
+ ret = disable_ust_event(app, ua_sess, ua_event);
+ if (ret < 0) {
+ /*
+ * If we hit an EPERM, something is wrong with our disable call. If
+ * we get an EEXIST, there is a problem on the tracer side since we
+ * just created it.
+ */
+ switch (ret) {
+ case -EPERM:
+ /* Code flow problem */
+ assert(0);
+ case -EEXIST:
+ /* It's OK for our use case. */
+ ret = 0;
+ break;
+ default:
+ break;
+ }
+ goto error;
+ }
}
- DBG3("UST app event %s allocated", ua_event->name);
-
- return ua_event;
-
error:
- return NULL;
+ return ret;
}
/*
static void shadow_copy_event(struct ust_app_event *ua_event,
struct ltt_ust_event *uevent)
{
+ struct lttng_ht_iter iter;
+ struct ltt_ust_context *uctx;
+ struct ust_app_ctx *ua_ctx;
+
strncpy(ua_event->name, uevent->attr.name, sizeof(ua_event->name));
ua_event->name[sizeof(ua_event->name) - 1] = '\0';
+ ua_event->enabled = uevent->enabled;
+
/* Copy event attributes */
memcpy(&ua_event->attr, &uevent->attr, sizeof(ua_event->attr));
- /* TODO: support copy context */
+ cds_lfht_for_each_entry(uevent->ctx->ht, &iter.iter, uctx, node.node) {
+ ua_ctx = alloc_ust_app_ctx(&uctx->ctx);
+ if (ua_ctx == NULL) {
+ /* malloc() failed. We should simply stop */
+ return;
+ }
+
+ lttng_ht_node_init_ulong(&ua_ctx->node,
+ (unsigned long) ua_ctx->ctx.ctx);
+ lttng_ht_add_unique_ulong(ua_event->ctx, &ua_ctx->node);
+ }
}
/*
static void shadow_copy_channel(struct ust_app_channel *ua_chan,
struct ltt_ust_channel *uchan)
{
- struct cds_lfht_iter iter;
- struct cds_lfht_node *ua_event_node;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *ua_event_node;
struct ltt_ust_event *uevent;
+ struct ltt_ust_context *uctx;
struct ust_app_event *ua_event;
+ struct ust_app_ctx *ua_ctx;
- DBG2("Shadow copy of UST app channel %s", ua_chan->name);
+ DBG2("UST app shadow copy of channel %s started", ua_chan->name);
strncpy(ua_chan->name, uchan->name, sizeof(ua_chan->name));
ua_chan->name[sizeof(ua_chan->name) - 1] = '\0';
/* Copy event attributes */
memcpy(&ua_chan->attr, &uchan->attr, sizeof(ua_chan->attr));
- /* TODO: support copy context */
+ ua_chan->enabled = uchan->enabled;
+
+ cds_lfht_for_each_entry(uchan->ctx->ht, &iter.iter, uctx, node.node) {
+ ua_ctx = alloc_ust_app_ctx(&uctx->ctx);
+ if (ua_ctx == NULL) {
+ continue;
+ }
+ lttng_ht_node_init_ulong(&ua_ctx->node,
+ (unsigned long) ua_ctx->ctx.ctx);
+ lttng_ht_add_unique_ulong(ua_chan->ctx, &ua_ctx->node);
+ }
/* Copy all events from ltt ust channel to ust app channel */
- cds_lfht_for_each_entry(uchan->events, &iter, uevent, node) {
- struct cds_lfht_iter uiter;
+ cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
+ struct lttng_ht_iter uiter;
- ua_event_node = hashtable_lookup(ua_chan->events,
- (void *) uevent->attr.name, strlen(uevent->attr.name),
- &uiter);
+ lttng_ht_lookup(ua_chan->events, (void *) uevent->attr.name, &uiter);
+ ua_event_node = lttng_ht_iter_get_node_str(&uiter);
if (ua_event_node == NULL) {
DBG2("UST event %s not found on shadow copy channel",
uevent->attr.name);
continue;
}
shadow_copy_event(ua_event, uevent);
- hashtable_add_unique(ua_chan->events, &ua_event->node);
+ lttng_ht_add_unique_str(ua_chan->events, &ua_event->node);
}
}
- DBG3("Shadow copy channel done");
+ DBG3("UST app shadow copy of channel %s done", ua_chan->name);
}
/*
* Copy data between a UST app session and a regular LTT session.
*/
static void shadow_copy_session(struct ust_app_session *ua_sess,
- struct ltt_ust_session *usess,
- struct ust_app *app)
+ struct ltt_ust_session *usess, struct ust_app *app)
{
- struct cds_lfht_node *ua_chan_node;
- struct cds_lfht_iter iter;
+ struct lttng_ht_node_str *ua_chan_node;
+ struct lttng_ht_iter iter;
struct ltt_ust_channel *uchan;
struct ust_app_channel *ua_chan;
time_t rawtime;
DBG2("Shadow copy of session handle %d", ua_sess->handle);
+ ua_sess->id = usess->id;
ua_sess->uid = usess->uid;
+ ua_sess->gid = usess->gid;
- ret = snprintf(ua_sess->path, PATH_MAX,
- "%s/%s-%d-%s",
- usess->pathname, app->name, app->key.pid,
- datetime);
+ ret = snprintf(ua_sess->path, PATH_MAX, "%s/%s-%d-%s", usess->pathname,
+ app->name, app->key.pid, datetime);
if (ret < 0) {
PERROR("asprintf UST shadow copy session");
/* TODO: We cannot return an error from here.. */
/* TODO: support all UST domain */
/* Iterate over all channels in global domain. */
- cds_lfht_for_each_entry(usess->domain_global.channels, &iter,
- uchan, node) {
- struct cds_lfht_iter uiter;
+ cds_lfht_for_each_entry(usess->domain_global.channels->ht, &iter.iter,
+ uchan, node.node) {
+ struct lttng_ht_iter uiter;
- ua_chan_node = hashtable_lookup(ua_sess->channels,
- (void *)uchan->name, strlen(uchan->name),
- &uiter);
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
if (ua_chan_node != NULL) {
+ /* Session exist. Contiuing. */
continue;
}
uchan->name);
ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr);
if (ua_chan == NULL) {
- /* malloc failed... continuing */
+ /* malloc failed FIXME: Might want to do handle ENOMEM .. */
continue;
}
shadow_copy_channel(ua_chan, uchan);
- hashtable_add_unique(ua_sess->channels, &ua_chan->node);
+ lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
}
}
+/*
+ * Lookup sesison wrapper.
+ */
+static
+void __lookup_session_by_app(struct ltt_ust_session *usess,
+ struct ust_app *app, struct lttng_ht_iter *iter)
+{
+ /* Get right UST app session from app */
+ lttng_ht_lookup(app->sessions, (void *)((unsigned long) usess->id), iter);
+}
+
/*
* Return ust app session from the app session hashtable using the UST session
- * uid.
+ * id.
*/
static struct ust_app_session *lookup_session_by_app(
struct ltt_ust_session *usess, struct ust_app *app)
{
- struct cds_lfht_iter iter;
- struct cds_lfht_node *node;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_ulong *node;
- /* Get right UST app session from app */
- node = hashtable_lookup(app->sessions,
- (void *) ((unsigned long) usess->uid), sizeof(void *), &iter);
+ __lookup_session_by_app(usess, app, &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
goto error;
}
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
- DBG2("UST app pid: %d session uid %d not found, creating it",
- app->key.pid, usess->uid);
+ DBG2("UST app pid: %d session id %d not found, creating it",
+ app->key.pid, usess->id);
ua_sess = alloc_ust_app_session();
if (ua_sess == NULL) {
/* Only malloc can failed so something is really wrong */
- goto error;
+ goto end;
}
shadow_copy_session(ua_sess, usess, app);
}
if (ua_sess->handle == -1) {
ret = ustctl_create_session(app->key.sock);
if (ret < 0) {
- ERR("Error creating session for app pid %d, sock %d",
- app->key.pid, app->key.sock);
- /* TODO: free() ua_sess */
+ ERR("Creating session for app pid %d", app->key.pid);
goto error;
}
- DBG2("UST app ustctl create session handle %d", ret);
ua_sess->handle = ret;
/* Add ust app session to app's HT */
- hashtable_node_init(&ua_sess->node,
- (void *)((unsigned long) ua_sess->uid), sizeof(void *));
- hashtable_add_unique(app->sessions, &ua_sess->node);
+ lttng_ht_node_init_ulong(&ua_sess->node, (unsigned long) ua_sess->id);
+ lttng_ht_add_unique_ulong(app->sessions, &ua_sess->node);
DBG2("UST app session created successfully with handle %d", ret);
}
+end:
return ua_sess;
error:
+ delete_ust_app_session(-1, ua_sess);
return NULL;
}
+/*
+ * Create a context for the channel on the tracer.
+ */
+static
+int create_ust_app_channel_context(struct ust_app_session *ua_sess,
+ struct ust_app_channel *ua_chan, struct lttng_ust_context *uctx,
+ struct ust_app *app)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_ulong *node;
+ struct ust_app_ctx *ua_ctx;
+
+ DBG2("UST app adding context to channel %s", ua_chan->name);
+
+ lttng_ht_lookup(ua_chan->ctx, (void *)((unsigned long)uctx->ctx), &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
+ if (node != NULL) {
+ ret = -EEXIST;
+ goto error;
+ }
+
+ ua_ctx = alloc_ust_app_ctx(uctx);
+ if (ua_ctx == NULL) {
+ /* malloc failed */
+ ret = -1;
+ goto error;
+ }
+
+ lttng_ht_node_init_ulong(&ua_ctx->node, (unsigned long) ua_ctx->ctx.ctx);
+ lttng_ht_add_unique_ulong(ua_chan->ctx, &ua_ctx->node);
+
+ ret = create_ust_channel_context(ua_chan, ua_ctx, app);
+ if (ret < 0) {
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * Create an UST context and enable it for the event on the tracer.
+ */
+static
+int create_ust_app_event_context(struct ust_app_session *ua_sess,
+ struct ust_app_event *ua_event, struct lttng_ust_context *uctx,
+ struct ust_app *app)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_ulong *node;
+ struct ust_app_ctx *ua_ctx;
+
+ DBG2("UST app adding context to event %s", ua_event->name);
+
+ lttng_ht_lookup(ua_event->ctx, (void *)((unsigned long)uctx->ctx), &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
+ if (node != NULL) {
+ ret = -EEXIST;
+ goto error;
+ }
+
+ ua_ctx = alloc_ust_app_ctx(uctx);
+ if (ua_ctx == NULL) {
+ /* malloc failed */
+ ret = -1;
+ goto error;
+ }
+
+ lttng_ht_node_init_ulong(&ua_ctx->node, (unsigned long) ua_ctx->ctx.ctx);
+ lttng_ht_add_unique_ulong(ua_event->ctx, &ua_ctx->node);
+
+ ret = create_ust_event_context(ua_event, ua_ctx, app);
+ if (ret < 0) {
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * Enable on the tracer side a ust app event for the session and channel.
+ */
+static
+int enable_ust_app_event(struct ust_app_session *ua_sess,
+ struct ust_app_event *ua_event, struct ust_app *app)
+{
+ int ret;
+
+ ret = enable_ust_event(app, ua_sess, ua_event);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ua_event->enabled = 1;
+
+error:
+ return ret;
+}
+
+/*
+ * Disable on the tracer side a ust app event for the session and channel.
+ */
+static int disable_ust_app_event(struct ust_app_session *ua_sess,
+ struct ust_app_event *ua_event, struct ust_app *app)
+{
+ int ret;
+
+ ret = disable_ust_event(app, ua_sess, ua_event);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ua_event->enabled = 0;
+
+error:
+ return ret;
+}
+
+/*
+ * Lookup ust app channel for session and disable it on the tracer side.
+ */
+static
+int disable_ust_app_channel(struct ust_app_session *ua_sess,
+ struct ust_app_channel *ua_chan, struct ust_app *app)
+{
+ int ret;
+
+ ret = disable_ust_channel(app, ua_sess, ua_chan);
+ if (ret < 0) {
+ goto error;
+ }
+
+ ua_chan->enabled = 0;
+
+error:
+ return ret;
+}
+
+/*
+ * Lookup ust app channel for session and enable it on the tracer side.
+ */
+static int enable_ust_app_channel(struct ust_app_session *ua_sess,
+ struct ltt_ust_channel *uchan, struct ust_app *app)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *ua_chan_node;
+ struct ust_app_channel *ua_chan;
+
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&iter);
+ if (ua_chan_node == NULL) {
+ DBG2("Unable to find channel %s in ust session id %u",
+ uchan->name, ua_sess->id);
+ goto error;
+ }
+
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+
+ ret = enable_ust_channel(app, ua_sess, ua_chan);
+ if (ret < 0) {
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
/*
* Create UST app channel and create it on the tracer.
*/
struct ust_app *app)
{
int ret = 0;
- struct cds_lfht_iter iter;
- struct cds_lfht_node *ua_chan_node;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *ua_chan_node;
struct ust_app_channel *ua_chan;
/* Lookup channel in the ust app session */
- ua_chan_node = hashtable_lookup(ua_sess->channels,
- (void *)uchan->name, strlen(uchan->name), &iter);
- if (ua_chan_node == NULL) {
- DBG2("Unable to find channel %s in ust session uid %u",
- uchan->name, ua_sess->uid);
- ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr);
- if (ua_chan == NULL) {
- goto error;
- }
- shadow_copy_channel(ua_chan, uchan);
-
- hashtable_add_unique(ua_sess->channels, &ua_chan->node);
- } else {
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&iter);
+ if (ua_chan_node != NULL) {
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+ goto end;
+ }
+
+ ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr);
+ if (ua_chan == NULL) {
+ /* Only malloc can fail here */
+ goto error;
}
+ shadow_copy_channel(ua_chan, uchan);
ret = create_ust_channel(app, ua_sess, ua_chan);
if (ret < 0) {
+ /* Not found previously means that it does not exist on the tracer */
+ assert(ret != -EEXIST);
goto error;
}
+ lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
+
+ DBG2("UST app create channel %s for PID %d completed", ua_chan->name,
+ app->key.pid);
+
+end:
return ua_chan;
error:
+ delete_ust_app_channel(-1, ua_chan);
return NULL;
}
/*
* Create UST app event and create it on the tracer side.
*/
-static struct ust_app_event *create_ust_app_event(
- struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan,
- struct ltt_ust_event *uevent, struct ust_app *app)
+static
+int create_ust_app_event(struct ust_app_session *ua_sess,
+ struct ust_app_channel *ua_chan, struct ltt_ust_event *uevent,
+ struct ust_app *app)
{
- int ret;
- struct cds_lfht_iter iter;
- struct cds_lfht_node *ua_event_node;
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *ua_event_node;
struct ust_app_event *ua_event;
/* Get event node */
- ua_event_node = hashtable_lookup(ua_chan->events,
- (void *)uevent->attr.name, strlen(uevent->attr.name), &iter);
- if (ua_event_node == NULL) {
- DBG2("UST app event %s not found, creating it", uevent->attr.name);
- /* Does not exist so create one */
- ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr);
- if (ua_event == NULL) {
- /* Only malloc can failed so something is really wrong */
- goto error;
- }
- shadow_copy_event(ua_event, uevent);
+ lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &iter);
+ ua_event_node = lttng_ht_iter_get_node_str(&iter);
+ if (ua_event_node != NULL) {
+ ret = -EEXIST;
+ goto end;
+ }
- hashtable_add_unique(ua_chan->events, &ua_event->node);
- } else {
- ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
+ /* Does not exist so create one */
+ ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr);
+ if (ua_event == NULL) {
+ /* Only malloc can failed so something is really wrong */
+ ret = -ENOMEM;
+ goto end;
}
+ shadow_copy_event(ua_event, uevent);
+ /* Create it on the tracer side */
ret = create_ust_event(app, ua_sess, ua_chan, ua_event);
if (ret < 0) {
+ /* Not found previously means that it does not exist on the tracer */
+ assert(ret != -EEXIST);
goto error;
}
- return ua_event;
+ lttng_ht_add_unique_str(ua_chan->events, &ua_event->node);
+
+ DBG2("UST app create event %s for PID %d completed", ua_event->name,
+ app->key.pid);
+
+end:
+ return ret;
error:
- return NULL;
+ /* Valid. Calling here is already in a read side lock */
+ delete_ust_app_event(-1, ua_event);
+ return ret;
}
/*
/* Allocate UST metadata */
ua_sess->metadata = trace_ust_create_metadata(pathname);
if (ua_sess->metadata == NULL) {
- ERR("UST app session %d creating metadata failed",
- ua_sess->handle);
+ /* malloc() failed */
goto error;
}
ret = open_ust_metadata(app, ua_sess);
if (ret < 0) {
+ /* Cleanup failed metadata struct */
+ free(ua_sess->metadata);
goto error;
}
goto error;
}
- ret = mkdir(ua_sess->path, S_IRWXU | S_IRWXG);
+ ret = mkdir_run_as(ua_sess->path, S_IRWXU | S_IRWXG,
+ ua_sess->uid, ua_sess->gid);
if (ret < 0) {
PERROR("mkdir UST metadata");
goto error;
/*
* Return pointer to traceable apps list.
*/
-struct cds_lfht *ust_app_get_ht(void)
+struct lttng_ht *ust_app_get_ht(void)
{
return ust_app_ht;
}
*/
struct ust_app *ust_app_find_by_pid(pid_t pid)
{
- struct cds_lfht_node *node;
- struct cds_lfht_iter iter;
+ struct lttng_ht_node_ulong *node;
+ struct lttng_ht_iter iter;
rcu_read_lock();
- node = hashtable_lookup(ust_app_ht,
- (void *)((unsigned long) pid), sizeof(void *), &iter);
+ lttng_ht_lookup(ust_app_ht, (void *)((unsigned long) pid), &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
DBG2("UST app no found with pid %d", pid);
goto error;
* Using pid and uid (of the app), allocate a new ust_app struct and
* add it to the global traceable app list.
*
- * On success, return 0, else return malloc ENOMEM.
+ * On success, return 0, else return malloc -ENOMEM, or -EINVAL if app
+ * bitness is not supported.
*/
int ust_app_register(struct ust_register_msg *msg, int sock)
{
struct ust_app *lta;
+ if ((msg->bits_per_long == 64 && ust_consumerd64_fd == -EINVAL)
+ || (msg->bits_per_long == 32 && ust_consumerd32_fd == -EINVAL)) {
+ ERR("Registration failed: application \"%s\" (pid: %d) has "
+ "%d-bit long, but no consumerd for this long size is available.\n",
+ msg->name, msg->pid, msg->bits_per_long);
+ close(sock);
+ return -EINVAL;
+ }
lta = zmalloc(sizeof(struct ust_app));
if (lta == NULL) {
PERROR("malloc");
lta->ppid = msg->ppid;
lta->uid = msg->uid;
lta->gid = msg->gid;
+ lta->bits_per_long = msg->bits_per_long;
lta->v_major = msg->major;
lta->v_minor = msg->minor;
strncpy(lta->name, msg->name, sizeof(lta->name));
lta->name[16] = '\0';
- lta->sessions = hashtable_new(0);
+ lta->sessions = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
/* Set key map */
lta->key.pid = msg->pid;
- hashtable_node_init(<a->node, (void *)((unsigned long)lta->key.pid),
- sizeof(void *));
+ lttng_ht_node_init_ulong(<a->node, (unsigned long)lta->key.pid);
lta->key.sock = sock;
- hashtable_node_init(<a->key.node, (void *)((unsigned long)lta->key.sock),
- sizeof(void *));
+ lttng_ht_node_init_ulong(<a->key.node, (unsigned long)lta->key.sock);
rcu_read_lock();
- hashtable_add_unique(ust_app_sock_key_map, <a->key.node);
- hashtable_add_unique(ust_app_ht, <a->node);
+ lttng_ht_add_unique_ulong(ust_app_sock_key_map, <a->key.node);
+ lttng_ht_add_unique_ulong(ust_app_ht, <a->node);
rcu_read_unlock();
DBG("App registered with pid:%d ppid:%d uid:%d gid:%d sock:%d name:%s"
void ust_app_unregister(int sock)
{
struct ust_app *lta;
- struct cds_lfht_node *node;
- struct cds_lfht_iter iter;
+ struct lttng_ht_node_ulong *node;
+ struct lttng_ht_iter iter;
+ int ret;
rcu_read_lock();
lta = find_app_by_sock(sock);
DBG("PID %d unregistering with sock %d", lta->key.pid, sock);
+ /* Remove application from socket hash table */
+ lttng_ht_lookup(ust_app_sock_key_map, (void *)((unsigned long) sock), &iter);
+ ret = lttng_ht_del(ust_app_sock_key_map, &iter);
+ assert(!ret);
+
/* Get the node reference for a call_rcu */
- node = hashtable_lookup(ust_app_ht,
- (void *)((unsigned long) lta->key.pid), sizeof(void *), &iter);
+ lttng_ht_lookup(ust_app_ht, (void *)((unsigned long) lta->key.pid), &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
ERR("Unable to find app sock %d by pid %d", sock, lta->key.pid);
goto error;
}
- hashtable_del(ust_app_ht, &iter);
+ /* Remove application from PID hash table */
+ ret = lttng_ht_del(ust_app_ht, &iter);
+ assert(!ret);
call_rcu(&node->head, delete_ust_app_rcu);
error:
rcu_read_unlock();
unsigned long count;
rcu_read_lock();
- count = hashtable_get_count(ust_app_ht);
+ count = lttng_ht_get_count(ust_app_ht);
rcu_read_unlock();
return count;
{
int ret, handle;
size_t nbmem, count = 0;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app *app;
struct lttng_event *tmp;
rcu_read_lock();
- cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ struct lttng_ust_tracepoint_iter uiter;
+
handle = ustctl_tracepoint_list(app->key.sock);
if (handle < 0) {
ERR("UST app list events getting handle failed for app pid %d",
}
while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle,
- tmp[count].name)) != -ENOENT) {
- if (count > nbmem) {
- DBG2("Reallocating event list from %zu to %zu bytes", nbmem,
- nbmem + UST_APP_EVENT_LIST_SIZE);
- nbmem += UST_APP_EVENT_LIST_SIZE;
- tmp = realloc(tmp, nbmem);
+ &uiter)) != -ENOENT) {
+ if (count >= nbmem) {
+ DBG2("Reallocating event list from %zu to %zu entries", nbmem,
+ 2 * nbmem);
+ nbmem *= 2;
+ tmp = realloc(tmp, nbmem * sizeof(struct lttng_event));
if (tmp == NULL) {
PERROR("realloc ust app events");
ret = -ENOMEM;
goto rcu_error;
}
}
-
+ memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN);
+ memcpy(tmp[count].loglevel, uiter.loglevel, LTTNG_UST_SYM_NAME_LEN);
+ tmp[count].loglevel_value = uiter.loglevel_value;
tmp[count].type = LTTNG_UST_TRACEPOINT;
tmp[count].pid = app->key.pid;
tmp[count].enabled = -1;
void ust_app_clean_list(void)
{
int ret;
- struct cds_lfht_node *node;
- struct cds_lfht_iter iter;
- struct ust_app *app;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_ulong *node;
DBG2("UST app cleaning registered apps hash table");
rcu_read_lock();
- cds_lfht_for_each(ust_app_ht, &iter, node) {
- app = caa_container_of(node, struct ust_app, node);
-
- ret = hashtable_del(ust_app_ht, &iter);
- if (!ret) {
- call_rcu(&node->head, delete_ust_app_rcu);
- }
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, node, node) {
+ ret = lttng_ht_del(ust_app_ht, &iter);
+ assert(!ret);
+ call_rcu(&node->head, delete_ust_app_rcu);
}
+ /* Destroy is done only when the ht is empty */
+ lttng_ht_destroy(ust_app_ht);
- hashtable_destroy(ust_app_ht);
- hashtable_destroy(ust_app_sock_key_map);
+ cds_lfht_for_each_entry(ust_app_sock_key_map->ht, &iter.iter, node, node) {
+ ret = lttng_ht_del(ust_app_sock_key_map, &iter);
+ assert(!ret);
+ }
+ /* Destroy is done only when the ht is empty */
+ lttng_ht_destroy(ust_app_sock_key_map);
rcu_read_unlock();
}
*/
void ust_app_ht_alloc(void)
{
- ust_app_ht = hashtable_new(0);
- ust_app_sock_key_map = hashtable_new(0);
+ ust_app_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+ ust_app_sock_key_map = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
}
/*
- * For a specific UST session, create the channel for all registered apps.
+ * For a specific UST session, disable the channel for all registered apps.
*/
-int ust_app_create_channel_all(struct ltt_ust_session *usess,
+int ust_app_disable_channel_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan)
{
int ret = 0;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *ua_chan_node;
struct ust_app *app;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
+ if (usess == NULL || uchan == NULL) {
+ ERR("Disabling UST global channel with NULL values");
+ ret = -1;
+ goto error;
+ }
+
+ DBG2("UST app disabling channel %s from global domain for session id %d",
+ uchan->name, usess->id);
+
+ rcu_read_lock();
+
+ /* For every registered applications */
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ struct lttng_ht_iter uiter;
+ ua_sess = lookup_session_by_app(usess, app);
+ if (ua_sess == NULL) {
+ continue;
+ }
+
+ /* Get channel */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
+ /* If the session if found for the app, the channel must be there */
+ assert(ua_chan_node);
+
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+ /* The channel must not be already disabled */
+ assert(ua_chan->enabled == 1);
+
+ /* Disable channel onto application */
+ ret = disable_ust_app_channel(ua_sess, ua_chan, app);
+ if (ret < 0) {
+ /* XXX: We might want to report this error at some point... */
+ continue;
+ }
+ }
+
+ rcu_read_unlock();
+
+error:
+ return ret;
+}
+
+/*
+ * For a specific UST session, enable the channel for all registered apps.
+ */
+int ust_app_enable_channel_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct ust_app *app;
+ struct ust_app_session *ua_sess;
+
if (usess == NULL || uchan == NULL) {
ERR("Adding UST global channel to NULL values");
ret = -1;
goto error;
}
- DBG2("UST app adding channel %s to global domain for session uid %d",
- uchan->name, usess->uid);
+ DBG2("UST app enabling channel %s to global domain for session id %d",
+ uchan->name, usess->id);
rcu_read_lock();
/* For every registered applications */
- cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
- /* Create session on the tracer side and add it to app session HT */
- ua_sess = create_ust_app_session(usess, app);
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
continue;
}
- /* Create channel onto application */
- ua_chan = create_ust_app_channel(ua_sess, uchan, app);
- if (ua_chan == NULL) {
+ /* Enable channel onto application */
+ ret = enable_ust_app_channel(ua_sess, uchan, app);
+ if (ret < 0) {
+ /* XXX: We might want to report this error at some point... */
continue;
}
}
}
/*
- * For a specific UST session and UST channel, create the event for all
- * registered apps.
+ * Disable an event in a channel and for a specific session.
*/
-int ust_app_create_event_all(struct ltt_ust_session *usess,
+int ust_app_disable_event_glb(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
int ret = 0;
- struct cds_lfht_iter iter;
- struct cds_lfht_node *ua_chan_node;
+ struct lttng_ht_iter iter, uiter;
+ struct lttng_ht_node_str *ua_chan_node, *ua_event_node;
struct ust_app *app;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
struct ust_app_event *ua_event;
- DBG("UST app creating event %s for all apps for session uid %d",
- uevent->attr.name, usess->uid);
+ DBG("UST app disabling event %s for all apps in channel "
+ "%s for session id %d", uevent->attr.name, uchan->name, usess->id);
rcu_read_lock();
/* For all registered applications */
- cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
- struct cds_lfht_iter uiter;
-
- /* Create session on the tracer side and add it to app session HT */
- ua_sess = create_ust_app_session(usess, app);
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
+ /* Next app */
continue;
}
/* Lookup channel in the ust app session */
- ua_chan_node = hashtable_lookup(ua_sess->channels,
- (void *)uchan->name, strlen(uchan->name),
- &uiter);
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
if (ua_chan_node == NULL) {
- ERR("Channel %s not found in session uid %d. Skipping",
- uchan->name, usess->uid);
+ DBG2("Channel %s not found in session id %d for app pid %d."
+ "Skipping", uchan->name, usess->id, app->key.pid);
continue;
}
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
- ua_event = create_ust_app_event(ua_sess, ua_chan, uevent, app);
- if (ua_event == NULL) {
+ lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &uiter);
+ ua_event_node = lttng_ht_iter_get_node_str(&uiter);
+ if (ua_event_node == NULL) {
+ DBG2("Event %s not found in channel %s for app pid %d."
+ "Skipping", uevent->attr.name, uchan->name, app->key.pid);
+ continue;
+ }
+ ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
+
+ ret = disable_ust_app_event(ua_sess, ua_event, app);
+ if (ret < 0) {
+ /* XXX: Report error someday... */
+ continue;
+ }
+ }
+
+ rcu_read_unlock();
+
+ return ret;
+}
+
+/*
+ * For a specific UST session and UST channel, the event for all
+ * registered apps.
+ */
+int ust_app_disable_all_event_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter, uiter;
+ struct lttng_ht_node_str *ua_chan_node;
+ struct ust_app *app;
+ struct ust_app_session *ua_sess;
+ struct ust_app_channel *ua_chan;
+ struct ust_app_event *ua_event;
+
+ DBG("UST app disabling all event for all apps in channel "
+ "%s for session id %d", uchan->name, usess->id);
+
+ rcu_read_lock();
+
+ /* For all registered applications */
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ua_sess = lookup_session_by_app(usess, app);
+ /* If ua_sess is NULL, there is a code flow error */
+ assert(ua_sess);
+
+ /* Lookup channel in the ust app session */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
+ /* If the channel is not found, there is a code flow error */
+ assert(ua_chan_node);
+
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+
+ /* Disable each events of channel */
+ cds_lfht_for_each_entry(ua_chan->events->ht, &uiter.iter, ua_event,
+ node.node) {
+ ret = disable_ust_app_event(ua_sess, ua_event, app);
+ if (ret < 0) {
+ /* XXX: Report error someday... */
+ continue;
+ }
+ }
+ }
+
+ rcu_read_unlock();
+
+ return ret;
+}
+
+/*
+ * For a specific UST session, create the channel for all registered apps.
+ */
+int ust_app_create_channel_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan)
+{
+ struct lttng_ht_iter iter;
+ struct ust_app *app;
+ struct ust_app_session *ua_sess;
+ struct ust_app_channel *ua_chan;
+
+ /* Very wrong code flow */
+ assert(usess);
+ assert(uchan);
+
+ DBG2("UST app adding channel %s to global domain for session id %d",
+ uchan->name, usess->id);
+
+ rcu_read_lock();
+
+ /* For every registered applications */
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ /*
+ * Create session on the tracer side and add it to app session HT. Note
+ * that if session exist, it will simply return a pointer to the ust
+ * app session.
+ */
+ ua_sess = create_ust_app_session(usess, app);
+ if (ua_sess == NULL) {
+ /* Major problem here and it's maybe the tracer or malloc() */
+ goto error;
+ }
+
+ /* Create channel onto application */
+ ua_chan = create_ust_app_channel(ua_sess, uchan, app);
+ if (ua_chan == NULL) {
+ /* Major problem here and it's maybe the tracer or malloc() */
+ goto error;
+ }
+ }
+
+ rcu_read_unlock();
+
+ return 0;
+
+error:
+ return -1;
+}
+
+/*
+ * Enable event for a specific session and channel on the tracer.
+ */
+int ust_app_enable_event_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter, uiter;
+ struct lttng_ht_node_str *ua_chan_node, *ua_event_node;
+ struct ust_app *app;
+ struct ust_app_session *ua_sess;
+ struct ust_app_channel *ua_chan;
+ struct ust_app_event *ua_event;
+
+ DBG("UST app enabling event %s for all apps for session id %d",
+ uevent->attr.name, usess->id);
+
+ /*
+ * NOTE: At this point, this function is called only if the session and
+ * channel passed are already created for all apps. and enabled on the
+ * tracer also.
+ */
+
+ rcu_read_lock();
+
+ /* For all registered applications */
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ua_sess = lookup_session_by_app(usess, app);
+ /* If ua_sess is NULL, there is a code flow error */
+ assert(ua_sess);
+
+ /* Lookup channel in the ust app session */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
+ /* If the channel is not found, there is a code flow error */
+ assert(ua_chan_node);
+
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+
+ lttng_ht_lookup(ua_chan->events, (void*)uevent->attr.name, &uiter);
+ ua_event_node = lttng_ht_iter_get_node_str(&uiter);
+ if (ua_event_node == NULL) {
+ DBG3("UST app enable event %s not found for app PID %d."
+ "Skipping app", uevent->attr.name, app->key.pid);
+ continue;
+ }
+ ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
+
+ ret = enable_ust_app_event(ua_sess, ua_event, app);
+ if (ret < 0) {
+ goto error;
+ }
+ }
+
+error:
+ rcu_read_unlock();
+ return ret;
+}
+
+/*
+ * For a specific existing UST session and UST channel, creates the event for
+ * all registered apps.
+ */
+int ust_app_create_event_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter, uiter;
+ struct lttng_ht_node_str *ua_chan_node;
+ struct ust_app *app;
+ struct ust_app_session *ua_sess;
+ struct ust_app_channel *ua_chan;
+
+ DBG("UST app creating event %s for all apps for session id %d",
+ uevent->attr.name, usess->id);
+
+ rcu_read_lock();
+
+ /* For all registered applications */
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ua_sess = lookup_session_by_app(usess, app);
+ /* If ua_sess is NULL, there is a code flow error */
+ assert(ua_sess);
+
+ /* Lookup channel in the ust app session */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
+ /* If the channel is not found, there is a code flow error */
+ assert(ua_chan_node);
+
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+
+ ret = create_ust_app_event(ua_sess, ua_chan, uevent, app);
+ if (ret < 0) {
+ if (ret != -EEXIST) {
+ /* Possible value at this point: -ENOMEM. If so, we stop! */
+ break;
+ }
+ DBG2("UST app event %s already exist on app PID %d",
+ uevent->attr.name, app->key.pid);
continue;
}
}
int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
{
int ret = 0;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
struct ltt_ust_stream *ustream;
+ int consumerd_fd;
DBG("Starting tracing for ust app pid %d", app->key.pid);
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
- /* Only malloc can failed so something is really wrong */
goto error_rcu_unlock;
}
+ /* Upon restart, we skip the setup, already done */
+ if (ua_sess->started) {
+ goto skip_setup;
+ }
+
ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
if (ret < 0) {
goto error_rcu_unlock;
}
/* For each channel */
- cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) {
+ cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
+ node.node) {
/* Create all streams */
while (1) {
/* Create UST stream */
}
}
+ switch (app->bits_per_long) {
+ case 64:
+ consumerd_fd = ust_consumerd64_fd;
+ break;
+ case 32:
+ consumerd_fd = ust_consumerd32_fd;
+ break;
+ default:
+ ret = -EINVAL;
+ goto error_rcu_unlock;
+ }
+
/* Setup UST consumer socket and send fds to it */
- ret = ust_consumer_send_session(ust_consumer_fd, ua_sess);
+ ret = ust_consumer_send_session(consumerd_fd, ua_sess);
if (ret < 0) {
goto error_rcu_unlock;
}
+ ua_sess->started = 1;
+skip_setup:
/* This start the UST tracing */
ret = ustctl_start_session(app->key.sock, ua_sess->handle);
if (ret < 0) {
return -1;
}
+/*
+ * Stop tracing for a specific UST session and app.
+ */
+int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct ust_app_session *ua_sess;
+ struct ust_app_channel *ua_chan;
+
+ DBG("Stopping tracing for ust app pid %d", app->key.pid);
+
+ rcu_read_lock();
+
+ ua_sess = lookup_session_by_app(usess, app);
+ if (ua_sess == NULL) {
+ /* Only malloc can failed so something is really wrong */
+ goto error_rcu_unlock;
+ }
+
+ /* This inhibits UST tracing */
+ ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
+ if (ret < 0) {
+ ERR("Error stopping tracing for app pid: %d", app->key.pid);
+ goto error_rcu_unlock;
+ }
+
+ /* Quiescent wait after stopping trace */
+ ustctl_wait_quiescent(app->key.sock);
+
+ /* Flushing buffers */
+ cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
+ node.node) {
+ ret = ustctl_sock_flush_buffer(app->key.sock, ua_chan->obj);
+ if (ret < 0) {
+ ERR("UST app PID %d channel %s flush failed",
+ app->key.pid, ua_chan->name);
+ ERR("Ended with ret %d", ret);
+ /* Continuing flushing all buffers */
+ continue;
+ }
+ }
+
+ /* Flush all buffers before stopping */
+ ret = ustctl_sock_flush_buffer(app->key.sock, ua_sess->metadata->obj);
+ if (ret < 0) {
+ ERR("UST app PID %d metadata flush failed", app->key.pid);
+ ERR("Ended with ret %d", ret);
+ }
+
+ rcu_read_unlock();
+
+ return 0;
+
+error_rcu_unlock:
+ rcu_read_unlock();
+ return -1;
+}
+
+/*
+ * Destroy a specific UST session in apps.
+ */
+int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app)
+{
+ struct ust_app_session *ua_sess;
+ struct lttng_ust_object_data obj;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_ulong *node;
+ int ret;
+
+ DBG("Destroy tracing for ust app pid %d", app->key.pid);
+
+ rcu_read_lock();
+
+ __lookup_session_by_app(usess, app, &iter);
+ node = lttng_ht_iter_get_node_ulong(&iter);
+ if (node == NULL) {
+ /* Only malloc can failed so something is really wrong */
+ goto error_rcu_unlock;
+ }
+ ua_sess = caa_container_of(node, struct ust_app_session, node);
+ ret = lttng_ht_del(app->sessions, &iter);
+ assert(!ret);
+ delete_ust_app_session(app->key.sock, ua_sess);
+ obj.handle = ua_sess->handle;
+ obj.shm_fd = -1;
+ obj.wait_fd = -1;
+ obj.memory_map_size = 0;
+ ustctl_release_object(app->key.sock, &obj);
+
+ rcu_read_unlock();
+
+ /* Quiescent wait after stopping trace */
+ ustctl_wait_quiescent(app->key.sock);
+
+ return 0;
+
+error_rcu_unlock:
+ rcu_read_unlock();
+ return -1;
+}
+
/*
* Start tracing for the UST session.
*/
int ust_app_start_trace_all(struct ltt_ust_session *usess)
{
int ret = 0;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app *app;
DBG("Starting all UST traces");
rcu_read_lock();
- cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
ret = ust_app_start_trace(usess, app);
if (ret < 0) {
/* Continue to next apps even on error */
return 0;
}
+/*
+ * Start tracing for the UST session.
+ */
+int ust_app_stop_trace_all(struct ltt_ust_session *usess)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct ust_app *app;
+
+ DBG("Stopping all UST traces");
+
+ rcu_read_lock();
+
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ret = ust_app_stop_trace(usess, app);
+ if (ret < 0) {
+ /* Continue to next apps even on error */
+ continue;
+ }
+ }
+
+ rcu_read_unlock();
+
+ return 0;
+}
+
+/*
+ * Destroy app UST session.
+ */
+int ust_app_destroy_trace_all(struct ltt_ust_session *usess)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct ust_app *app;
+
+ DBG("Destroy all UST traces");
+
+ rcu_read_lock();
+
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ret = ust_app_destroy_trace(usess, app);
+ if (ret < 0) {
+ /* Continue to next apps even on error */
+ continue;
+ }
+ }
+
+ rcu_read_unlock();
+
+ return 0;
+}
+
/*
* Add channels/events from UST global domain to registered apps at sock.
*/
void ust_app_global_update(struct ltt_ust_session *usess, int sock)
{
int ret = 0;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter, uiter;
struct ust_app *app;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
goto error;
}
- DBG2("UST app global update for app sock %d for session uid %d", sock,
- usess->uid);
+ DBG2("UST app global update for app sock %d for session id %d", sock,
+ usess->id);
rcu_read_lock();
* app session above made a shadow copy of the UST global domain from the
* ltt ust session.
*/
- cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) {
+ cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
+ node.node) {
ret = create_ust_channel(app, ua_sess, ua_chan);
if (ret < 0) {
/* FIXME: Should we quit here or continue... */
}
/* For each events */
- cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) {
+ cds_lfht_for_each_entry(ua_chan->events->ht, &uiter.iter, ua_event,
+ node.node) {
ret = create_ust_event(app, ua_sess, ua_chan, ua_event);
if (ret < 0) {
/* FIXME: Should we quit here or continue... */
rcu_read_unlock();
return;
}
+
+/*
+ * Add context to a specific channel for global UST domain.
+ */
+int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx)
+{
+ int ret = 0;
+ struct lttng_ht_node_str *ua_chan_node;
+ struct lttng_ht_iter iter, uiter;
+ struct ust_app_channel *ua_chan = NULL;
+ struct ust_app_session *ua_sess;
+ struct ust_app *app;
+
+ rcu_read_lock();
+
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ua_sess = lookup_session_by_app(usess, app);
+ if (ua_sess == NULL) {
+ continue;
+ }
+
+ /* Lookup channel in the ust app session */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
+ if (ua_chan_node == NULL) {
+ continue;
+ }
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel,
+ node);
+
+ ret = create_ust_app_channel_context(ua_sess, ua_chan, &uctx->ctx, app);
+ if (ret < 0) {
+ continue;
+ }
+ }
+
+ rcu_read_unlock();
+ return ret;
+}
+
+/*
+ * Add context to a specific event in a channel for global UST domain.
+ */
+int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent,
+ struct ltt_ust_context *uctx)
+{
+ int ret = 0;
+ struct lttng_ht_node_str *ua_chan_node, *ua_event_node;
+ struct lttng_ht_iter iter, uiter;
+ struct ust_app_session *ua_sess;
+ struct ust_app_event *ua_event;
+ struct ust_app_channel *ua_chan = NULL;
+ struct ust_app *app;
+
+ rcu_read_lock();
+
+ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) {
+ ua_sess = lookup_session_by_app(usess, app);
+ if (ua_sess == NULL) {
+ continue;
+ }
+
+ /* Lookup channel in the ust app session */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&uiter);
+ if (ua_chan_node == NULL) {
+ continue;
+ }
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel,
+ node);
+
+ lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &uiter);
+ ua_event_node = lttng_ht_iter_get_node_str(&uiter);
+ if (ua_event_node == NULL) {
+ continue;
+ }
+ ua_event = caa_container_of(ua_event_node, struct ust_app_event,
+ node);
+
+ ret = create_ust_app_event_context(ua_sess, ua_event, &uctx->ctx, app);
+ if (ret < 0) {
+ continue;
+ }
+ }
+
+ rcu_read_unlock();
+ return ret;
+}
+
+/*
+ * Enable event for a channel from a UST session for a specific PID.
+ */
+int ust_app_enable_event_pid(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, pid_t pid)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *ua_chan_node, *ua_event_node;
+ struct ust_app *app;
+ struct ust_app_session *ua_sess;
+ struct ust_app_channel *ua_chan;
+ struct ust_app_event *ua_event;
+
+ DBG("UST app enabling event %s for PID %d", uevent->attr.name, pid);
+
+ rcu_read_lock();
+
+ app = ust_app_find_by_pid(pid);
+ if (app == NULL) {
+ ERR("UST app enable event per PID %d not found", pid);
+ ret = -1;
+ goto error;
+ }
+
+ ua_sess = lookup_session_by_app(usess, app);
+ /* If ua_sess is NULL, there is a code flow error */
+ assert(ua_sess);
+
+ /* Lookup channel in the ust app session */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&iter);
+ /* If the channel is not found, there is a code flow error */
+ assert(ua_chan_node);
+
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+
+ lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &iter);
+ ua_event_node = lttng_ht_iter_get_node_str(&iter);
+ if (ua_event_node == NULL) {
+ ret = create_ust_app_event(ua_sess, ua_chan, uevent, app);
+ if (ret < 0) {
+ goto error;
+ }
+ } else {
+ ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
+
+ ret = enable_ust_app_event(ua_sess, ua_event, app);
+ if (ret < 0) {
+ goto error;
+ }
+ }
+
+error:
+ rcu_read_unlock();
+ return ret;
+}
+
+/*
+ * Disable event for a channel from a UST session for a specific PID.
+ */
+int ust_app_disable_event_pid(struct ltt_ust_session *usess,
+ struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, pid_t pid)
+{
+ int ret = 0;
+ struct lttng_ht_iter iter;
+ struct lttng_ht_node_str *ua_chan_node, *ua_event_node;
+ struct ust_app *app;
+ struct ust_app_session *ua_sess;
+ struct ust_app_channel *ua_chan;
+ struct ust_app_event *ua_event;
+
+ DBG("UST app disabling event %s for PID %d", uevent->attr.name, pid);
+
+ rcu_read_lock();
+
+ app = ust_app_find_by_pid(pid);
+ if (app == NULL) {
+ ERR("UST app disable event per PID %d not found", pid);
+ ret = -1;
+ goto error;
+ }
+
+ ua_sess = lookup_session_by_app(usess, app);
+ /* If ua_sess is NULL, there is a code flow error */
+ assert(ua_sess);
+
+ /* Lookup channel in the ust app session */
+ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
+ ua_chan_node = lttng_ht_iter_get_node_str(&iter);
+ if (ua_chan_node == NULL) {
+ /* Channel does not exist, skip disabling */
+ goto error;
+ }
+ ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
+
+ lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &iter);
+ ua_event_node = lttng_ht_iter_get_node_str(&iter);
+ if (ua_event_node == NULL) {
+ /* Event does not exist, skip disabling */
+ goto error;
+ }
+ ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
+
+ ret = disable_ust_app_event(ua_sess, ua_event, app);
+ if (ret < 0) {
+ goto error;
+ }
+
+error:
+ rcu_read_unlock();
+ return ret;
+}
projects / lttng-tools.git / blobdiff