#include "hashtable.h"
#include "ust-app.h"
-#include "../hashtable/hash.h"
-#include "ust-ctl.h"
#include "ust-consumer.h"
+#include "ust-ctl.h"
+
+/*
+ * 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)
+{
+ /* TODO : remove context */
+ //struct ust_app_ctx *ltctx;
+ //cds_lfht_for_each_entry(lte->ctx, &iter, ltctx, node) {
+ // delete_ust_app_ctx(sock, ltctx);
+ //}
+
+ ustctl_release_object(sock, ua_event->obj);
+ free(ua_event);
+}
/*
- * Delete a traceable application structure from the global list.
+ * Delete ust app stream safely. RCU read lock must be held before calling
+ * this function.
*/
-static void delete_ust_app(struct ust_app *lta)
+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.
+}
+
+/*
+ * 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)
{
int ret;
- struct cds_lfht_node *node;
struct cds_lfht_iter iter;
+ struct ust_app_event *ua_event;
+ struct ltt_ust_stream *stream, *stmp;
- rcu_read_lock();
+ cds_list_for_each_entry_safe(stream, stmp, &ua_chan->streams.head, list) {
+ delete_ust_app_stream(sock, stream);
+ }
- /* TODO: clean session hashtable */
- free(lta->sessions);
- close(lta->key.sock);
+ /* 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);
- /* Remove from apps hash table */
- node = hashtable_lookup(ust_app_ht,
- (void *) ((unsigned long) lta->key.pid), sizeof(void *), &iter);
- if (node == NULL) {
- ERR("UST app pid %d not found in hash table", lta->key.pid);
- } else {
- ret = hashtable_del(ust_app_ht, &iter);
- if (ret) {
- ERR("UST app unable to delete app %d from hash table",
- lta->key.pid);
- } else {
- DBG2("UST app pid %d deleted", lta->key.pid);
- }
+ cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) {
+ hashtable_del(ua_chan->events, &iter);
+ delete_ust_app_event(sock, ua_event);
+ }
+
+ ret = hashtable_destroy(ua_chan->events);
+ if (ret < 0) {
+ ERR("UST app destroy session hashtable failed");
+ goto error;
+ }
+
+error:
+ return;
+}
+
+/*
+ * 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)
+{
+ int ret;
+ struct cds_lfht_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.
+ */
+ }
+
+ cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) {
+ hashtable_del(ua_sess->channels, &iter);
+ delete_ust_app_channel(sock, ua_chan);
+ }
+
+ ret = hashtable_destroy(ua_sess->channels);
+ if (ret < 0) {
+ ERR("UST app destroy session hashtable failed");
+ goto error;
}
+error:
+ return;
+}
+
+/*
+ * 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)
+{
+ int ret;
+ struct cds_lfht_node *node;
+ struct cds_lfht_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) lta->key.sock), sizeof(void *), &iter);
+ (void *) ((unsigned long) app->key.sock), sizeof(void *), &iter);
if (node == NULL) {
- ERR("UST app key %d not found in key hash table", lta->key.sock);
+ /* 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 {
- ret = hashtable_del(ust_app_sock_key_map, &iter);
- if (ret) {
- ERR("UST app unable to delete app sock %d from key hash table",
- lta->key.sock);
- } else {
- DBG2("UST app pair sock %d key %d deleted",
- lta->key.sock, lta->key.pid);
- }
+ 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 */
+ if (app->sock_closed) {
+ app->key.sock = -1;
}
- free(lta);
+ cds_lfht_for_each_entry(app->sessions, &iter, ua_sess, node) {
+ hashtable_del(app->sessions, &iter);
+ 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;
+ }
+
+ if (!app->sock_closed) {
+ close(app->key.sock);
+ }
+
+ DBG2("UST app pid %d deleted", app->key.pid);
+ free(app);
+end:
rcu_read_unlock();
}
(void *)((unsigned long) sock), sizeof(void *), &iter);
if (node == NULL) {
DBG2("UST app find by sock %d key not found", sock);
- rcu_read_unlock();
goto error;
}
(void *)((unsigned long) key->pid), sizeof(void *), &iter);
if (node == NULL) {
DBG2("UST app find by sock %d not found", sock);
- rcu_read_unlock();
goto error;
}
-
return caa_container_of(node, struct ust_app, node);
error:
node = hashtable_lookup(ust_app_ht,
(void *)((unsigned long) pid), sizeof(void *), &iter);
if (node == NULL) {
- rcu_read_unlock();
DBG2("UST app no found with pid %d", pid);
goto error;
}
return caa_container_of(node, struct ust_app, node);
error:
+ rcu_read_unlock();
return NULL;
}
{
struct ust_app *lta;
- lta = malloc(sizeof(struct ust_app));
+ lta = zmalloc(sizeof(struct ust_app));
if (lta == NULL) {
PERROR("malloc");
return -ENOMEM;
}
+ lta->ppid = msg->ppid;
lta->uid = msg->uid;
lta->gid = msg->gid;
- lta->key.pid = msg->pid;
- lta->ppid = msg->ppid;
lta->v_major = msg->major;
lta->v_minor = msg->minor;
- lta->key.sock = sock;
strncpy(lta->name, msg->name, sizeof(lta->name));
lta->name[16] = '\0';
- hashtable_node_init(<a->node, (void *)((unsigned long)lta->key.pid),
- sizeof(void *));
-
- /* Session hashtable */
lta->sessions = hashtable_new(0);
- /* Set sock key map */
+ /* Set key map */
+ lta->key.pid = msg->pid;
+ hashtable_node_init(<a->node, (void *)((unsigned long)lta->key.pid),
+ sizeof(void *));
+ lta->key.sock = sock;
hashtable_node_init(<a->key.node, (void *)((unsigned long)lta->key.sock),
sizeof(void *));
rcu_read_lock();
- hashtable_add_unique(ust_app_ht, <a->node);
hashtable_add_unique(ust_app_sock_key_map, <a->key.node);
+ hashtable_add_unique(ust_app_ht, <a->node);
rcu_read_unlock();
DBG("App registered with pid:%d ppid:%d uid:%d gid:%d sock:%d name:%s"
goto error;
}
+ /* We got called because the socket was closed on the remote end. */
+ close(sock);
+ /* Using a flag because we still need "sock" as a key. */
+ lta->sock_closed = 1;
+ hashtable_del(ust_app_ht, &iter);
call_rcu(&node->head, delete_ust_app_rcu);
-
error:
rcu_read_unlock();
return;
return count;
}
+/*
+ * Fill events array with all events name of all registered apps.
+ */
+int ust_app_list_events(struct lttng_event **events)
+{
+ int ret, handle;
+ size_t nbmem, count = 0;
+ struct cds_lfht_iter iter;
+ struct ust_app *app;
+ struct lttng_event *tmp;
+
+ nbmem = UST_APP_EVENT_LIST_SIZE;
+ tmp = zmalloc(nbmem * sizeof(struct lttng_event));
+ if (tmp == NULL) {
+ PERROR("zmalloc ust app events");
+ ret = -ENOMEM;
+ goto error;
+ }
+
+ rcu_read_lock();
+
+ cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ handle = ustctl_tracepoint_list(app->key.sock);
+ if (handle < 0) {
+ ERR("UST app list events getting handle failed for app pid %d",
+ app->key.pid);
+ continue;
+ }
+
+ 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);
+ if (tmp == NULL) {
+ PERROR("realloc ust app events");
+ ret = -ENOMEM;
+ goto rcu_error;
+ }
+ }
+
+ tmp[count].type = LTTNG_UST_TRACEPOINT;
+ tmp[count].pid = app->key.pid;
+ tmp[count].enabled = -1;
+ count++;
+ }
+ }
+
+ ret = count;
+ *events = tmp;
+
+ DBG2("UST app list events done (%zu events)", count);
+
+rcu_error:
+ rcu_read_unlock();
+error:
+ return ret;
+}
+
/*
* Free and clean all traceable apps of the global list.
*/
int ret;
struct cds_lfht_node *node;
struct cds_lfht_iter iter;
+ struct ust_app *app;
- DBG2("UST app clean hash table");
+ DBG2("UST app cleaning registered apps hash table");
rcu_read_lock();
- hashtable_get_first(ust_app_ht, &iter);
- while ((node = hashtable_iter_get_node(&iter)) != NULL) {
+ cds_lfht_for_each(ust_app_ht, &iter, node) {
+ app = caa_container_of(node, struct ust_app, node);
+ close(app->key.sock);
+ app->sock_closed = 1;
+
ret = hashtable_del(ust_app_ht, &iter);
if (!ret) {
call_rcu(&node->head, delete_ust_app_rcu);
}
- hashtable_get_next(ust_app_ht, &iter);
}
+ hashtable_destroy(ust_app_ht);
+ hashtable_destroy(ust_app_sock_key_map);
+
rcu_read_unlock();
}
/*
* Alloc new UST app channel.
*/
-static struct ust_app_channel *alloc_ust_app_channel(char *name)
+static struct ust_app_channel *alloc_ust_app_channel(char *name,
+ struct lttng_ust_channel *attr)
{
struct ust_app_channel *ua_chan;
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);
- CDS_INIT_LIST_HEAD(&ua_chan->streams.head);
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;
/*
* Alloc new UST app event.
*/
-static struct ust_app_event *alloc_ust_app_event(char *name)
+static struct ust_app_event *alloc_ust_app_event(char *name,
+ struct lttng_ust_event *attr)
{
struct ust_app_event *ua_event;
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));
+ }
+
DBG3("UST app event %s allocated", ua_event->name);
return ua_event;
if (ua_event_node == NULL) {
DBG2("UST event %s not found on shadow copy channel",
uevent->attr.name);
- ua_event = alloc_ust_app_event(uevent->attr.name);
+ ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr);
if (ua_event == NULL) {
goto next;
}
if (ua_chan_node == NULL) {
DBG2("Channel %s not found on shadow session copy, creating it",
uchan->name);
- ua_chan = alloc_ust_app_channel(uchan->name);
+ ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr);
if (ua_chan == NULL) {
/* malloc failed... continuing */
goto next;
return NULL;
}
+/*
+ * Create the specified channel onto the UST tracer for a UST session.
+ */
+static int create_ust_channel(struct ust_app *app,
+ struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan)
+{
+ int ret;
+
+ /* TODO: remove cast and use lttng-ust-abi.h */
+ 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) "
+ "and session handle %d with ret %d",
+ ua_chan->name, app->key.pid, app->key.sock,
+ ua_sess->handle, ret);
+ goto error;
+ }
+
+ 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);
+
+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)
+{
+ int ret = 0;
+
+ /* Create UST event on tracer */
+ ret = ustctl_create_event(app->key.sock, &ua_event->attr, ua_chan->obj,
+ &ua_event->obj);
+ if (ret < 0) {
+ 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;
+}
+
static struct ust_app_channel *create_ust_app_channel(
struct ust_app_session *ua_sess, struct ltt_ust_channel *uchan,
struct ust_app *app)
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);
+ 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 {
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
}
- /* TODO: remove cast and use lttng-ust-abi.h */
- ret = ustctl_create_channel(app->key.sock, ua_sess->handle,
- (struct lttng_ust_channel_attr *)&uchan->attr, &ua_chan->obj);
+ ret = create_ust_channel(app, ua_sess, ua_chan);
if (ret < 0) {
- DBG("Error 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);
goto error;
}
- 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("Channel %s UST create successfully for pid:%d and sock:%d",
- ua_chan->name, app->key.pid, app->key.sock);
-
return ua_chan;
error:
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);
+ 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;
ua_event = caa_container_of(ua_event_node, struct ust_app_event, node);
}
- /* Create UST event on tracer */
- ret = ustctl_create_event(app->key.sock, &uevent->attr, ua_chan->obj,
- &ua_event->obj);
+ ret = create_ust_event(app, ua_sess, ua_chan, ua_event);
if (ret < 0) {
- ERR("Error ustctl create event %s for app pid: %d with ret %d",
- uevent->attr.name, app->key.pid, ret);
- /* TODO: free() ua_event */
goto error;
}
- ua_event->handle = ua_event->obj->handle;
- ua_event->enabled = 1;
-
-
- DBG2("Event %s UST create successfully for pid:%d", uevent->attr.name,
- app->key.pid);
return ua_event;
/* Create session on the tracer side and add it to app session HT */
ua_sess = create_ust_app_session(usess, app);
- if (ret < 0) {
+ if (ua_sess == NULL) {
goto next;
}
struct ust_app_channel *ua_chan;
struct ust_app_event *ua_event;
- DBG2("UST app adding event %s to global domain for session uid %d",
+ DBG("UST app creating event %s for all apps for session uid %d",
uevent->attr.name, usess->uid);
rcu_read_lock();
/* Create session on the tracer side and add it to app session HT */
ua_sess = create_ust_app_session(usess, app);
- if (ret < 0) {
+ if (ua_sess == NULL) {
goto next;
}
DBG("Starting 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;
+ goto error_rcu_unlock;
}
ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
if (ret < 0) {
- goto error;
+ goto error_rcu_unlock;
}
/* For each channel */
ustream = zmalloc(sizeof(*ustream));
if (ustream == NULL) {
PERROR("zmalloc ust stream");
- continue;
+ goto error_rcu_unlock;
}
ret = ustctl_create_stream(app->key.sock, ua_chan->obj,
/* Setup UST consumer socket and send fds to it */
ret = ust_consumer_send_session(usess->consumer_fd, ua_sess);
if (ret < 0) {
- goto error;
+ goto error_rcu_unlock;
}
/* This start the UST tracing */
ret = ustctl_start_session(app->key.sock, ua_sess->handle);
if (ret < 0) {
ERR("Error starting tracing for app pid: %d", app->key.pid);
- goto error;
+ goto error_rcu_unlock;
}
+ rcu_read_unlock();
/* Quiescent wait after starting trace */
ustctl_wait_quiescent(app->key.sock);
return 0;
-error:
+error_rcu_unlock:
+ rcu_read_unlock();
return -1;
}
{
int ret = 0;
struct cds_lfht_iter iter;
- struct cds_lfht_node *node;
struct ust_app *app;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
struct ust_app_event *ua_event;
- struct ltt_ust_channel *uchan;
- struct ltt_ust_event *uevent;
-
- rcu_read_lock();
if (usess == NULL) {
DBG2("No UST session on global update. Returning");
DBG2("UST app global update for app sock %d for session uid %d", sock,
usess->uid);
+ rcu_read_lock();
+
app = find_app_by_sock(sock);
if (app == NULL) {
ERR("Failed to update app sock %d", sock);
goto error;
}
- hashtable_get_first(usess->domain_global.channels, &iter);
- while ((node = hashtable_iter_get_node(&iter)) != NULL) {
- uchan = caa_container_of(node, struct ltt_ust_channel, node);
-
- ua_chan = create_ust_app_channel(ua_sess, uchan, app);
- if (ua_chan == NULL) {
- goto next_chan;
+ /*
+ * We can iterate safely here over all UST app session sicne the create ust
+ * 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) {
+ ret = create_ust_channel(app, ua_sess, ua_chan);
+ if (ret < 0) {
+ /* FIXME: Should we quit here or continue... */
+ continue;
}
- hashtable_get_first(uchan->events, &iter);
- while ((node = hashtable_iter_get_node(&iter)) != NULL) {
- uevent = caa_container_of(node, struct ltt_ust_event, node);
-
- ua_event = create_ust_app_event(ua_sess, ua_chan, uevent, app);
- if (ua_event == NULL) {
- goto next_event;
+ /* For each events */
+ cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) {
+ ret = create_ust_event(app, ua_sess, ua_chan, ua_event);
+ if (ret < 0) {
+ /* FIXME: Should we quit here or continue... */
+ continue;
}
-
-next_event:
- hashtable_get_next(uchan->events, &iter);
}
-
-next_chan:
- /* Next item in hash table */
- hashtable_get_next(usess->domain_global.channels, &iter);
}
if (usess->start_trace) {
projects / lttng-tools.git / blobdiff