/*
* Send a single channel to the consumer using command ADD_CHANNEL.
*/
-static int send_channel(int sock, struct ust_app_channel *uchan)
+static int send_channel(struct consumer_socket *sock,
+ struct ust_app_channel *uchan)
{
int ret, fd;
struct lttcomm_consumer_msg msg;
/* Safety net */
assert(uchan);
+ assert(sock);
- if (sock < 0) {
+ if (sock->fd < 0) {
ret = -EINVAL;
goto error;
}
uchan->obj->shm_fd,
uchan->attr.subbuf_size,
uchan->obj->memory_map_size,
- uchan->name);
+ uchan->name,
+ uchan->streams.count);
+
+ health_code_update(&health_thread_cmd);
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_cmd);
+
fd = uchan->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_cmd);
+
error:
return ret;
}
/*
* Send a single stream to the consumer using ADD_STREAM command.
*/
-static int send_channel_stream(int sock, struct ust_app_channel *uchan,
- struct ust_app_session *usess, struct ltt_ust_stream *stream,
- struct consumer_output *consumer, const char *pathname)
+static int send_channel_stream(struct consumer_socket *sock,
+ struct ust_app_channel *uchan, struct ust_app_session *usess,
+ struct ltt_ust_stream *stream, struct consumer_output *consumer,
+ const char *pathname)
{
int ret, fds[2];
struct lttcomm_consumer_msg msg;
assert(usess);
assert(stream);
assert(consumer);
+ assert(sock);
DBG2("Sending stream %d of channel %s to kernel consumer",
stream->obj->shm_fd, uchan->name);
consumer->net_seq_index,
0, /* Metadata flag unset */
stream->name,
- pathname);
+ pathname,
+ usess->id);
+
+ health_code_update(&health_thread_cmd);
/* Send stream and file descriptor */
fds[0] = stream->obj->shm_fd;
goto error;
}
+ health_code_update(&health_thread_cmd);
+
error:
return ret;
}
/*
* Send all stream fds of UST channel to the consumer.
*/
-static int send_channel_streams(int sock,
+static int send_channel_streams(struct consumer_socket *sock,
struct ust_app_channel *uchan, struct ust_app_session *usess,
struct consumer_output *consumer)
{
const char *pathname;
struct ltt_ust_stream *stream, *tmp;
+ assert(sock);
+
DBG("Sending streams of channel %s to UST consumer", uchan->name);
ret = send_channel(sock, uchan);
/* Get the right path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s/%s",
- consumer->dst.trace_path, usess->path);
+ ret = snprintf(tmp_path, sizeof(tmp_path), "%s/%s/%s",
+ consumer->dst.trace_path, consumer->subdir, usess->path);
if (ret < 0) {
PERROR("snprintf stream path");
goto error;
/*
* Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
*/
-static int send_metadata(int sock, struct ust_app_session *usess,
- struct consumer_output *consumer)
+static int send_metadata(struct consumer_socket *sock,
+ struct ust_app_session *usess, struct consumer_output *consumer)
{
int ret, fd, fds[2];
char tmp_path[PATH_MAX];
/* Safety net */
assert(usess);
assert(consumer);
+ assert(sock);
- if (sock < 0) {
- ERR("Consumer socket is negative (%d)", sock);
+ if (sock->fd < 0) {
+ ERR("Consumer socket is negative (%d)", sock->fd);
return -EINVAL;
}
usess->metadata->obj->shm_fd,
usess->metadata->attr.subbuf_size,
usess->metadata->obj->memory_map_size,
- "metadata");
+ "metadata",
+ 1);
+
+ health_code_update(&health_thread_cmd);
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_cmd);
+
/* Sending metadata shared memory fd */
fd = usess->metadata->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
goto error;
}
+ health_code_update(&health_thread_cmd);
+
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s/%s",
- consumer->dst.trace_path, usess->path);
+ ret = snprintf(tmp_path, sizeof(tmp_path), "%s/%s/%s",
+ consumer->dst.trace_path, consumer->subdir, usess->path);
if (ret < 0) {
PERROR("snprintf stream path");
goto error;
consumer->net_seq_index,
1, /* Flag metadata set */
"metadata",
- pathname);
+ pathname,
+ usess->id);
+
+ health_code_update(&health_thread_cmd);
/* Send stream and file descriptor */
fds[0] = usess->metadata->stream_obj->shm_fd;
goto error;
}
+ health_code_update(&health_thread_cmd);
+
error:
return ret;
}
struct ust_app_channel *ua_chan;
assert(usess);
- assert(consumer);
- assert(sock);
+
+ if (consumer == NULL || sock == NULL) {
+ /* There is no consumer so just ignoring the command. */
+ DBG("UST consumer does not exist. Not sending streams");
+ return 0;
+ }
DBG("Sending metadata stream fd to consumer on %d", sock->fd);
pthread_mutex_lock(sock->lock);
/* Sending metadata information to the consumer */
- ret = send_metadata(sock->fd, usess, consumer);
+ ret = send_metadata(sock, usess, consumer);
if (ret < 0) {
goto error;
}
continue;
}
- ret = send_channel_streams(sock->fd, ua_chan, usess, consumer);
+ ret = send_channel_streams(sock, ua_chan, usess, consumer);
if (ret < 0) {
rcu_read_unlock();
goto error;