projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add snapshot output init call that uses URIs
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 211fc5a34df02b70de775c15880d526d26afe050..a6a81c5dbd79989b474ffa1ee5b5d3c5edc83389 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-25,6
+25,7
@@
#include <common/common.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/relayd/relayd.h>
#include <common/common.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/relayd/relayd.h>
+#include <common/utils.h>
#include "channel.h"
#include "consumer.h"
#include "channel.h"
#include "consumer.h"
@@
-721,7
+722,7
@@
static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
struct ltt_kernel_channel *kchan;
/* Open kernel metadata */
struct ltt_kernel_channel *kchan;
/* Open kernel metadata */
- if (ksess->metadata == NULL) {
+ if (ksess->metadata == NULL
&& ksess->output_traces
) {
ret = kernel_open_metadata(ksess);
if (ret < 0) {
ret = LTTNG_ERR_KERN_META_FAIL;
ret = kernel_open_metadata(ksess);
if (ret < 0) {
ret = LTTNG_ERR_KERN_META_FAIL;
@@
-730,7
+731,7
@@
static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
}
/* Open kernel metadata stream */
}
/* Open kernel metadata stream */
- if (ksess->metadata_stream_fd < 0) {
+ if (ksess->metadata
&& ksess->metadata
_stream_fd < 0) {
ret = kernel_open_metadata_stream(ksess);
if (ret < 0) {
ERR("Kernel create metadata stream failed");
ret = kernel_open_metadata_stream(ksess);
if (ret < 0) {
ERR("Kernel create metadata stream failed");
@@
-2374,8
+2375,8
@@
static int set_relayd_for_snapshot(struct consumer_output *consumer,
* snapshot output.
*/
rcu_read_lock();
* snapshot output.
*/
rcu_read_lock();
- cds_lfht_for_each_entry(
consumer->socks->ht, &iter.iter, socket
,
- node.node) {
+ cds_lfht_for_each_entry(
snap_output->consumer->socks->ht, &iter.iter
,
+
socket,
node.node) {
ret = send_consumer_relayd_sockets(0, session->id,
snap_output->consumer, socket);
if (ret < 0) {
ret = send_consumer_relayd_sockets(0, session->id,
snap_output->consumer, socket);
if (ret < 0) {
@@
-2403,6
+2404,14
@@
static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
assert(output);
assert(session);
assert(output);
assert(session);
+ /* Get the datetime for the snapshot output directory. */
+ ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
+ sizeof(output->datetime));
+ if (!ret) {
+ ret = -EINVAL;
+ goto error;
+ }
+
if (!output->kernel_sockets_copied) {
ret = consumer_copy_sockets(output->consumer, ksess->consumer);
if (ret < 0) {
if (!output->kernel_sockets_copied) {
ret = consumer_copy_sockets(output->consumer, ksess->consumer);
if (ret < 0) {
@@
-2439,6
+2448,14
@@
static int record_ust_snapshot(struct ltt_ust_session *usess,
assert(output);
assert(session);
assert(output);
assert(session);
+ /* Get the datetime for the snapshot output directory. */
+ ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
+ sizeof(output->datetime));
+ if (!ret) {
+ ret = -EINVAL;
+ goto error;
+ }
+
if (!output->ust_sockets_copied) {
ret = consumer_copy_sockets(output->consumer, usess->consumer);
if (ret < 0) {
if (!output->ust_sockets_copied) {
ret = consumer_copy_sockets(output->consumer, usess->consumer);
if (ret < 0) {
@@
-2555,7
+2572,7
@@
int cmd_snapshot_record(struct ltt_session *session,
rcu_read_lock();
cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
&iter.iter, sout, node.node) {
rcu_read_lock();
cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
&iter.iter, sout, node.node) {
- ret = record_ust_snapshot(usess,
tmp_
sout, session, wait);
+ ret = record_ust_snapshot(usess, sout, session, wait);
if (ret < 0) {
rcu_read_unlock();
goto error;
if (ret < 0) {
rcu_read_unlock();
goto error;
This page took
0.037118 seconds
and
4
git commands to generate.