#include <common/common.h>
#include <common/defaults.h>
#include <common/uri.h>
-#include <common/utils.h>
#include "consumer.h"
#include "health.h"
uint32_t chan_id,
uint64_t tracefile_size,
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;
memcpy(msg->u.ask_channel.uuid, uuid, sizeof(msg->u.ask_channel.uuid));
- strncpy(msg->u.ask_channel.pathname, pathname,
- sizeof(msg->u.ask_channel.pathname));
- msg->u.ask_channel.pathname[sizeof(msg->u.ask_channel.pathname)-1] = '\0';
+ if (pathname) {
+ strncpy(msg->u.ask_channel.pathname, pathname,
+ sizeof(msg->u.ask_channel.pathname));
+ msg->u.ask_channel.pathname[sizeof(msg->u.ask_channel.pathname)-1] = '\0';
+ }
strncpy(msg->u.ask_channel.name, name, sizeof(msg->u.ask_channel.name));
msg->u.ask_channel.name[sizeof(msg->u.ask_channel.name) - 1] = '\0';
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);
- 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.use_relayd = 1;
ret = snprintf(msg.u.snapshot_channel.pathname,
sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
- output->consumer->subdir, output->name, datetime,
+ output->consumer->subdir, output->name, output->datetime,
session_path);
if (ret < 0) {
ret = -LTTNG_ERR_NOMEM;
} else {
ret = snprintf(msg.u.snapshot_channel.pathname,
sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
- output->consumer->dst.trace_path, output->name, datetime,
- session_path);
+ output->consumer->dst.trace_path, output->name,
+ output->datetime, session_path);
if (ret < 0) {
ret = -LTTNG_ERR_NOMEM;
goto error;