#include <common/common.h>
#include <common/defaults.h>
#include <common/uri.h>
+#include <common/utils.h>
#include "consumer.h"
#include "health.h"
unsigned char *uuid,
uint32_t chan_id,
uint64_t tracefile_size,
- uint64_t tracefile_count)
+ uint64_t tracefile_count,
+ uint64_t session_id_per_pid,
+ unsigned int monitor)
{
assert(msg);
msg->u.ask_channel.output = output;
msg->u.ask_channel.type = type;
msg->u.ask_channel.session_id = session_id;
+ msg->u.ask_channel.session_id_per_pid = session_id_per_pid;
msg->u.ask_channel.uid = uid;
msg->u.ask_channel.gid = gid;
msg->u.ask_channel.relayd_id = relayd_id;
msg->u.ask_channel.chan_id = chan_id;
msg->u.ask_channel.tracefile_size = tracefile_size;
msg->u.ask_channel.tracefile_count = tracefile_count;
+ msg->u.ask_channel.monitor = monitor;
memcpy(msg->u.ask_channel.uuid, uuid, sizeof(msg->u.ask_channel.uuid));
enum lttng_event_output output,
int type,
uint64_t tracefile_size,
- uint64_t tracefile_count)
+ uint64_t tracefile_count,
+ unsigned int monitor)
{
assert(msg);
msg->u.channel.type = type;
msg->u.channel.tracefile_size = tracefile_size;
msg->u.channel.tracefile_count = tracefile_count;
+ msg->u.channel.monitor = monitor;
strncpy(msg->u.channel.pathname, pathname,
sizeof(msg->u.channel.pathname));
*/
int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
- int wait)
+ const char *session_path, int wait)
{
int ret;
+ char datetime[16];
struct lttcomm_consumer_msg msg;
assert(socket);
DBG("Consumer snapshot channel key %" PRIu64, key);
- memset(&msg, 0, sizeof(msg));
+ ret = utils_get_current_time_str("%Y%m%d-%H%M%S", datetime,
+ sizeof(datetime));
+ if (!ret) {
+ ret = -EINVAL;
+ goto error;
+ }
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_SNAPSHOT_CHANNEL;
msg.u.snapshot_channel.key = key;
msg.u.snapshot_channel.max_size = output->max_size;
msg.u.snapshot_channel.relayd_id = output->consumer->net_seq_index;
msg.u.snapshot_channel.use_relayd = 1;
ret = snprintf(msg.u.snapshot_channel.pathname,
- sizeof(msg.u.snapshot_channel.pathname), "%s/%s",
- output->consumer->subdir, DEFAULT_SNAPSHOT_NAME);
+ sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
+ output->consumer->subdir, output->name, datetime,
+ session_path);
if (ret < 0) {
ret = -LTTNG_ERR_NOMEM;
goto error;
}
} else {
ret = snprintf(msg.u.snapshot_channel.pathname,
- sizeof(msg.u.snapshot_channel.pathname), "%s/%s",
- output->consumer->dst.trace_path, DEFAULT_SNAPSHOT_NAME);
+ sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
+ output->consumer->dst.trace_path, output->name, datetime,
+ session_path);
if (ret < 0) {
ret = -LTTNG_ERR_NOMEM;
goto error;
}
+ msg.u.snapshot_channel.relayd_id = (uint64_t) -1ULL;
/* Create directory. Ignore if exist. */
ret = run_as_mkdir_recursive(msg.u.snapshot_channel.pathname,