#include <lttng/channel-internal.h>
#include <lttng/rotate-internal.h>
#include <lttng/location-internal.h>
+#include <lttng/session-internal.h>
#include <lttng/userspace-probe-internal.h>
+#include <lttng/session-descriptor-internal.h>
#include <common/string-utils/string-utils.h>
#include "channel.h"
* Add URI so the consumer output object. Set the correct path depending on the
* domain adding the default trace directory.
*/
-static int add_uri_to_consumer(struct consumer_output *consumer,
- struct lttng_uri *uri, enum lttng_domain_type domain,
- const char *session_name)
+static enum lttng_error_code add_uri_to_consumer(
+ const struct ltt_session *session,
+ struct consumer_output *consumer,
+ struct lttng_uri *uri, enum lttng_domain_type domain)
{
- int ret = LTTNG_OK;
- const char *default_trace_dir;
+ int ret;
+ enum lttng_error_code ret_code = LTTNG_OK;
assert(uri);
if (consumer == NULL) {
DBG("No consumer detected. Don't add URI. Stopping.");
- ret = LTTNG_ERR_NO_CONSUMER;
+ ret_code = LTTNG_ERR_NO_CONSUMER;
goto error;
}
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
- default_trace_dir = DEFAULT_KERNEL_TRACE_DIR;
+ ret = lttng_strncpy(consumer->domain_subdir,
+ DEFAULT_KERNEL_TRACE_DIR,
+ sizeof(consumer->domain_subdir));
break;
case LTTNG_DOMAIN_UST:
- default_trace_dir = DEFAULT_UST_TRACE_DIR;
+ ret = lttng_strncpy(consumer->domain_subdir,
+ DEFAULT_UST_TRACE_DIR,
+ sizeof(consumer->domain_subdir));
break;
default:
/*
- * This case is possible is we try to add the URI to the global tracing
- * session consumer object which in this case there is no subdir.
+ * This case is possible is we try to add the URI to the global
+ * tracing session consumer object which in this case there is
+ * no subdir.
*/
- default_trace_dir = "";
+ memset(consumer->domain_subdir, 0,
+ sizeof(consumer->domain_subdir));
+ ret = 0;
+ }
+ if (ret) {
+ ERR("Failed to initialize consumer output domain subdirectory");
+ ret_code = LTTNG_ERR_FATAL;
+ goto error;
}
switch (uri->dtype) {
consumer->dst.net.control_isset) ||
(uri->stype == LTTNG_STREAM_DATA &&
consumer->dst.net.data_isset)) {
- ret = LTTNG_ERR_URL_EXIST;
+ ret_code = LTTNG_ERR_URL_EXIST;
goto error;
}
} else {
- memset(&consumer->dst.net, 0, sizeof(consumer->dst.net));
+ memset(&consumer->dst, 0, sizeof(consumer->dst));
}
- consumer->type = CONSUMER_DST_NET;
-
/* Set URI into consumer output object */
- ret = consumer_set_network_uri(consumer, uri);
+ ret = consumer_set_network_uri(session, consumer, uri);
if (ret < 0) {
- ret = -ret;
+ ret_code = -ret;
goto error;
} else if (ret == 1) {
/*
* URI was the same in the consumer so we do not append the subdir
* again so to not duplicate output dir.
*/
- ret = LTTNG_OK;
+ ret_code = LTTNG_OK;
goto error;
}
-
- if (uri->stype == LTTNG_STREAM_CONTROL && strlen(uri->subdir) == 0) {
- ret = consumer_set_subdir(consumer, session_name);
- if (ret < 0) {
- ret = LTTNG_ERR_FATAL;
- goto error;
- }
- }
-
- if (uri->stype == LTTNG_STREAM_CONTROL) {
- /* On a new subdir, reappend the default trace dir. */
- strncat(consumer->subdir, default_trace_dir,
- sizeof(consumer->subdir) - strlen(consumer->subdir) - 1);
- DBG3("Append domain trace name to subdir %s", consumer->subdir);
- }
-
break;
case LTTNG_DST_PATH:
- DBG2("Setting trace directory path from URI to %s", uri->dst.path);
- memset(consumer->dst.session_root_path, 0,
- sizeof(consumer->dst.session_root_path));
- /* Explicit length checks for strcpy and strcat. */
- if (strlen(uri->dst.path) + strlen(default_trace_dir)
- >= sizeof(consumer->dst.session_root_path)) {
- ret = LTTNG_ERR_FATAL;
+ if (*uri->dst.path != '/' || strstr(uri->dst.path, "../")) {
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
- strcpy(consumer->dst.session_root_path, uri->dst.path);
- /* Append default trace dir */
- strcat(consumer->dst.session_root_path, default_trace_dir);
- /* Flag consumer as local. */
+ DBG2("Setting trace directory path from URI to %s",
+ uri->dst.path);
+ memset(&consumer->dst, 0, sizeof(consumer->dst));
+
+ ret = lttng_strncpy(consumer->dst.session_root_path,
+ uri->dst.path,
+ sizeof(consumer->dst.session_root_path));
consumer->type = CONSUMER_DST_LOCAL;
break;
}
- ret = LTTNG_OK;
-
+ ret_code = LTTNG_OK;
error:
- return ret;
+ return ret_code;
}
/*
* Create a socket to the relayd using the URI.
*
* On success, the relayd_sock pointer is set to the created socket.
- * Else, it's stays untouched and a lttcomm error code is returned.
+ * Else, it remains untouched and an LTTng error code is returned.
*/
-static int create_connect_relayd(struct lttng_uri *uri,
+static enum lttng_error_code create_connect_relayd(struct lttng_uri *uri,
struct lttcomm_relayd_sock **relayd_sock,
struct consumer_output *consumer)
{
int ret;
+ enum lttng_error_code status = LTTNG_OK;
struct lttcomm_relayd_sock *rsock;
rsock = lttcomm_alloc_relayd_sock(uri, RELAYD_VERSION_COMM_MAJOR,
RELAYD_VERSION_COMM_MINOR);
if (!rsock) {
- ret = LTTNG_ERR_FATAL;
+ status = LTTNG_ERR_FATAL;
goto error;
}
health_poll_exit();
if (ret < 0) {
ERR("Unable to reach lttng-relayd");
- ret = LTTNG_ERR_RELAYD_CONNECT_FAIL;
+ status = LTTNG_ERR_RELAYD_CONNECT_FAIL;
goto free_sock;
}
/* Check relayd version */
ret = relayd_version_check(rsock);
if (ret == LTTNG_ERR_RELAYD_VERSION_FAIL) {
+ status = LTTNG_ERR_RELAYD_VERSION_FAIL;
goto close_sock;
} else if (ret < 0) {
ERR("Unable to reach lttng-relayd");
- ret = LTTNG_ERR_RELAYD_CONNECT_FAIL;
+ status = LTTNG_ERR_RELAYD_CONNECT_FAIL;
goto close_sock;
}
consumer->relay_major_version = rsock->major;
} else {
/* Command is not valid */
ERR("Relayd invalid stream type: %d", uri->stype);
- ret = LTTNG_ERR_INVALID;
+ status = LTTNG_ERR_INVALID;
goto close_sock;
}
*relayd_sock = rsock;
- return LTTNG_OK;
+ return status;
close_sock:
/* The returned value is not useful since we are on an error path. */
free_sock:
free(rsock);
error:
- return ret;
+ return status;
}
/*
* Connect to the relayd using URI and send the socket to the right consumer.
*
* The consumer socket lock must be held by the caller.
+ *
+ * Returns LTTNG_OK on success or an LTTng error code on failure.
*/
-static int send_consumer_relayd_socket(unsigned int session_id,
+static enum lttng_error_code send_consumer_relayd_socket(
+ unsigned int session_id,
struct lttng_uri *relayd_uri,
struct consumer_output *consumer,
struct consumer_socket *consumer_sock,
{
int ret;
struct lttcomm_relayd_sock *rsock = NULL;
+ enum lttng_error_code status;
/* Connect to relayd and make version check if uri is the control. */
- ret = create_connect_relayd(relayd_uri, &rsock, consumer);
- if (ret != LTTNG_OK) {
+ status = create_connect_relayd(relayd_uri, &rsock, consumer);
+ if (status != LTTNG_OK) {
goto relayd_comm_error;
}
assert(rsock);
relayd_uri->stype, session_id,
session_name, hostname, session_live_timer);
if (ret < 0) {
- ret = LTTNG_ERR_ENABLE_CONSUMER_FAIL;
+ status = LTTNG_ERR_ENABLE_CONSUMER_FAIL;
goto close_sock;
}
consumer_sock->data_sock_sent = 1;
}
- ret = LTTNG_OK;
-
/*
* Close socket which was dup on the consumer side. The session daemon does
* NOT keep track of the relayd socket(s) once transfer to the consumer.
*/
close_sock:
- if (ret != LTTNG_OK) {
+ if (status != LTTNG_OK) {
/*
* The consumer output for this session should not be used anymore
* since the relayd connection failed thus making any tracing or/and
free(rsock);
relayd_comm_error:
- return ret;
+ return status;
}
/*
* session.
*
* The consumer socket lock must be held by the caller.
+ *
+ * Returns LTTNG_OK, or an LTTng error code on failure.
*/
-static int send_consumer_relayd_sockets(enum lttng_domain_type domain,
+static enum lttng_error_code send_consumer_relayd_sockets(
+ enum lttng_domain_type domain,
unsigned int session_id, struct consumer_output *consumer,
struct consumer_socket *sock, char *session_name,
char *hostname, int session_live_timer)
{
- int ret = LTTNG_OK;
+ enum lttng_error_code status = LTTNG_OK;
assert(consumer);
assert(sock);
/* Sending control relayd socket. */
if (!sock->control_sock_sent) {
- ret = send_consumer_relayd_socket(session_id,
+ status = send_consumer_relayd_socket(session_id,
&consumer->dst.net.control, consumer, sock,
session_name, hostname, session_live_timer);
- if (ret != LTTNG_OK) {
+ if (status != LTTNG_OK) {
goto error;
}
}
/* Sending data relayd socket. */
if (!sock->data_sock_sent) {
- ret = send_consumer_relayd_socket(session_id,
+ status = send_consumer_relayd_socket(session_id,
&consumer->dst.net.data, consumer, sock,
session_name, hostname, session_live_timer);
- if (ret != LTTNG_OK) {
+ if (status != LTTNG_OK) {
goto error;
}
}
error:
- return ret;
+ return status;
}
/*
kchan = trace_kernel_get_channel_by_name(attr->name,
session->kernel_session);
if (kchan == NULL) {
+ if (session->snapshot.nb_output > 0 ||
+ session->snapshot_mode) {
+ /* Enforce mmap output for snapshot sessions. */
+ attr->attr.output = LTTNG_EVENT_MMAP;
+ }
ret = channel_kernel_create(session->kernel_session, attr, wpipe);
if (attr->name[0] != '\0') {
session->kernel_session->has_non_default_channel = 1;
goto error;
}
+ if (ret == LTTNG_OK && attr->attr.output != LTTNG_EVENT_MMAP) {
+ session->has_non_mmap_channel = true;
+ }
error:
rcu_read_unlock();
end:
struct consumer_socket *socket;
struct lttng_ht_iter iter;
int ret;
- char *path = NULL;
+ char path[LTTNG_PATH_MAX];
if (!output || !output->socks) {
ERR("No consumer output found");
goto end;
}
- path = zmalloc(LTTNG_PATH_MAX * sizeof(char));
- if (!path) {
- ERR("Cannot allocate mkdir path");
- ret = -1;
- goto end;
- }
-
- ret = snprintf(path, LTTNG_PATH_MAX, "%s%s%s",
+ ret = snprintf(path, sizeof(path), "%s/%s%s",
session_get_base_path(session),
- output->chunk_path, output->subdir);
+ output->chunk_path,
+ output->domain_subdir);
if (ret < 0 || ret >= LTTNG_PATH_MAX) {
- ERR("Format path");
+ ERR("Failed to format path new chunk domain path");
ret = -1;
goto end;
}
ret = consumer_mkdir(socket, session->id, output, path, uid, gid);
pthread_mutex_unlock(socket->lock);
if (ret) {
- ERR("Consumer mkdir");
+ ERR("Failed to create directory at \"%s\"", path);
ret = -1;
goto end_unlock;
}
end_unlock:
rcu_read_unlock();
end:
- free(path);
return ret;
}
/* Flag session that trace should start automatically */
if (usess) {
- /*
- * Even though the start trace might fail, flag this session active so
- * other application coming in are started by default.
- */
- usess->active = 1;
-
ret = ust_app_start_trace_all(usess);
if (ret < 0) {
ret = LTTNG_ERR_UST_START_FAIL;
struct ltt_kernel_channel *kchan;
struct ltt_kernel_session *ksession;
struct ltt_ust_session *usess;
- bool error_occured = false;
+ bool error_occurred = false;
assert(session);
goto error;
}
- if (session->rotation_schedule_timer_enabled) {
- if (timer_session_rotation_schedule_timer_stop(
- session)) {
- ERR("Failed to stop the \"rotation schedule\" timer of session %s",
- session->name);
- }
- }
-
- /*
- * A rotation is still ongoing. The check timer will continue to wait
- * for the rotation to complete. When the rotation finally completes,
- * a check will be performed to rename the "active" chunk to the
- * expected "timestamp_begin-timestamp_end" format.
- */
- if (session->current_archive_id > 0 &&
- session->rotation_state != LTTNG_ROTATION_STATE_ONGOING) {
- ret = rename_active_chunk(session);
- if (ret) {
- /*
- * This error should not prevent the user from stopping
- * the session. However, it will be reported at the end.
- */
- error_occured = true;
- }
- }
-
/* Kernel tracer */
if (ksession && ksession->active) {
DBG("Stop kernel tracing");
}
if (usess && usess->active) {
- /*
- * Even though the stop trace might fail, flag this session inactive so
- * other application coming in are not started by default.
- */
- usess->active = 0;
-
ret = ust_app_stop_trace_all(usess);
if (ret < 0) {
ret = LTTNG_ERR_UST_STOP_FAIL;
/* Flag inactive after a successful stop. */
session->active = 0;
- ret = !error_occured ? LTTNG_OK : LTTNG_ERR_UNK;
+ ret = !error_occurred ? LTTNG_OK : LTTNG_ERR_UNK;
error:
return ret;
/* Set the "global" consumer URIs */
for (i = 0; i < nb_uri; i++) {
- ret = add_uri_to_consumer(session->consumer,
- &uris[i], 0, session->name);
+ ret = add_uri_to_consumer(session,
+ session->consumer,
+ &uris[i], LTTNG_DOMAIN_NONE);
if (ret != LTTNG_OK) {
goto error;
}
/* Set UST session URIs */
if (session->ust_session) {
for (i = 0; i < nb_uri; i++) {
- ret = add_uri_to_consumer(
+ ret = add_uri_to_consumer(session,
session->ust_session->consumer,
- &uris[i], LTTNG_DOMAIN_UST,
- session->name);
+ &uris[i], LTTNG_DOMAIN_UST);
if (ret != LTTNG_OK) {
goto error;
}
/* Set kernel session URIs */
if (session->kernel_session) {
for (i = 0; i < nb_uri; i++) {
- ret = add_uri_to_consumer(
+ ret = add_uri_to_consumer(session,
session->kernel_session->consumer,
- &uris[i], LTTNG_DOMAIN_KERNEL,
- session->name);
+ &uris[i], LTTNG_DOMAIN_KERNEL);
if (ret != LTTNG_OK) {
goto error;
}
return ret;
}
-/*
- * Command LTTNG_CREATE_SESSION processed by the client thread.
- */
-int cmd_create_session_uri(char *name, struct lttng_uri *uris,
- size_t nb_uri, lttng_sock_cred *creds, unsigned int live_timer)
+static
+enum lttng_error_code set_session_output_from_descriptor(
+ struct ltt_session *session,
+ const struct lttng_session_descriptor *descriptor)
{
int ret;
- struct ltt_session *session;
+ enum lttng_error_code ret_code = LTTNG_OK;
+ enum lttng_session_descriptor_type session_type =
+ lttng_session_descriptor_get_type(descriptor);
+ enum lttng_session_descriptor_output_type output_type =
+ lttng_session_descriptor_get_output_type(descriptor);
+ struct lttng_uri uris[2] = {};
+ size_t uri_count = 0;
+
+ switch (output_type) {
+ case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NONE:
+ goto end;
+ case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_LOCAL:
+ lttng_session_descriptor_get_local_output_uri(descriptor,
+ &uris[0]);
+ uri_count = 1;
+ break;
+ case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NETWORK:
+ lttng_session_descriptor_get_network_output_uris(descriptor,
+ &uris[0], &uris[1]);
+ uri_count = 2;
+ break;
+ default:
+ ret_code = LTTNG_ERR_INVALID;
+ goto end;
+ }
+
+ switch (session_type) {
+ case LTTNG_SESSION_DESCRIPTOR_TYPE_SNAPSHOT:
+ {
+ struct snapshot_output *new_output = NULL;
- assert(name);
- assert(creds);
+ new_output = snapshot_output_alloc();
+ if (!new_output) {
+ ret_code = LTTNG_ERR_NOMEM;
+ goto end;
+ }
- /*
- * Verify if the session already exist
- *
- * XXX: There is no need for the session lock list here since the caller
- * (process_client_msg) is holding it. We might want to change that so a
- * single command does not lock the entire session list.
- */
- session = session_find_by_name(name);
- if (session != NULL) {
- ret = LTTNG_ERR_EXIST_SESS;
- goto find_error;
+ ret = snapshot_output_init_with_uri(session,
+ DEFAULT_SNAPSHOT_MAX_SIZE,
+ NULL, uris, uri_count, session->consumer,
+ new_output, &session->snapshot);
+ if (ret < 0) {
+ ret_code = (ret == -ENOMEM) ?
+ LTTNG_ERR_NOMEM : LTTNG_ERR_INVALID;
+ snapshot_output_destroy(new_output);
+ goto end;
+ }
+ snapshot_add_output(&session->snapshot, new_output);
+ break;
}
+ case LTTNG_SESSION_DESCRIPTOR_TYPE_REGULAR:
+ case LTTNG_SESSION_DESCRIPTOR_TYPE_LIVE:
+ {
+ ret_code = cmd_set_consumer_uri(session, uri_count, uris);
+ break;
+ }
+ default:
+ ret_code = LTTNG_ERR_INVALID;
+ goto end;
+ }
+end:
+ return ret_code;
+}
- /* Create tracing session in the registry */
- ret = session_create(name, LTTNG_SOCK_GET_UID_CRED(creds),
- LTTNG_SOCK_GET_GID_CRED(creds));
- if (ret != LTTNG_OK) {
- goto session_error;
+static
+enum lttng_error_code cmd_create_session_from_descriptor(
+ struct lttng_session_descriptor *descriptor,
+ const lttng_sock_cred *creds,
+ const char *home_path)
+{
+ int ret;
+ enum lttng_error_code ret_code;
+ const char *session_name;
+ struct ltt_session *new_session = NULL;
+ enum lttng_session_descriptor_status descriptor_status;
+
+ session_lock_list();
+ if (home_path) {
+ if (*home_path != '/') {
+ ERR("Home path provided by client is not absolute");
+ ret_code = LTTNG_ERR_INVALID;
+ goto end;
+ }
}
- /*
- * Get the newly created session pointer back
- *
- * XXX: There is no need for the session lock list here since the caller
- * (process_client_msg) is holding it. We might want to change that so a
- * single command does not lock the entire session list.
- */
- session = session_find_by_name(name);
- assert(session);
+ descriptor_status = lttng_session_descriptor_get_session_name(
+ descriptor, &session_name);
+ switch (descriptor_status) {
+ case LTTNG_SESSION_DESCRIPTOR_STATUS_OK:
+ break;
+ case LTTNG_SESSION_DESCRIPTOR_STATUS_UNSET:
+ session_name = NULL;
+ break;
+ default:
+ ret_code = LTTNG_ERR_INVALID;
+ goto end;
+ }
+ ret_code = session_create(session_name, creds->uid, creds->gid,
+ &new_session);
+ if (ret_code != LTTNG_OK) {
+ goto end;
+ }
- session->live_timer = live_timer;
- /* Create default consumer output for the session not yet created. */
- session->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
- if (session->consumer == NULL) {
- ret = LTTNG_ERR_FATAL;
- goto consumer_error;
+ if (!session_name) {
+ ret = lttng_session_descriptor_set_session_name(descriptor,
+ new_session->name);
+ if (ret) {
+ ret_code = LTTNG_ERR_SESSION_FAIL;
+ goto end;
+ }
}
- if (uris) {
- ret = cmd_set_consumer_uri(session, nb_uri, uris);
- if (ret != LTTNG_OK) {
- goto consumer_error;
+ if (!lttng_session_descriptor_is_output_destination_initialized(
+ descriptor)) {
+ /*
+ * Only include the session's creation time in the output
+ * destination if the name of the session itself was
+ * not auto-generated.
+ */
+ ret_code = lttng_session_descriptor_set_default_output(
+ descriptor,
+ session_name ? &new_session->creation_time : NULL,
+ home_path);
+ if (ret_code != LTTNG_OK) {
+ goto end;
}
- session->output_traces = 1;
} else {
- session->output_traces = 0;
- DBG2("Session %s created with no output", session->name);
+ new_session->has_user_specified_directory =
+ lttng_session_descriptor_has_output_directory(
+ descriptor);
}
- session->consumer->enabled = 1;
-
- return LTTNG_OK;
+ switch (lttng_session_descriptor_get_type(descriptor)) {
+ case LTTNG_SESSION_DESCRIPTOR_TYPE_SNAPSHOT:
+ new_session->snapshot_mode = 1;
+ break;
+ case LTTNG_SESSION_DESCRIPTOR_TYPE_LIVE:
+ new_session->live_timer =
+ lttng_session_descriptor_live_get_timer_interval(
+ descriptor);
+ break;
+ default:
+ break;
+ }
-consumer_error:
- session_destroy(session);
-session_error:
-find_error:
- return ret;
+ ret_code = set_session_output_from_descriptor(new_session, descriptor);
+ if (ret_code != LTTNG_OK) {
+ goto end;
+ }
+ new_session->consumer->enabled = 1;
+ ret_code = LTTNG_OK;
+end:
+ /* Release reference provided by the session_create function. */
+ session_put(new_session);
+ if (ret_code != LTTNG_OK && new_session) {
+ /* Release the global reference on error. */
+ session_destroy(new_session);
+ }
+ session_unlock_list();
+ return ret_code;
}
-/*
- * Command LTTNG_CREATE_SESSION_SNAPSHOT processed by the client thread.
- */
-int cmd_create_session_snapshot(char *name, struct lttng_uri *uris,
- size_t nb_uri, lttng_sock_cred *creds)
+enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx, int sock,
+ struct lttng_session_descriptor **return_descriptor)
{
int ret;
- struct ltt_session *session;
- struct snapshot_output *new_output = NULL;
-
- assert(name);
- assert(creds);
-
- /*
- * Create session in no output mode with URIs set to NULL. The uris we've
- * received are for a default snapshot output if one.
- */
- ret = cmd_create_session_uri(name, NULL, 0, creds, 0);
- if (ret != LTTNG_OK) {
+ size_t payload_size;
+ struct lttng_dynamic_buffer payload;
+ struct lttng_buffer_view home_dir_view;
+ struct lttng_buffer_view session_descriptor_view;
+ struct lttng_session_descriptor *session_descriptor = NULL;
+ enum lttng_error_code ret_code;
+
+ lttng_dynamic_buffer_init(&payload);
+ if (cmd_ctx->lsm->u.create_session.home_dir_size >=
+ LTTNG_PATH_MAX) {
+ ret_code = LTTNG_ERR_INVALID;
+ goto error;
+ }
+ if (cmd_ctx->lsm->u.create_session.session_descriptor_size >
+ LTTNG_SESSION_DESCRIPTOR_MAX_LEN) {
+ ret_code = LTTNG_ERR_INVALID;
goto error;
}
- /* Get the newly created session pointer back. This should NEVER fail. */
- session = session_find_by_name(name);
- assert(session);
-
- /* Flag session for snapshot mode. */
- session->snapshot_mode = 1;
-
- /* Skip snapshot output creation if no URI is given. */
- if (nb_uri == 0) {
- goto end;
+ payload_size = cmd_ctx->lsm->u.create_session.home_dir_size +
+ cmd_ctx->lsm->u.create_session.session_descriptor_size;
+ ret = lttng_dynamic_buffer_set_size(&payload, payload_size);
+ if (ret) {
+ ret_code = LTTNG_ERR_NOMEM;
+ goto error;
}
- new_output = snapshot_output_alloc();
- if (!new_output) {
- ret = LTTNG_ERR_NOMEM;
- goto error_snapshot_alloc;
+ ret = lttcomm_recv_unix_sock(sock, payload.data, payload.size);
+ if (ret <= 0) {
+ ERR("Reception of session descriptor failed, aborting.");
+ ret_code = LTTNG_ERR_SESSION_FAIL;
+ goto error;
}
- ret = snapshot_output_init_with_uri(DEFAULT_SNAPSHOT_MAX_SIZE, NULL,
- uris, nb_uri, session->consumer, new_output, &session->snapshot);
+ home_dir_view = lttng_buffer_view_from_dynamic_buffer(
+ &payload,
+ 0,
+ cmd_ctx->lsm->u.create_session.home_dir_size);
+ session_descriptor_view = lttng_buffer_view_from_dynamic_buffer(
+ &payload,
+ cmd_ctx->lsm->u.create_session.home_dir_size,
+ cmd_ctx->lsm->u.create_session.session_descriptor_size);
+
+ ret = lttng_session_descriptor_create_from_buffer(
+ &session_descriptor_view, &session_descriptor);
if (ret < 0) {
- if (ret == -ENOMEM) {
- ret = LTTNG_ERR_NOMEM;
- } else {
- ret = LTTNG_ERR_INVALID;
- }
- goto error_snapshot;
+ ERR("Failed to create session descriptor from payload of \"create session\" command");
+ ret_code = LTTNG_ERR_INVALID;
+ goto error;
}
- rcu_read_lock();
- snapshot_add_output(&session->snapshot, new_output);
- rcu_read_unlock();
-
-end:
- return LTTNG_OK;
+ /*
+ * Sets the descriptor's auto-generated properties (name, output) if
+ * needed.
+ */
+ ret_code = cmd_create_session_from_descriptor(session_descriptor,
+ &cmd_ctx->creds,
+ home_dir_view.size ? home_dir_view.data : NULL);
+ if (ret_code != LTTNG_OK) {
+ goto error;
+ }
-error_snapshot:
- snapshot_output_destroy(new_output);
-error_snapshot_alloc:
- session_destroy(session);
+ ret_code = LTTNG_OK;
+ *return_descriptor = session_descriptor;
+ session_descriptor = NULL;
error:
- return ret;
+ lttng_dynamic_buffer_reset(&payload);
+ lttng_session_descriptor_destroy(session_descriptor);
+ return ret_code;
}
/*
*
* Called with session lock held.
*/
-int cmd_destroy_session(struct ltt_session *session, int wpipe,
+int cmd_destroy_session(struct ltt_session *session,
struct notification_thread_handle *notification_thread_handle)
{
int ret;
- struct ltt_ust_session *usess;
- struct ltt_kernel_session *ksess;
/* Safety net */
assert(session);
- usess = session->ust_session;
- ksess = session->kernel_session;
-
DBG("Begin destroy session %s (id %" PRIu64 ")", session->name, session->id);
- if (session->rotation_pending_check_timer_enabled) {
- if (timer_session_rotation_pending_check_stop(session)) {
- ERR("Failed to stop the \"rotation pending check\" timer of session %s",
- session->name);
- }
- }
-
if (session->rotation_schedule_timer_enabled) {
if (timer_session_rotation_schedule_timer_stop(
session)) {
session->rotate_size = 0;
}
- /*
- * The rename of the current chunk is performed at stop, but if we rotated
- * the session after the previous stop command, we need to rename the
- * new (and empty) chunk that was started in between.
- */
- if (session->rotated_after_last_stop) {
- rename_active_chunk(session);
- }
-
- /* Clean kernel session teardown */
- kernel_destroy_session(ksess);
-
- /* UST session teardown */
- if (usess) {
- /* Close any relayd session */
- consumer_output_send_destroy_relayd(usess->consumer);
-
- /* Destroy every UST application related to this session. */
- ret = ust_app_destroy_trace_all(usess);
- if (ret) {
- ERR("Error in ust_app_destroy_trace_all");
+ if (session->current_archive_id != 0) {
+ if (!session->rotated_after_last_stop) {
+ ret = cmd_rotate_session(session, NULL);
+ if (ret != LTTNG_OK) {
+ ERR("Failed to perform an implicit rotation as part of the rotation: %s", lttng_strerror(-ret));
+ }
+ } else {
+ /*
+ * Rename the active chunk to ensure it has a name
+ * of the form ts_begin-ts_end-id.
+ *
+ * Note that no trace data has been produced since
+ * the last rotation; the directory should be
+ * removed.
+ */
+ ret = rename_active_chunk(session);
+ if (ret) {
+ ERR("Failed to rename active chunk during the destruction of session \"%s\"",
+ session->name);
+ }
}
-
- /* Clean up the rest. */
- trace_ust_destroy_session(usess);
- }
-
- /*
- * Must notify the kernel thread here to update it's poll set in order to
- * remove the channel(s)' fd just destroyed.
- */
- ret = notify_thread_pipe(wpipe);
- if (ret < 0) {
- PERROR("write kernel poll pipe");
}
if (session->shm_path[0]) {
sizeof(destroy_completion_handler.shm_path));
assert(!ret);
}
- ret = session_destroy(session);
+
+ /*
+ * The session is destroyed. However, note that the command context
+ * still holds a reference to the session, thus delaying its destruction
+ * _at least_ up to the point when that reference is released.
+ */
+ session_destroy(session);
+ ret = LTTNG_OK;
return ret;
}
* The session list lock MUST be acquired before calling this function. Use
* session_lock_list() and session_unlock_list().
*/
-void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
- gid_t gid)
+void cmd_list_lttng_sessions(struct lttng_session *sessions,
+ size_t session_count, uid_t uid, gid_t gid)
{
int ret;
unsigned int i = 0;
struct ltt_session *session;
struct ltt_session_list *list = session_get_list();
+ struct lttng_session_extended *extended =
+ (typeof(extended)) (&sessions[session_count]);
DBG("Getting all available session for UID %d GID %d",
uid, gid);
* the buffer.
*/
cds_list_for_each_entry(session, &list->head, list) {
+ if (!session_get(session)) {
+ continue;
+ }
/*
* Only list the sessions the user can control.
*/
- if (!session_access_ok(session, uid, gid)) {
+ if (!session_access_ok(session, uid, gid) ||
+ session->destroyed) {
+ session_put(session);
continue;
}
}
if (ret < 0) {
PERROR("snprintf session path");
+ session_put(session);
continue;
}
sessions[i].enabled = session->active;
sessions[i].snapshot_mode = session->snapshot_mode;
sessions[i].live_timer_interval = session->live_timer;
+ extended[i].creation_time.value = (uint64_t) session->creation_time;
+ extended[i].creation_time.is_set = 1;
i++;
+ session_put(session);
}
}
goto error;
}
+ if (session->has_non_mmap_channel) {
+ ret = LTTNG_ERR_SNAPSHOT_UNSUPPORTED;
+ goto error;
+ }
+
/* Only one output is allowed until we have the "tee" feature. */
if (session->snapshot.nb_output == 1) {
ret = LTTNG_ERR_SNAPSHOT_OUTPUT_EXIST;
goto error;
}
- ret = snapshot_output_init(output->max_size, output->name,
+ ret = snapshot_output_init(session, output->max_size, output->name,
output->ctrl_url, output->data_url, session->consumer, new_output,
&session->snapshot);
if (ret < 0) {
* Send relayd sockets from snapshot output to consumer. Ignore request if the
* snapshot output is *not* set with a remote destination.
*
- * Return 0 on success or a LTTNG_ERR code.
+ * Return LTTNG_OK on success or a LTTNG_ERR code.
*/
-static int set_relayd_for_snapshot(struct consumer_output *consumer,
- struct snapshot_output *snap_output, struct ltt_session *session)
+static enum lttng_error_code set_relayd_for_snapshot(
+ struct consumer_output *consumer,
+ struct snapshot_output *snap_output,
+ struct ltt_session *session)
{
- int ret = LTTNG_OK;
+ enum lttng_error_code status = LTTNG_OK;
struct lttng_ht_iter iter;
struct consumer_socket *socket;
cds_lfht_for_each_entry(snap_output->consumer->socks->ht, &iter.iter,
socket, node.node) {
pthread_mutex_lock(socket->lock);
- ret = send_consumer_relayd_sockets(0, session->id,
+ status = send_consumer_relayd_sockets(0, session->id,
snap_output->consumer, socket,
session->name, session->hostname,
session->live_timer);
pthread_mutex_unlock(socket->lock);
- if (ret != LTTNG_OK) {
+ if (status != LTTNG_OK) {
rcu_read_unlock();
goto error;
}
rcu_read_unlock();
error:
- return ret;
+ return status;
}
/*
*
* Return LTTNG_OK on success or a LTTNG_ERR code.
*/
-static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
+static enum lttng_error_code record_kernel_snapshot(struct ltt_kernel_session *ksess,
struct snapshot_output *output, struct ltt_session *session,
int wait, uint64_t nb_packets_per_stream)
{
int ret;
+ enum lttng_error_code status;
assert(ksess);
assert(output);
assert(session);
-
/*
* Copy kernel session sockets so we can communicate with the right
* consumer for the snapshot record command.
*/
ret = consumer_copy_sockets(output->consumer, ksess->consumer);
if (ret < 0) {
- ret = LTTNG_ERR_NOMEM;
+ status = LTTNG_ERR_NOMEM;
goto error;
}
- ret = set_relayd_for_snapshot(ksess->consumer, output, session);
- if (ret != LTTNG_OK) {
+ status = set_relayd_for_snapshot(ksess->consumer, output, session);
+ if (status != LTTNG_OK) {
goto error_snapshot;
}
- ret = kernel_snapshot_record(ksess, output, wait, nb_packets_per_stream);
- if (ret != LTTNG_OK) {
+ status = kernel_snapshot_record(ksess, output, wait, nb_packets_per_stream);
+ if (status != LTTNG_OK) {
goto error_snapshot;
}
- ret = LTTNG_OK;
goto end;
error_snapshot:
consumer_destroy_output_sockets(output->consumer);
error:
end:
- return ret;
+ return status;
}
/*
* Record a UST snapshot.
*
- * Return 0 on success or a LTTNG_ERR error code.
+ * Returns LTTNG_OK on success or a LTTNG_ERR error code.
*/
-static int record_ust_snapshot(struct ltt_ust_session *usess,
+static enum lttng_error_code record_ust_snapshot(struct ltt_ust_session *usess,
struct snapshot_output *output, struct ltt_session *session,
int wait, uint64_t nb_packets_per_stream)
{
int ret;
+ enum lttng_error_code status;
assert(usess);
assert(output);
*/
ret = consumer_copy_sockets(output->consumer, usess->consumer);
if (ret < 0) {
- ret = LTTNG_ERR_NOMEM;
+ status = LTTNG_ERR_NOMEM;
goto error;
}
- ret = set_relayd_for_snapshot(usess->consumer, output, session);
- if (ret != LTTNG_OK) {
+ status = set_relayd_for_snapshot(usess->consumer, output, session);
+ if (status != LTTNG_OK) {
goto error_snapshot;
}
- ret = ust_app_snapshot_record(usess, output, wait, nb_packets_per_stream);
- if (ret < 0) {
- switch (-ret) {
- case EINVAL:
- ret = LTTNG_ERR_INVALID;
- break;
- default:
- ret = LTTNG_ERR_SNAPSHOT_FAIL;
- break;
- }
+ status = ust_app_snapshot_record(usess, output, wait, nb_packets_per_stream);
+ if (status != LTTNG_OK) {
goto error_snapshot;
}
- ret = LTTNG_OK;
+ goto end;
error_snapshot:
/* Clean up copied sockets so this output can use some other later on. */
consumer_destroy_output_sockets(output->consumer);
error:
- return ret;
+end:
+ return status;
}
static
int cmd_snapshot_record(struct ltt_session *session,
struct lttng_snapshot_output *output, int wait)
{
- int ret = LTTNG_OK;
+ enum lttng_error_code cmd_ret = LTTNG_OK;
+ int ret;
unsigned int use_tmp_output = 0;
struct snapshot_output tmp_output;
unsigned int snapshot_success = 0;
ret = utils_get_current_time_str("%Y%m%d-%H%M%S", datetime,
sizeof(datetime));
if (!ret) {
- ret = LTTNG_ERR_INVALID;
+ cmd_ret = LTTNG_ERR_INVALID;
goto error;
}
* set in no output mode.
*/
if (session->output_traces) {
- ret = LTTNG_ERR_NOT_SNAPSHOT_SESSION;
+ cmd_ret = LTTNG_ERR_NOT_SNAPSHOT_SESSION;
goto error;
}
/* The session needs to be started at least once. */
if (!session->has_been_started) {
- ret = LTTNG_ERR_START_SESSION_ONCE;
+ cmd_ret = LTTNG_ERR_START_SESSION_ONCE;
goto error;
}
/* Use temporary output for the session. */
if (*output->ctrl_url != '\0') {
- ret = snapshot_output_init(output->max_size, output->name,
- output->ctrl_url, output->data_url, session->consumer,
+ ret = snapshot_output_init(session, output->max_size,
+ output->name,
+ output->ctrl_url, output->data_url,
+ session->consumer,
&tmp_output, NULL);
if (ret < 0) {
if (ret == -ENOMEM) {
- ret = LTTNG_ERR_NOMEM;
+ cmd_ret = LTTNG_ERR_NOMEM;
} else {
- ret = LTTNG_ERR_INVALID;
+ cmd_ret = LTTNG_ERR_INVALID;
}
goto error;
}
nb_packets_per_stream = get_session_nb_packets_per_stream(session,
tmp_output.max_size);
if (nb_packets_per_stream < 0) {
- ret = LTTNG_ERR_MAX_SIZE_INVALID;
+ cmd_ret = LTTNG_ERR_MAX_SIZE_INVALID;
goto error;
}
if (session->kernel_session) {
- ret = record_kernel_snapshot(session->kernel_session,
+ cmd_ret = record_kernel_snapshot(session->kernel_session,
&tmp_output, session,
wait, nb_packets_per_stream);
- if (ret != LTTNG_OK) {
+ if (cmd_ret != LTTNG_OK) {
goto error;
}
}
if (session->ust_session) {
- ret = record_ust_snapshot(session->ust_session,
+ cmd_ret = record_ust_snapshot(session->ust_session,
&tmp_output, session,
wait, nb_packets_per_stream);
- if (ret != LTTNG_OK) {
+ if (cmd_ret != LTTNG_OK) {
goto error;
}
}
nb_packets_per_stream = get_session_nb_packets_per_stream(session,
tmp_output.max_size);
if (nb_packets_per_stream < 0) {
- ret = LTTNG_ERR_MAX_SIZE_INVALID;
+ cmd_ret = LTTNG_ERR_MAX_SIZE_INVALID;
rcu_read_unlock();
goto error;
}
if (*output->name != '\0') {
if (lttng_strncpy(tmp_output.name, output->name,
sizeof(tmp_output.name))) {
- ret = LTTNG_ERR_INVALID;
+ cmd_ret = LTTNG_ERR_INVALID;
rcu_read_unlock();
goto error;
}
memcpy(tmp_output.datetime, datetime, sizeof(datetime));
if (session->kernel_session) {
- ret = record_kernel_snapshot(session->kernel_session,
+ cmd_ret = record_kernel_snapshot(session->kernel_session,
&tmp_output, session,
wait, nb_packets_per_stream);
- if (ret != LTTNG_OK) {
+ if (cmd_ret != LTTNG_OK) {
rcu_read_unlock();
goto error;
}
}
if (session->ust_session) {
- ret = record_ust_snapshot(session->ust_session,
+ cmd_ret = record_ust_snapshot(session->ust_session,
&tmp_output, session,
wait, nb_packets_per_stream);
- if (ret != LTTNG_OK) {
+ if (cmd_ret != LTTNG_OK) {
rcu_read_unlock();
goto error;
}
if (snapshot_success) {
session->snapshot.nb_snapshot++;
} else {
- ret = LTTNG_ERR_SNAPSHOT_FAIL;
+ cmd_ret = LTTNG_ERR_SNAPSHOT_FAIL;
}
error:
- return ret;
+ return cmd_ret;
}
/*
goto end;
}
- if (session->live_timer || session->snapshot_mode ||
- !session->output_traces) {
+ if (session->live_timer || !session->output_traces) {
cmd_ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE;
goto end;
}
now = time(NULL);
if (now == (time_t) -1) {
- cmd_ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE;
+ cmd_ret = LTTNG_ERR_UNK;
goto end;
}
goto end;
}
+ /* Current chunk directory, ex: 20170922-111754-42 */
+ ret = snprintf(session->consumer->chunk_path,
+ sizeof(session->consumer->chunk_path),
+ "%s-%" PRIu64, datetime,
+ session->current_archive_id + 1);
+ if (ret < 0 || ret >= sizeof(session->consumer->chunk_path)) {
+ ERR("Failed to format the new chunk's directory in rotate session command");
+ cmd_ret = LTTNG_ERR_UNK;
+ goto error;
+ }
+
+ /*
+ * The active path for the next rotation/destroy.
+ * Ex: ~/lttng-traces/auto-20170922-111748/20170922-111754-42
+ */
+ ret = snprintf(session->rotation_chunk.active_tracing_path,
+ sizeof(session->rotation_chunk.active_tracing_path),
+ "%s/%s",
+ session_get_base_path(session),
+ session->consumer->chunk_path);
+ if (ret < 0 || ret >= sizeof(session->rotation_chunk.active_tracing_path)) {
+ ERR("Failed to format active tracing path in rotate session command");
+ cmd_ret = LTTNG_ERR_UNK;
+ goto error;
+ }
+
/*
* A rotation has a local step even if the destination is a relay
* daemon; the buffers must be consumed by the consumer daemon.
session->rotation_state = LTTNG_ROTATION_STATE_ONGOING;
if (session->kernel_session) {
- /*
- * The active path for the next rotation/destroy.
- * Ex: ~/lttng-traces/auto-20170922-111748/20170922-111754-42
- */
- ret = snprintf(session->rotation_chunk.active_tracing_path,
- sizeof(session->rotation_chunk.active_tracing_path),
- "%s/%s-%" PRIu64,
- session_get_base_path(session),
- datetime, session->current_archive_id + 1);
- if (ret < 0 || ret == sizeof(session->rotation_chunk.active_tracing_path)) {
- ERR("Failed to format active kernel tracing path in rotate session command");
- cmd_ret = LTTNG_ERR_UNK;
- goto error;
- }
- /*
- * The sub-directory for the consumer
- * Ex: /20170922-111754-42/kernel
- */
- ret = snprintf(session->kernel_session->consumer->chunk_path,
- sizeof(session->kernel_session->consumer->chunk_path),
- "/%s-%" PRIu64, datetime,
- session->current_archive_id + 1);
- if (ret < 0 || ret == sizeof(session->kernel_session->consumer->chunk_path)) {
- ERR("Failed to format the kernel consumer's sub-directory in rotate session command");
+ ret = lttng_strncpy(
+ session->kernel_session->consumer->chunk_path,
+ session->consumer->chunk_path,
+ sizeof(session->kernel_session->consumer->chunk_path));
+ if (ret) {
+ ERR("Failed to copy current chunk directory to kernel session");
cmd_ret = LTTNG_ERR_UNK;
goto error;
}
/*
- * Create the new chunk folder, before the rotation begins so we don't
- * race with the consumer/tracer activity.
+ * Create the new chunk folder, before the rotation begins so we
+ * don't race with the consumer/tracer activity.
*/
ret = domain_mkdir(session->kernel_session->consumer, session,
session->kernel_session->uid,
session->kernel_session->gid);
if (ret) {
- ERR("Failed to create kernel session tracing path at %s",
- session->kernel_session->consumer->chunk_path);
cmd_ret = LTTNG_ERR_CREATE_DIR_FAIL;
goto error;
}
}
}
if (session->ust_session) {
- ret = snprintf(session->rotation_chunk.active_tracing_path,
- PATH_MAX, "%s/%s-%" PRIu64,
- session_get_base_path(session),
- datetime, session->current_archive_id + 1);
- if (ret < 0) {
- ERR("Failed to format active UST tracing path in rotate session command");
- cmd_ret = LTTNG_ERR_UNK;
- goto error;
- }
- ret = snprintf(session->ust_session->consumer->chunk_path,
- PATH_MAX, "/%s-%" PRIu64, datetime,
- session->current_archive_id + 1);
- if (ret < 0) {
- ERR("Failed to format the UST consumer's sub-directory in rotate session command");
+ ret = lttng_strncpy(
+ session->ust_session->consumer->chunk_path,
+ session->consumer->chunk_path,
+ sizeof(session->ust_session->consumer->chunk_path));
+ if (ret) {
+ ERR("Failed to copy current chunk directory to userspace session");
cmd_ret = LTTNG_ERR_UNK;
goto error;
}
- /*
- * Create the new chunk folder, before the rotation begins so we don't
- * race with the consumer/tracer activity.
- */
ret = domain_mkdir(session->ust_session->consumer, session,
session->ust_session->uid,
session->ust_session->gid);
cmd_ret = LTTNG_ERR_CREATE_DIR_FAIL;
goto error;
}
- /*
- * TODO: ust_app_rotate_session must be adapted to return
- * an lttng_error_code, like its kernel counterpart.
- */
cmd_ret = ust_app_rotate_session(session);
if (cmd_ret != LTTNG_OK) {
goto error;
DBG("Cmd rotate set schedule session %s", session->name);
- if (session->live_timer || session->snapshot_mode ||
- !session->output_traces) {
+ if (session->live_timer || !session->output_traces) {
DBG("Failing ROTATION_SET_SCHEDULE command as the rotation feature is not available for this session");
ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE;
goto end;
projects / lttng-tools.git / blobdiff