static const struct option long_options[] = {
{ "client-sock", 1, 0, 'c' },
{ "apps-sock", 1, 0, 'a' },
- { "kconsumerd-cmd-sock", 1, 0, 'C' },
- { "kconsumerd-err-sock", 1, 0, 'E' },
- { "ustconsumerd32-cmd-sock", 1, 0, 'G' },
- { "ustconsumerd32-err-sock", 1, 0, 'H' },
- { "ustconsumerd64-cmd-sock", 1, 0, 'D' },
- { "ustconsumerd64-err-sock", 1, 0, 'F' },
- { "consumerd32-path", 1, 0, 'u' },
- { "consumerd32-libdir", 1, 0, 'U' },
- { "consumerd64-path", 1, 0, 't' },
- { "consumerd64-libdir", 1, 0, 'T' },
+ { "kconsumerd-cmd-sock", 1, 0, '\0' },
+ { "kconsumerd-err-sock", 1, 0, '\0' },
+ { "ustconsumerd32-cmd-sock", 1, 0, '\0' },
+ { "ustconsumerd32-err-sock", 1, 0, '\0' },
+ { "ustconsumerd64-cmd-sock", 1, 0, '\0' },
+ { "ustconsumerd64-err-sock", 1, 0, '\0' },
+ { "consumerd32-path", 1, 0, '\0' },
+ { "consumerd32-libdir", 1, 0, '\0' },
+ { "consumerd64-path", 1, 0, '\0' },
+ { "consumerd64-libdir", 1, 0, '\0' },
{ "daemonize", 0, 0, 'd' },
{ "background", 0, 0, 'b' },
{ "sig-parent", 0, 0, 'S' },
{ "version", 0, 0, 'V' },
{ "quiet", 0, 0, 'q' },
{ "verbose", 0, 0, 'v' },
- { "verbose-consumer", 0, 0, 'Z' },
- { "no-kernel", 0, 0, 'N' },
+ { "verbose-consumer", 0, 0, '\0' },
+ { "no-kernel", 0, 0, '\0' },
{ "pidfile", 1, 0, 'p' },
- { "agent-tcp-port", 1, 0, 'J' },
+ { "agent-tcp-port", 1, 0, '\0' },
{ "config", 1, 0, 'f' },
{ "load", 1, 0, 'l' },
- { "kmod-probes", 1, 0, 'P' },
- { "extra-kmod-probes", 1, 0, 'e' },
+ { "kmod-probes", 1, 0, '\0' },
+ { "extra-kmod-probes", 1, 0, '\0' },
{ NULL, 0, 0, 0 }
};
/* For all tracing session(s) */
cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) {
+ struct ust_app *app;
+
session_lock(sess);
- if (sess->ust_session) {
- ust_app_global_update(sess->ust_session, app_sock);
+ if (!sess->ust_session) {
+ goto unlock_session;
}
+
+ rcu_read_lock();
+ assert(app_sock >= 0);
+ app = ust_app_find_by_sock(app_sock);
+ if (app == NULL) {
+ /*
+ * Application can be unregistered before so
+ * this is possible hence simply stopping the
+ * update.
+ */
+ DBG3("UST app update failed to find app sock %d",
+ app_sock);
+ goto unlock_rcu;
+ }
+ ust_app_global_update(sess->ust_session, app);
+ unlock_rcu:
+ rcu_read_unlock();
+ unlock_session:
session_unlock(sess);
}
}
case LTTNG_LIST_CHANNELS:
case LTTNG_LIST_EVENTS:
case LTTNG_LIST_SYSCALLS:
+ case LTTNG_LIST_TRACKER_PIDS:
break;
default:
/* Setup lttng message with no payload */
ret = LTTNG_OK;
break;
}
+ case LTTNG_LIST_TRACKER_PIDS:
+ {
+ int32_t *pids = NULL;
+ ssize_t nr_pids;
+
+ nr_pids = cmd_list_tracker_pids(cmd_ctx->session,
+ cmd_ctx->lsm->domain.type, &pids);
+ if (nr_pids < 0) {
+ /* Return value is a negative lttng_error_code. */
+ ret = -nr_pids;
+ goto error;
+ }
+
+ /*
+ * Setup lttng message with payload size set to the event list size in
+ * bytes and then copy list into the llm payload.
+ */
+ ret = setup_lttng_msg(cmd_ctx, sizeof(int32_t) * nr_pids);
+ if (ret < 0) {
+ free(pids);
+ goto setup_error;
+ }
+
+ /* Copy event list into message payload */
+ memcpy(cmd_ctx->llm->payload, pids,
+ sizeof(int) * nr_pids);
+
+ free(pids);
+
+ ret = LTTNG_OK;
+ break;
+ }
case LTTNG_SET_CONSUMER_URI:
{
size_t nb_uri, len;
* cleanup() can get called after that point.
*/
if (ust_app_ht_alloc()) {
+ ERR("Failed to allocate UST app hash table");
retval = -1;
goto exit_init_data;
}