summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1bfe732)
Signed-off-by: David Goulet <dgoulet@efficios.com>
* Send relayd sockets from snapshot output to consumer. Ignore request if the
* snapshot output is *not* set with a remote destination.
*
* 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 else a negative value.
+ * Return 0 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 int set_relayd_for_snapshot(struct consumer_output *consumer,
struct snapshot_output *snap_output, struct ltt_session *session)
{
struct lttng_ht_iter iter;
struct consumer_socket *socket;
struct lttng_ht_iter iter;
struct consumer_socket *socket;
socket, node.node) {
ret = send_consumer_relayd_sockets(0, session->id,
snap_output->consumer, socket);
socket, node.node) {
ret = send_consumer_relayd_sockets(0, session->id,
snap_output->consumer, socket);
rcu_read_unlock();
goto error;
}
rcu_read_unlock();
goto error;
}
/*
* Record a kernel snapshot.
*
/*
* Record a kernel snapshot.
*
- * Return 0 on success or else a negative value.
+ * Return 0 on success or a LTTNG_ERR code.
*/
static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
struct snapshot_output *output, struct ltt_session *session,
*/
static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
struct snapshot_output *output, struct ltt_session *session,
ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
sizeof(output->datetime));
if (!ret) {
ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
sizeof(output->datetime));
if (!ret) {
+ ret = LTTNG_ERR_INVALID;
*/
ret = consumer_copy_sockets(output->consumer, ksess->consumer);
if (ret < 0) {
*/
ret = consumer_copy_sockets(output->consumer, ksess->consumer);
if (ret < 0) {
goto error;
}
ret = set_relayd_for_snapshot(ksess->consumer, output, session);
goto error;
}
ret = set_relayd_for_snapshot(ksess->consumer, output, session);
goto error_snapshot;
}
ret = kernel_snapshot_record(ksess, output, wait, nb_streams);
if (ret < 0) {
goto error_snapshot;
}
ret = kernel_snapshot_record(ksess, output, wait, nb_streams);
if (ret < 0) {
- ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+ ret = LTTNG_ERR_SNAPSHOT_FAIL;
- ret = -LTTNG_ERR_INVALID;
+ ret = LTTNG_ERR_INVALID;
error_snapshot:
/* Clean up copied sockets so this output can use some other later on. */
consumer_destroy_output_sockets(output->consumer);
error_snapshot:
/* Clean up copied sockets so this output can use some other later on. */
consumer_destroy_output_sockets(output->consumer);
/*
* Record a UST snapshot.
*
/*
* Record a UST snapshot.
*
- * Return 0 on success or else a negative value.
+ * Return 0 on success or a LTTNG_ERR error code.
*/
static int record_ust_snapshot(struct ltt_ust_session *usess,
struct snapshot_output *output, struct ltt_session *session,
*/
static int record_ust_snapshot(struct ltt_ust_session *usess,
struct snapshot_output *output, struct ltt_session *session,
ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
sizeof(output->datetime));
if (!ret) {
ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
sizeof(output->datetime));
if (!ret) {
+ ret = LTTNG_ERR_INVALID;
*/
ret = consumer_copy_sockets(output->consumer, usess->consumer);
if (ret < 0) {
*/
ret = consumer_copy_sockets(output->consumer, usess->consumer);
if (ret < 0) {
goto error;
}
ret = set_relayd_for_snapshot(usess->consumer, output, session);
goto error;
}
ret = set_relayd_for_snapshot(usess->consumer, output, session);
goto error_snapshot;
}
ret = ust_app_snapshot_record(usess, output, wait, nb_streams);
if (ret < 0) {
goto error_snapshot;
}
ret = ust_app_snapshot_record(usess, output, wait, nb_streams);
if (ret < 0) {
- ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+ ret = LTTNG_ERR_SNAPSHOT_FAIL;
- ret = -LTTNG_ERR_INVALID;
+ ret = LTTNG_ERR_INVALID;
error_snapshot:
/* Clean up copied sockets so this output can use some other later on. */
consumer_destroy_output_sockets(output->consumer);
error_snapshot:
/* Clean up copied sockets so this output can use some other later on. */
consumer_destroy_output_sockets(output->consumer);
if (use_tmp_output) {
ret = record_kernel_snapshot(ksess, &tmp_output, session,
wait, nb_streams);
if (use_tmp_output) {
ret = record_kernel_snapshot(ksess, &tmp_output, session,
wait, nb_streams);
goto error;
}
snapshot_success = 1;
goto error;
}
snapshot_success = 1;
ret = record_kernel_snapshot(ksess, &tmp_output,
session, wait, nb_streams);
ret = record_kernel_snapshot(ksess, &tmp_output,
session, wait, nb_streams);
rcu_read_unlock();
goto error;
}
rcu_read_unlock();
goto error;
}
if (use_tmp_output) {
ret = record_ust_snapshot(usess, &tmp_output, session,
wait, nb_streams);
if (use_tmp_output) {
ret = record_ust_snapshot(usess, &tmp_output, session,
wait, nb_streams);
goto error;
}
snapshot_success = 1;
goto error;
}
snapshot_success = 1;
ret = record_ust_snapshot(usess, &tmp_output, session,
wait, nb_streams);
ret = record_ust_snapshot(usess, &tmp_output, session,
wait, nb_streams);
rcu_read_unlock();
goto error;
}
rcu_read_unlock();
goto error;
}