#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <runas.h>
#include <urcu/compiler.h>
+
#include <lttngerr.h>
+#include <lttng-ht.h>
#include <lttng-share.h>
+#include <runas.h>
-#include "hashtable.h"
#include "ust-app.h"
#include "ust-consumer.h"
#include "ust-ctl.h"
void delete_ust_app_event(int sock, struct ust_app_event *ua_event)
{
int ret;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app_ctx *ua_ctx;
- cds_lfht_for_each_entry(ua_event->ctx, &iter, ua_ctx, node) {
- ret = hashtable_del(ua_event->ctx, &iter);
+ 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);
}
- ret = hashtable_destroy(ua_event->ctx);
- assert(!ret);
+ lttng_ht_destroy(ua_event->ctx);
if (ua_event->obj != NULL) {
ustctl_release_object(sock, ua_event->obj);
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 context */
- cds_lfht_for_each_entry(ua_chan->ctx, &iter, ua_ctx, node) {
- ret = hashtable_del(ua_chan->ctx, &iter);
+ 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);
}
- ret = hashtable_destroy(ua_chan->ctx);
- assert(!ret);
+ lttng_ht_destroy(ua_chan->ctx);
/* Wipe events */
- cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) {
- ret = hashtable_del(ua_chan->events, &iter);
+ 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);
}
- ret = hashtable_destroy(ua_chan->events);
- assert(!ret);
+ lttng_ht_destroy(ua_chan->events);
if (ua_chan->obj != NULL) {
ustctl_release_object(sock, ua_chan->obj);
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) {
}
}
- cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) {
- ret = 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);
}
- ret = hashtable_destroy(ua_sess->channels);
- assert(!ret);
+ lttng_ht_destroy(ua_sess->channels);
+ if (ua_sess->handle != -1) {
+ ustctl_release_handle(sock, ua_sess->handle);
+ }
free(ua_sess);
}
void delete_ust_app(struct ust_app *app)
{
int ret, sock;
- struct cds_lfht_node *node;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app_session *ua_sess;
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;
/* Wipe sessions */
- cds_lfht_for_each_entry(app->sessions, &iter, ua_sess, node) {
- ret = hashtable_del(app->sessions, &iter);
+ 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);
- assert(!ret);
+ 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();
}
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);
}
}
ua_sess->handle = -1;
- ua_sess->channels = hashtable_new_str(0);
+ ua_sess->channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
return ua_sess;
ua_chan->enabled = 1;
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));
+ 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);
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 = hashtable_new(0);
- hashtable_node_init(&ua_event->node, (void *) ua_event->name,
- strlen(ua_event->name));
+ 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) {
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;
goto error;
}
+ ua_sess->metadata->handle = ua_sess->metadata->obj->handle;
+
error:
return ret;
}
static void shadow_copy_event(struct ust_app_event *ua_event,
struct ltt_ust_event *uevent)
{
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ltt_ust_context *uctx;
struct ust_app_ctx *ua_ctx;
/* Copy event attributes */
memcpy(&ua_event->attr, &uevent->attr, sizeof(ua_event->attr));
- cds_lfht_for_each_entry(uevent->ctx, &iter, uctx, node) {
+ 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) {
continue;
}
- hashtable_node_init(&ua_ctx->node,
- (void *)((unsigned long) ua_ctx->ctx.ctx), sizeof(void *));
- hashtable_add_unique(ua_event->ctx, &ua_ctx->node);
+ 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;
/* Copy event attributes */
memcpy(&ua_chan->attr, &uchan->attr, sizeof(ua_chan->attr));
- cds_lfht_for_each_entry(uchan->ctx, &iter, uctx, node) {
+ 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;
}
- hashtable_node_init(&ua_ctx->node,
- (void *)((unsigned long) ua_ctx->ctx.ctx), sizeof(void *));
- hashtable_add_unique(ua_chan->ctx, &ua_ctx->node);
+ 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);
}
}
* 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",
/* 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) {
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);
}
}
*/
static
void __lookup_session_by_app(struct ltt_ust_session *usess,
- struct ust_app *app, struct cds_lfht_iter *iter)
+ struct ust_app *app, struct lttng_ht_iter *iter)
{
/* Get right UST app session from app */
- (void) hashtable_lookup(app->sessions,
- (void *) ((unsigned long) usess->uid), sizeof(void *),
- iter);
+ 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;
__lookup_session_by_app(usess, app, &iter);
- node = hashtable_iter_get_node(&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 */
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);
}
struct ust_app *app)
{
int ret = 0;
- struct cds_lfht_iter iter;
- struct cds_lfht_node *node;
+ 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);
- node = hashtable_lookup(ua_chan->ctx, (void *)((unsigned long)uctx->ctx),
- sizeof(void *), &iter);
+ 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;
goto error;
}
- hashtable_node_init(&ua_ctx->node,
- (void *)((unsigned long) ua_ctx->ctx.ctx), sizeof(void *));
- hashtable_add_unique(ua_chan->ctx, &ua_ctx->node);
+ 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) {
struct ust_app *app)
{
int ret = 0;
- struct cds_lfht_iter iter;
- struct cds_lfht_node *node;
+ 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);
- node = hashtable_lookup(ua_event->ctx, (void *)((unsigned long)uctx->ctx),
- sizeof(void *), &iter);
+ 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;
goto error;
}
- hashtable_node_init(&ua_ctx->node,
- (void *)((unsigned long) ua_ctx->ctx.ctx), sizeof(void *));
- hashtable_add_unique(ua_event->ctx, &ua_ctx->node);
+ 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) {
* 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_channel *ua_chan, struct ust_app_event *ua_event,
- struct ust_app *app)
+ struct ust_app_event *ua_event, struct ust_app *app)
{
int ret;
struct ltt_ust_channel *uchan, 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;
- ua_chan_node = hashtable_lookup(ua_sess->channels,
- (void *)uchan->name, strlen(uchan->name), &iter);
+ 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 uid %u",
- uchan->name, ua_sess->uid);
+ DBG2("Unable to find channel %s in ust session id %u",
+ uchan->name, ua_sess->id);
goto error;
}
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);
+ 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 uid %u",
- uchan->name, ua_sess->uid);
+ DBG2("Unable to find channel %s in ust session id %u",
+ uchan->name, ua_sess->id);
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);
+ lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
} else {
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
}
struct ust_app *app)
{
int ret = 0;
- 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 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);
+ 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) {
ERR("UST app event %s already exist. Stopping creation.",
uevent->attr.name);
ua_event->enabled = 1;
- hashtable_add_unique(ua_chan->events, &ua_event->node);
+ 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:
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;
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();
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;
}
- ret = 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:
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) {
- struct lttng_ust_tracepoint_iter iter;
+ 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) {
}
while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle,
- &iter)) != -ENOENT) {
- memcpy(tmp[count].name, iter.name, LTTNG_UST_SYM_NAME_LEN);
- /* TODO : get loglevel too */
- 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;
+ &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");
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_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_entry(ust_app_ht, &iter, app, node) {
- ret = hashtable_del(ust_app_ht, &iter);
+ 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(&iter.node->head, delete_ust_app_rcu);
+ 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);
}
/*
struct ltt_ust_channel *uchan)
{
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 *app;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
goto error;
}
- DBG2("UST app disabling channel %s from global domain for session uid %d",
- uchan->name, usess->uid);
+ 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, &iter, app, node) {
+ 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 */
- ua_chan_node = hashtable_lookup(ua_sess->channels,
- (void *)uchan->name, strlen(uchan->name), &iter);
+ 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);
struct ltt_ust_channel *uchan)
{
int ret = 0;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app *app;
struct ust_app_session *ua_sess;
goto error;
}
- DBG2("UST app enabling 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) {
+ 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;
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
- struct cds_lfht_node *ua_chan_node, *ua_event_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 disabling event %s for all apps in channel "
- "%s for session uid %d", uevent->attr.name, uchan->name, usess->uid);
+ "%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) {
+ 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 */
}
/* 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) {
- DBG2("Channel %s not found in session uid %d for app pid %d."
- "Skipping", uchan->name, usess->uid, app->key.pid);
+ 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_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("Event %s not found in channel %s for app pid %d."
"Skipping", uevent->attr.name, uchan->name, app->key.pid);
}
ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
- ret = disable_ust_app_event(ua_sess, ua_chan, ua_event, app);
+ ret = disable_ust_app_event(ua_sess, ua_event, app);
if (ret < 0) {
/* XXX: Report error someday... */
continue;
struct ltt_ust_channel *uchan)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
- struct cds_lfht_node *ua_chan_node;
+ 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 uid %d", uchan->name, usess->uid);
+ "%s for session id %d", uchan->name, usess->id);
rcu_read_lock();
/* For all registered applications */
- 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) {
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 */
- 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 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, &uiter, ua_event, node) {
- ret = disable_ust_app_event(ua_sess, ua_chan, ua_event, app);
+ 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;
struct ltt_ust_channel *uchan)
{
int ret = 0;
- struct cds_lfht_iter iter;
+ struct lttng_ht_iter iter;
struct ust_app *app;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
goto error;
}
- DBG2("UST app adding channel %s to global domain for session uid %d",
- uchan->name, usess->uid);
+ 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, &iter, app, node) {
+ 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
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
- struct cds_lfht_node *ua_chan_node, *ua_event_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 enabling event %s for all apps for session uid %d",
- uevent->attr.name, usess->uid);
+ 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
rcu_read_lock();
/* For all registered applications */
- 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) {
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 */
- 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 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);
- ua_event_node = hashtable_lookup(ua_sess->channels,
- (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) {
- DBG3("UST app enable event %s not found. Skipping app",
- uevent->attr.name);
+ 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) {
- /* XXX: Report error someday... */
- continue;
+ goto error;
}
}
+error:
rcu_read_unlock();
-
return ret;
}
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
- struct cds_lfht_node *ua_chan_node;
+ 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 uid %d",
- uevent->attr.name, usess->uid);
+ DBG("UST app creating 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
rcu_read_lock();
/* For all registered applications */
- 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) {
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 */
- 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 the channel is not found, there is a code flow error */
assert(ua_chan_node);
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;
}
/* 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 */
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);
goto error_rcu_unlock;
}
-#if 0 /* only useful when periodical flush will be supported */
- /* need to keep a handle on shm in session for this. */
- /* Flush all buffers before stopping */
- ret = ustctl_flush_buffer(usess->sock, usess->metadata->obj);
+ /* This inhibits UST tracing */
+ ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
if (ret < 0) {
- ERR("UST metadata flush failed");
+ ERR("Error stopping tracing for app pid: %d", app->key.pid);
+ goto error_rcu_unlock;
}
- cds_list_for_each_entry(ustchan, &usess->channels.head, list) {
- ret = ustctl_flush_buffer(usess->sock, ustchan->obj);
+ /* 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 flush buffer error");
+ 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;
}
}
-#endif
- /* This inhibits UST tracing */
- ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
+ /* Flush all buffers before stopping */
+ ret = ustctl_sock_flush_buffer(app->key.sock, ua_sess->metadata->obj);
if (ret < 0) {
- ERR("Error stopping tracing for app pid: %d", app->key.pid);
- goto error_rcu_unlock;
+ ERR("UST app PID %d metadata flush failed", app->key.pid);
+ ERR("Ended with ret %d", ret);
}
rcu_read_unlock();
- /* Quiescent wait after stopping trace */
- ustctl_wait_quiescent(app->key.sock);
-
return 0;
error_rcu_unlock:
{
struct ust_app_session *ua_sess;
struct lttng_ust_object_data obj;
- struct cds_lfht_iter iter;
- struct cds_lfht_node *node;
+ 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 = hashtable_iter_get_node(&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 = hashtable_del(app->sessions, &iter);
+ ret = lttng_ht_del(app->sessions, &iter);
assert(!ret);
delete_ust_app_session(app->key.sock, ua_sess);
obj.handle = ua_sess->handle;
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 */
int ust_app_stop_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("Stopping 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_stop_trace(usess, app);
if (ret < 0) {
/* Continue to next apps even on error */
int ust_app_destroy_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("Destroy 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_destroy_trace(usess, app);
if (ret < 0) {
/* Continue to next apps even on error */
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... */
struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx)
{
int ret = 0;
- struct cds_lfht_node *ua_chan_node;
- struct cds_lfht_iter iter, uiter;
+ 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, &iter, app, node) {
+ 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 */
- 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) {
continue;
}
}
}
- /* Add ltt UST context node to ltt UST channel */
- hashtable_add_unique(uchan->ctx, &uctx->node);
-
rcu_read_unlock();
return ret;
}
struct ltt_ust_context *uctx)
{
int ret = 0;
- struct cds_lfht_node *ua_chan_node, *ua_event_node;
- struct cds_lfht_iter iter, uiter;
+ 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;
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) {
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
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) {
continue;
}
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel,
node);
- 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) {
continue;
}
}
}
- /* Add ltt UST context node to ltt UST event */
- hashtable_add_unique(uevent->ctx, &uctx->node);
+ 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