/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * 2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stddef.h>
#include <common/utils.h>
#include <lttng/userspace-probe-internal.h>
#include <lttng/event-internal.h>
+#include <lttng/session-internal.h>
+#include <lttng/session-descriptor-internal.h>
+#include <lttng/tracker-internal.h>
#include "client.h"
#include "lttng-sessiond.h"
#include "testpoint.h"
#include "utils.h"
#include "manage-consumer.h"
+#include "clear.h"
+#include "agent-thread.h"
static bool is_root;
static struct thread_state {
sem_t ready;
bool running;
+ int client_sock;
} thread_state;
static void set_thread_status(bool running)
const size_t payload_offset = cmd_header_offset + cmd_header_len;
const size_t total_msg_size = header_len + cmd_header_len + payload_len;
+ free(cmd_ctx->llm);
cmd_ctx->llm = zmalloc(total_msg_size);
if (cmd_ctx->llm == NULL) {
case LTTNG_CONSUMER64_UST:
{
if (config.consumerd64_lib_dir.value) {
- char *tmp;
+ const char *tmp;
size_t tmplen;
char *tmpnew;
case LTTNG_CONSUMER32_UST:
{
if (config.consumerd32_lib_dir.value) {
- char *tmp;
+ const char *tmp;
size_t tmplen;
char *tmpnew;
}
/* Append correct directory to subdir */
- strncat(consumer->subdir, dir_name,
- sizeof(consumer->subdir) - strlen(consumer->subdir) - 1);
- DBG3("Copy session consumer subdir %s", consumer->subdir);
-
+ ret = lttng_strncpy(consumer->domain_subdir, dir_name,
+ sizeof(consumer->domain_subdir));
+ if (ret) {
+ ret = LTTNG_ERR_UNK;
+ goto error;
+ }
+ DBG3("Copy session consumer subdir %s", consumer->domain_subdir);
ret = LTTNG_OK;
error:
* Should *NOT* be called with RCU read-side lock held.
*/
static int create_ust_session(struct ltt_session *session,
- struct lttng_domain *domain)
+ const struct lttng_domain *domain)
{
int ret;
struct ltt_ust_session *lus = NULL;
DBG("Creating kernel session");
- ret = kernel_create_session(session, kernel_tracer_fd);
+ ret = kernel_create_session(session);
if (ret < 0) {
ret = LTTNG_ERR_KERN_SESS_FAIL;
- goto error;
+ goto error_create;
}
/* Code flow safety */
error:
trace_kernel_destroy_session(session->kernel_session);
session->kernel_session = NULL;
+error_create:
return ret;
}
{
int fd, ret;
struct lttng_userspace_probe_location *probe_location;
- const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
struct lttng_dynamic_buffer probe_location_buffer;
struct lttng_buffer_view buffer_view;
* Set the file descriptor received from the client through the unix
* socket in the probe location.
*/
- lookup = lttng_userspace_probe_location_get_lookup_method(probe_location);
- if (!lookup) {
- ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
- goto error;
- }
-
- /*
- * From the kernel tracer's perspective, all userspace probe event types
- * are all the same: a file and an offset.
- */
- switch (lttng_userspace_probe_location_lookup_method_get_type(lookup)) {
- case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
- ret = lttng_userspace_probe_location_function_set_binary_fd(
- probe_location, fd);
- break;
- case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT:
- ret = lttng_userspace_probe_location_tracepoint_set_binary_fd(
- probe_location, fd);
- break;
- default:
- ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
- goto error;
- }
-
+ ret = lttng_userspace_probe_location_set_binary_fd(probe_location, fd);
if (ret) {
ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
goto error;
* Return any error encountered or 0 for success.
*
* "sock" is only used for special-case var. len data.
+ * A command may assume the ownership of the socket, in which case its value
+ * should be set to -1.
*
* Should *NOT* be called with RCU read-side lock held.
*/
-static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
+static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
int *sock_error)
{
int ret = LTTNG_OK;
int need_tracing_session = 1;
int need_domain;
+ int need_consumerd = 1;
DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
*sock_error = 0;
switch (cmd_ctx->lsm->cmd_type) {
- case LTTNG_CREATE_SESSION:
- case LTTNG_CREATE_SESSION_SNAPSHOT:
- case LTTNG_CREATE_SESSION_LIVE:
+ case LTTNG_CREATE_SESSION_EXT:
case LTTNG_DESTROY_SESSION:
case LTTNG_LIST_SESSIONS:
case LTTNG_LIST_DOMAINS:
case LTTNG_SET_SESSION_SHM_PATH:
case LTTNG_REGENERATE_METADATA:
case LTTNG_REGENERATE_STATEDUMP:
- case LTTNG_REGISTER_TRIGGER:
- case LTTNG_UNREGISTER_TRIGGER:
case LTTNG_ROTATE_SESSION:
case LTTNG_ROTATION_GET_INFO:
case LTTNG_ROTATION_SET_SCHEDULE:
case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
+ case LTTNG_CLEAR_SESSION:
+ case LTTNG_LIST_TRIGGERS:
need_domain = 0;
break;
default:
need_domain = 1;
}
+ /* Needs a functioning consumerd */
+ switch (cmd_ctx->lsm->cmd_type) {
+ case LTTNG_REGISTER_TRIGGER:
+ case LTTNG_UNREGISTER_TRIGGER:
+ need_consumerd = 0;
+ break;
+ default:
+ need_consumerd = 1;
+ break;
+ }
+
if (config.no_kernel && need_domain
&& cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
if (!is_root) {
case LTTNG_LIST_CHANNELS:
case LTTNG_LIST_EVENTS:
case LTTNG_LIST_SYSCALLS:
- case LTTNG_LIST_TRACKER_PIDS:
+ case LTTNG_LIST_TRACKER_IDS:
case LTTNG_DATA_PENDING:
case LTTNG_ROTATE_SESSION:
case LTTNG_ROTATION_GET_INFO:
case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
+ case LTTNG_REGISTER_TRIGGER:
+ case LTTNG_LIST_TRIGGERS:
break;
default:
/* Setup lttng message with no payload */
/* Commands that DO NOT need a session. */
switch (cmd_ctx->lsm->cmd_type) {
- case LTTNG_CREATE_SESSION:
- case LTTNG_CREATE_SESSION_SNAPSHOT:
- case LTTNG_CREATE_SESSION_LIVE:
+ case LTTNG_CREATE_SESSION_EXT:
case LTTNG_LIST_SESSIONS:
case LTTNG_LIST_TRACEPOINTS:
case LTTNG_LIST_SYSCALLS:
case LTTNG_SAVE_SESSION:
case LTTNG_REGISTER_TRIGGER:
case LTTNG_UNREGISTER_TRIGGER:
+ case LTTNG_LIST_TRIGGERS:
need_tracing_session = 0;
break;
default:
goto error;
}
+ /* Kernel tracer check */
+ if (!kernel_tracer_is_initialized()) {
+ /* Basically, load kernel tracer modules */
+ ret = init_kernel_tracer();
+ if (ret != 0) {
+ goto error;
+ }
+ }
+
/* Consumer is in an ERROR state. Report back to client */
- if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
+ if (need_consumerd && uatomic_read(&kernel_consumerd_state) ==
+ CONSUMER_ERROR) {
ret = LTTNG_ERR_NO_KERNCONSUMERD;
goto error;
}
if (need_tracing_session) {
if (cmd_ctx->session->kernel_session == NULL) {
ret = create_kernel_session(cmd_ctx->session);
- if (ret < 0) {
+ if (ret != LTTNG_OK) {
ret = LTTNG_ERR_KERN_SESS_FAIL;
goto error;
}
case LTTNG_DOMAIN_JUL:
case LTTNG_DOMAIN_LOG4J:
case LTTNG_DOMAIN_PYTHON:
+ if (!agent_tracing_is_enabled()) {
+ ret = LTTNG_ERR_AGENT_TRACING_DISABLED;
+ goto error;
+ }
+ /* Fallthrough */
case LTTNG_DOMAIN_UST:
{
if (!ust_app_supported()) {
ret = LTTNG_ERR_NO_UST;
goto error;
}
+
/* Consumer is in an ERROR state. Report back to client */
- if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+ if (need_consumerd && uatomic_read(&ust_consumerd_state) ==
+ CONSUMER_ERROR) {
ret = LTTNG_ERR_NO_USTCONSUMERD;
goto error;
}
/* Create UST session if none exist. */
if (cmd_ctx->session->ust_session == NULL) {
ret = create_ust_session(cmd_ctx->session,
- &cmd_ctx->lsm->domain);
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->domain));
if (ret != LTTNG_OK) {
goto error;
}
cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name =
context_name;
- ret = lttcomm_recv_unix_sock(sock, provider_name,
+ ret = lttcomm_recv_unix_sock(*sock, provider_name,
provider_name_len);
if (ret < 0) {
goto error_add_context;
}
- ret = lttcomm_recv_unix_sock(sock, context_name,
+ ret = lttcomm_recv_unix_sock(*sock, context_name,
context_name_len);
if (ret < 0) {
goto error_add_context;
ret = cmd_add_context(cmd_ctx->session,
cmd_ctx->lsm->domain.type,
cmd_ctx->lsm->u.context.channel_name,
- &cmd_ctx->lsm->u.context.ctx,
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->u.context.ctx),
kernel_poll_pipe[1]);
cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name = NULL;
DBG("Discarding disable event command payload of size %zu", count);
while (count) {
- ret = lttcomm_recv_unix_sock(sock, data,
+ ret = lttcomm_recv_unix_sock(*sock, data,
count > sizeof(data) ? sizeof(data) : count);
if (ret < 0) {
goto error;
count -= (size_t) ret;
}
}
- /* FIXME: passing packed structure to non-packed pointer */
ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
cmd_ctx->lsm->u.disable.channel_name,
- &cmd_ctx->lsm->u.disable.event);
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->u.disable.event));
break;
}
case LTTNG_ENABLE_CHANNEL:
{
cmd_ctx->lsm->u.channel.chan.attr.extended.ptr =
(struct lttng_channel_extended *) &cmd_ctx->lsm->u.channel.extended;
- ret = cmd_enable_channel(cmd_ctx->session, &cmd_ctx->lsm->domain,
- &cmd_ctx->lsm->u.channel.chan,
+ ret = cmd_enable_channel(cmd_ctx->session,
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->domain),
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->u.channel.chan),
kernel_poll_pipe[1]);
break;
}
- case LTTNG_TRACK_PID:
+ case LTTNG_TRACK_ID:
{
- ret = cmd_track_pid(cmd_ctx->session,
- cmd_ctx->lsm->domain.type,
- cmd_ctx->lsm->u.pid_tracker.pid);
+ struct lttng_tracker_id *id = NULL;
+ enum lttng_tracker_id_status status;
+
+ id = lttng_tracker_id_create();
+ if (!id) {
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ switch (cmd_ctx->lsm->u.id_tracker.id_type) {
+ case LTTNG_ID_ALL:
+ status = lttng_tracker_id_set_all(id);
+ break;
+ case LTTNG_ID_VALUE:
+ status = lttng_tracker_id_set_value(
+ id, cmd_ctx->lsm->u.id_tracker.u.value);
+ break;
+ case LTTNG_ID_STRING:
+ {
+ const size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len;
+ char *string = NULL;
+
+ string = zmalloc(var_len);
+ if (!string) {
+ lttng_tracker_id_destroy(id);
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ DBG("Receiving var len tracker id string from client");
+ ret = lttcomm_recv_unix_sock(*sock, string, var_len);
+ if (ret <= 0) {
+ DBG("Nothing received");
+ *sock_error = 1;
+ free(string);
+ lttng_tracker_id_destroy(id);
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+ if (strnlen(string, var_len) != var_len - 1) {
+ DBG("String received as tracker ID is not NULL-terminated");
+ free(string);
+ lttng_tracker_id_destroy(id);
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ status = lttng_tracker_id_set_string(id, string);
+ free(string);
+ break;
+ }
+ default:
+ lttng_tracker_id_destroy(id);
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+ ERR("Invalid value for tracker id");
+ ret = LTTNG_ERR_INVALID;
+ lttng_tracker_id_destroy(id);
+ goto error;
+ }
+
+ ret = cmd_track_id(cmd_ctx->session,
+ cmd_ctx->lsm->u.id_tracker.tracker_type,
+ cmd_ctx->lsm->domain.type, id);
+ lttng_tracker_id_destroy(id);
break;
}
- case LTTNG_UNTRACK_PID:
+ case LTTNG_UNTRACK_ID:
{
- ret = cmd_untrack_pid(cmd_ctx->session,
- cmd_ctx->lsm->domain.type,
- cmd_ctx->lsm->u.pid_tracker.pid);
+ struct lttng_tracker_id *id = NULL;
+ enum lttng_tracker_id_status status;
+
+ id = lttng_tracker_id_create();
+
+ switch (cmd_ctx->lsm->u.id_tracker.id_type) {
+ case LTTNG_ID_ALL:
+ status = lttng_tracker_id_set_all(id);
+ break;
+ case LTTNG_ID_VALUE:
+ status = lttng_tracker_id_set_value(
+ id, cmd_ctx->lsm->u.id_tracker.u.value);
+ break;
+ case LTTNG_ID_STRING:
+ {
+ const size_t var_len = cmd_ctx->lsm->u.id_tracker.u.var_len;
+ char *string = NULL;
+
+ string = zmalloc(var_len);
+ if (!string) {
+ ret = LTTNG_ERR_NOMEM;
+ lttng_tracker_id_destroy(id);
+ goto error;
+ }
+ DBG("Receiving var len tracker id string from client");
+ ret = lttcomm_recv_unix_sock(*sock, string, var_len);
+ if (ret <= 0) {
+ DBG("Nothing received");
+ *sock_error = 1;
+ lttng_tracker_id_destroy(id);
+ free(string);
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+ if (strnlen(string, var_len) != var_len - 1) {
+ DBG("String received as tracker ID is not NULL-terminated");
+ lttng_tracker_id_destroy(id);
+ free(string);
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+ status = lttng_tracker_id_set_string(id, string);
+ free(string);
+ break;
+ }
+ default:
+ lttng_tracker_id_destroy(id);
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+ ERR("Invalid tracker id");
+ lttng_tracker_id_destroy(id);
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ ret = cmd_untrack_id(cmd_ctx->session,
+ cmd_ctx->lsm->u.id_tracker.tracker_type,
+ cmd_ctx->lsm->domain.type, id);
+ lttng_tracker_id_destroy(id);
break;
}
case LTTNG_ENABLE_EVENT:
DBG("Receiving var len exclusion event list from client ...");
exclusion->count = count;
- ret = lttcomm_recv_unix_sock(sock, exclusion->names,
+ ret = lttcomm_recv_unix_sock(*sock, exclusion->names,
count * LTTNG_SYMBOL_NAME_LEN);
if (ret <= 0) {
DBG("Nothing recv() from client var len data... continuing");
/* Receive var. len. data */
DBG("Receiving var len filter's expression from client ...");
- ret = lttcomm_recv_unix_sock(sock, filter_expression,
+ ret = lttcomm_recv_unix_sock(*sock, filter_expression,
expression_len);
if (ret <= 0) {
DBG("Nothing recv() from client var len data... continuing");
/* Receive var. len. data */
DBG("Receiving var len filter's bytecode from client ...");
- ret = lttcomm_recv_unix_sock(sock, bytecode, bytecode_len);
+ ret = lttcomm_recv_unix_sock(*sock, bytecode, bytecode_len);
if (ret <= 0) {
DBG("Nothing recv() from client var len data... continuing");
*sock_error = 1;
}
}
- ev = lttng_event_copy(&cmd_ctx->lsm->u.enable.event);
+ ev = lttng_event_copy(ALIGNED_CONST_PTR(cmd_ctx->lsm->u.enable.event));
if (!ev) {
DBG("Failed to copy event: %s",
cmd_ctx->lsm->u.enable.event.name);
if (cmd_ctx->lsm->u.enable.userspace_probe_location_len > 0) {
/* Expect a userspace probe description. */
- ret = receive_userspace_probe(cmd_ctx, sock, sock_error, ev);
+ ret = receive_userspace_probe(cmd_ctx, *sock, sock_error, ev);
if (ret) {
free(filter_expression);
free(bytecode);
}
}
- ret = cmd_enable_event(cmd_ctx->session, &cmd_ctx->lsm->domain,
+ ret = cmd_enable_event(cmd_ctx->session,
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->domain),
cmd_ctx->lsm->u.enable.channel_name,
ev,
filter_expression, bytecode, exclusion,
ret = LTTNG_OK;
break;
}
- case LTTNG_LIST_TRACKER_PIDS:
+ case LTTNG_LIST_TRACKER_IDS:
{
- 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;
+ struct lttcomm_tracker_command_header cmd_header;
+ struct lttng_tracker_ids *ids = NULL;
+ enum lttng_tracker_id_status status;
+ unsigned int nr_ids;
+ struct lttng_dynamic_buffer buf;
+
+ ret = cmd_list_tracker_ids(
+ cmd_ctx->lsm->u.id_tracker.tracker_type,
+ cmd_ctx->session, cmd_ctx->lsm->domain.type,
+ &ids);
+ if (ret != LTTNG_OK) {
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_no_cmd_header(cmd_ctx, pids,
- sizeof(int32_t) * nr_pids);
- free(pids);
+ lttng_dynamic_buffer_init(&buf);
+
+ status = lttng_tracker_ids_get_count(ids, &nr_ids);
+ if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error_list_tracker;
+ }
+
+ cmd_header.nb_tracker_id = nr_ids;
+ ret = lttng_tracker_ids_serialize(ids, &buf);
if (ret < 0) {
- goto setup_error;
+ goto error_list_tracker;
+ }
+
+ ret = setup_lttng_msg(cmd_ctx, buf.data, buf.size, &cmd_header,
+ sizeof(cmd_header));
+ error_list_tracker:
+ lttng_tracker_ids_destroy(ids);
+ lttng_dynamic_buffer_reset(&buf);
+ if (ret < 0) {
+ goto error;
}
ret = LTTNG_OK;
/* Receive variable len data */
DBG("Receiving %zu URI(s) from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
+ ret = lttcomm_recv_unix_sock(*sock, uris, len);
if (ret <= 0) {
DBG("No URIs received from client... continuing");
*sock_error = 1;
ret = cmd_stop_trace(cmd_ctx->session);
break;
}
- case LTTNG_CREATE_SESSION:
- {
- size_t nb_uri, len;
- struct lttng_uri *uris = NULL;
-
- nb_uri = cmd_ctx->lsm->u.uri.size;
- len = nb_uri * sizeof(struct lttng_uri);
-
- if (nb_uri > 0) {
- uris = zmalloc(len);
- if (uris == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
-
- /* Receive variable len data */
- DBG("Waiting for %zu URIs from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
- if (ret <= 0) {
- DBG("No URIs received from client... continuing");
- *sock_error = 1;
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
-
- if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
- DBG("Creating session with ONE network URI is a bad call");
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
- }
-
- ret = cmd_create_session_uri(cmd_ctx->lsm->session.name, uris, nb_uri,
- &cmd_ctx->creds, 0);
-
- free(uris);
-
- break;
- }
case LTTNG_DESTROY_SESSION:
{
ret = cmd_destroy_session(cmd_ctx->session,
- notification_thread_handle);
+ notification_thread_handle,
+ sock);
break;
}
case LTTNG_LIST_DOMAINS:
nr_sessions = lttng_sessions_count(
LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
- payload_len = sizeof(struct lttng_session) * nr_sessions;
+
+ payload_len = (sizeof(struct lttng_session) * nr_sessions) +
+ (sizeof(struct lttng_session_extended) * nr_sessions);
sessions_payload = zmalloc(payload_len);
if (!sessions_payload) {
goto setup_error;
}
- cmd_list_lttng_sessions(sessions_payload,
+ cmd_list_lttng_sessions(sessions_payload, nr_sessions,
LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
session_unlock_list();
}
case LTTNG_SNAPSHOT_ADD_OUTPUT:
{
+ uint32_t snapshot_id;
struct lttcomm_lttng_output_id reply;
ret = cmd_snapshot_add_output(cmd_ctx->session,
- &cmd_ctx->lsm->u.snapshot_output.output, &reply.id);
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_output.output),
+ &snapshot_id);
if (ret != LTTNG_OK) {
goto error;
}
+ reply.id = snapshot_id;
ret = setup_lttng_msg_no_cmd_header(cmd_ctx, &reply,
sizeof(reply));
case LTTNG_SNAPSHOT_DEL_OUTPUT:
{
ret = cmd_snapshot_del_output(cmd_ctx->session,
- &cmd_ctx->lsm->u.snapshot_output.output);
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_output.output));
break;
}
case LTTNG_SNAPSHOT_LIST_OUTPUT:
case LTTNG_SNAPSHOT_RECORD:
{
ret = cmd_snapshot_record(cmd_ctx->session,
- &cmd_ctx->lsm->u.snapshot_record.output,
+ ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_record.output),
cmd_ctx->lsm->u.snapshot_record.wait);
break;
}
- case LTTNG_CREATE_SESSION_SNAPSHOT:
+ case LTTNG_CREATE_SESSION_EXT:
{
- size_t nb_uri, len;
- struct lttng_uri *uris = NULL;
-
- nb_uri = cmd_ctx->lsm->u.uri.size;
- len = nb_uri * sizeof(struct lttng_uri);
-
- if (nb_uri > 0) {
- uris = zmalloc(len);
- if (uris == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
+ struct lttng_dynamic_buffer payload;
+ struct lttng_session_descriptor *return_descriptor = NULL;
- /* Receive variable len data */
- DBG("Waiting for %zu URIs from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
- if (ret <= 0) {
- DBG("No URIs received from client... continuing");
- *sock_error = 1;
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
-
- if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
- DBG("Creating session with ONE network URI is a bad call");
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
+ lttng_dynamic_buffer_init(&payload);
+ ret = cmd_create_session(cmd_ctx, *sock, &return_descriptor);
+ if (ret != LTTNG_OK) {
+ goto error;
}
- ret = cmd_create_session_snapshot(cmd_ctx->lsm->session.name, uris,
- nb_uri, &cmd_ctx->creds);
- free(uris);
- break;
- }
- case LTTNG_CREATE_SESSION_LIVE:
- {
- size_t nb_uri, len;
- struct lttng_uri *uris = NULL;
-
- nb_uri = cmd_ctx->lsm->u.uri.size;
- len = nb_uri * sizeof(struct lttng_uri);
-
- if (nb_uri > 0) {
- uris = zmalloc(len);
- if (uris == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
-
- /* Receive variable len data */
- DBG("Waiting for %zu URIs from client ...", nb_uri);
- ret = lttcomm_recv_unix_sock(sock, uris, len);
- if (ret <= 0) {
- DBG("No URIs received from client... continuing");
- *sock_error = 1;
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
-
- if (nb_uri == 1 && uris[0].dtype != LTTNG_DST_PATH) {
- DBG("Creating session with ONE network URI is a bad call");
- ret = LTTNG_ERR_SESSION_FAIL;
- free(uris);
- goto error;
- }
+ ret = lttng_session_descriptor_serialize(return_descriptor,
+ &payload);
+ if (ret) {
+ ERR("Failed to serialize session descriptor in reply to \"create session\" command");
+ lttng_session_descriptor_destroy(return_descriptor);
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
}
-
- ret = cmd_create_session_uri(cmd_ctx->lsm->session.name, uris,
- nb_uri, &cmd_ctx->creds, cmd_ctx->lsm->u.session_live.timer_interval);
- free(uris);
+ ret = setup_lttng_msg_no_cmd_header(cmd_ctx, payload.data,
+ payload.size);
+ if (ret) {
+ lttng_session_descriptor_destroy(return_descriptor);
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ lttng_dynamic_buffer_reset(&payload);
+ lttng_session_descriptor_destroy(return_descriptor);
+ ret = LTTNG_OK;
break;
}
case LTTNG_SAVE_SESSION:
}
case LTTNG_REGISTER_TRIGGER:
{
- ret = cmd_register_trigger(cmd_ctx, sock,
- notification_thread_handle);
+ struct lttng_dynamic_buffer payload;
+ struct lttng_trigger *return_trigger;
+
+ lttng_dynamic_buffer_init(&payload);
+ ret = cmd_register_trigger(cmd_ctx, *sock,
+ notification_thread_handle, &return_trigger);
+ if (ret != LTTNG_OK) {
+ goto error;
+ }
+
+ ret = lttng_trigger_serialize(return_trigger, &payload, NULL);
+ if (ret) {
+ ERR("Failed to serialize trigger in reply to \"register trigger\" command");
+ ret = LTTNG_ERR_NOMEM;
+ lttng_trigger_destroy(return_trigger);
+ goto error;
+ }
+ ret = setup_lttng_msg_no_cmd_header(cmd_ctx, payload.data,
+ payload.size);
+ if (ret) {
+ lttng_trigger_destroy(return_trigger);
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ lttng_trigger_destroy(return_trigger);
+ lttng_dynamic_buffer_reset(&payload);
+ ret = LTTNG_OK;
break;
}
case LTTNG_UNREGISTER_TRIGGER:
{
- ret = cmd_unregister_trigger(cmd_ctx, sock,
+ ret = cmd_unregister_trigger(cmd_ctx, *sock,
notification_thread_handle);
break;
}
goto error;
}
- ret = cmd_rotate_session(cmd_ctx->session, &rotate_return);
+ ret = cmd_rotate_session(cmd_ctx->session, &rotate_return,
+ false,
+ LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
if (ret < 0) {
ret = -ret;
goto error;
ret = LTTNG_OK;
break;
}
+ case LTTNG_CLEAR_SESSION:
+ {
+ ret = cmd_clear_session(cmd_ctx->session, sock);
+ break;
+ }
+ case LTTNG_LIST_TRIGGERS:
+ {
+ struct lttng_dynamic_buffer payload;
+ struct lttng_triggers *return_triggers;
+
+ lttng_dynamic_buffer_init(&payload);
+ ret = cmd_list_triggers(cmd_ctx, *sock,
+ notification_thread_handle, &return_triggers);
+ if (ret != LTTNG_OK) {
+ goto error;
+ }
+
+ ret = lttng_triggers_serialize(return_triggers, &payload);
+ if (ret) {
+ ERR("Failed to serialize triggers in reply to \"list triggers\" command");
+ ret = LTTNG_ERR_NOMEM;
+ lttng_triggers_destroy(return_triggers);
+ goto error;
+ }
+ ret = setup_lttng_msg_no_cmd_header(cmd_ctx, payload.data,
+ payload.size);
+ if (ret) {
+ ret = LTTNG_ERR_NOMEM;
+ lttng_triggers_destroy(return_triggers);
+ goto error;
+ }
+ lttng_dynamic_buffer_reset(&payload);
+ lttng_triggers_destroy(return_triggers);
+ ret = LTTNG_OK;
+ break;
+ }
default:
ret = LTTNG_ERR_UND;
break;
if (cmd_ctx->session) {
session_unlock(cmd_ctx->session);
session_put(cmd_ctx->session);
+ cmd_ctx->session = NULL;
}
if (need_tracing_session) {
session_unlock_list();
/* File permission MUST be 660 */
ret = chmod(config.client_unix_sock_path.value, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (ret < 0) {
- ERR("Set file permissions failed: %s", config.client_unix_sock_path.value);
+ ERR("Set file permissions failed: %s",
+ config.client_unix_sock_path.value);
PERROR("chmod");
+ (void) lttcomm_close_unix_sock(client_sock);
+ ret = -1;
goto end;
}
DBG("Created client socket (fd = %i)", client_sock);
uint32_t revents, nb_fd;
struct command_ctx *cmd_ctx = NULL;
struct lttng_poll_event events;
- int client_sock = -1;
+ const int client_sock = thread_state.client_sock;
struct lttng_pipe *quit_pipe = data;
const int thread_quit_pipe_fd = lttng_pipe_get_readfd(quit_pipe);
is_root = (getuid() == 0);
pthread_cleanup_push(thread_init_cleanup, NULL);
- client_sock = create_client_sock();
- if (client_sock < 0) {
- goto error_listen;
- }
rcu_register_thread();
health_code_update();
- if (!revents) {
- /* No activity for this FD (poll implementation). */
- continue;
- }
-
if (pollfd == thread_quit_pipe_fd) {
err = 0;
goto exit;
* informations for the client. The command context struct contains
* everything this function may needs.
*/
- ret = process_client_msg(cmd_ctx, sock, &sock_error);
+ ret = process_client_msg(cmd_ctx, &sock, &sock_error);
rcu_thread_offline();
if (ret < 0) {
- ret = close(sock);
- if (ret) {
- PERROR("close");
- }
- sock = -1;
+ if (sock >= 0) {
+ ret = close(sock);
+ if (ret) {
+ PERROR("close");
+ }
+ }
+ sock = -1;
/*
* TODO: Inform client somehow of the fatal error. At
* this point, ret < 0 means that a zmalloc failed
health_code_update();
- DBG("Sending response (size: %d, retcode: %s (%d))",
- cmd_ctx->lttng_msg_size,
- lttng_strerror(-cmd_ctx->llm->ret_code),
- cmd_ctx->llm->ret_code);
- ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size);
- if (ret < 0) {
- ERR("Failed to send data back to client");
- }
+ if (sock >= 0) {
+ DBG("Sending response (size: %d, retcode: %s (%d))",
+ cmd_ctx->lttng_msg_size,
+ lttng_strerror(-cmd_ctx->llm->ret_code),
+ cmd_ctx->llm->ret_code);
+ ret = send_unix_sock(sock, cmd_ctx->llm,
+ cmd_ctx->lttng_msg_size);
+ if (ret < 0) {
+ ERR("Failed to send data back to client");
+ }
- /* End of transmission */
- ret = close(sock);
- if (ret) {
- PERROR("close");
- }
- sock = -1;
+ /* End of transmission */
+ ret = close(sock);
+ if (ret) {
+ PERROR("close");
+ }
+ }
+ sock = -1;
clean_command_ctx(&cmd_ctx);
error_listen:
error_create_poll:
unlink(config.client_unix_sock_path.value);
- if (client_sock >= 0) {
- ret = close(client_sock);
- if (ret) {
- PERROR("close");
- }
+ ret = close(client_sock);
+ if (ret) {
+ PERROR("close");
}
if (err) {
{
bool thread_running;
struct lttng_pipe *client_quit_pipe;
- struct lttng_thread *thread;
+ struct lttng_thread *thread = NULL;
+ int client_sock_fd = -1;
sem_init(&thread_state.ready, 0, 0);
client_quit_pipe = lttng_pipe_open(FD_CLOEXEC);
goto error;
}
+ client_sock_fd = create_client_sock();
+ if (client_sock_fd < 0) {
+ goto error;
+ }
+
+ thread_state.client_sock = client_sock_fd;
thread = lttng_thread_create("Client management",
thread_manage_clients,
shutdown_client_thread,
if (!thread) {
goto error;
}
+ /* The client thread now owns the client sock fd and the quit pipe. */
+ client_sock_fd = -1;
+ client_quit_pipe = NULL;
/*
* This thread is part of the threads that need to be fully
*/
thread_running = wait_thread_status();
if (!thread_running) {
- lttng_thread_put(thread);
- thread = NULL;
+ goto error;
}
return thread;
error:
+ if (client_sock_fd >= 0) {
+ if (close(client_sock_fd)) {
+ PERROR("Failed to close client socket");
+ }
+ }
+ lttng_thread_put(thread);
cleanup_client_thread(client_quit_pipe);
return NULL;
}
projects / lttng-tools.git / blobdiff