projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove UST abi cast on channel attribute
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel-consumer.c
diff --git
a/src/bin/lttng-sessiond/kernel-consumer.c
b/src/bin/lttng-sessiond/kernel-consumer.c
index c86d52803b80ac19c254eb3a1e267f3223d6c5d9..25f0e47998eebb85e753d249df947bbb02d1c72f 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-31,7
+31,8
@@
/*
* Sending a single channel to the consumer with command ADD_CHANNEL.
*/
/*
* Sending a single channel to the consumer with command ADD_CHANNEL.
*/
-int kernel_consumer_add_channel(int sock, struct ltt_kernel_channel *channel)
+int kernel_consumer_add_channel(struct consumer_socket *sock,
+ struct ltt_kernel_channel *channel)
{
int ret;
struct lttcomm_consumer_msg lkm;
{
int ret;
struct lttcomm_consumer_msg lkm;
@@
-51,11
+52,15
@@
int kernel_consumer_add_channel(int sock, struct ltt_kernel_channel *channel)
channel->channel->name,
channel->stream_count);
channel->channel->name,
channel->stream_count);
+ health_code_update(&health_thread_kernel);
+
ret = consumer_send_channel(sock, &lkm);
if (ret < 0) {
goto error;
}
ret = consumer_send_channel(sock, &lkm);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_kernel);
+
error:
return ret;
}
error:
return ret;
}
@@
-63,7
+68,8
@@
error:
/*
* Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
*/
/*
* Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
*/
-int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
+int kernel_consumer_add_metadata(struct consumer_socket *sock,
+ struct ltt_kernel_session *session)
{
int ret;
char tmp_path[PATH_MAX];
{
int ret;
char tmp_path[PATH_MAX];
@@
-74,6
+80,7
@@
int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
/* Safety net */
assert(session);
assert(session->consumer);
/* Safety net */
assert(session);
assert(session->consumer);
+ assert(sock);
DBG("Sending metadata %d to kernel consumer", session->metadata_stream_fd);
DBG("Sending metadata %d to kernel consumer", session->metadata_stream_fd);
@@
-120,11
+127,15
@@
int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
"metadata",
1);
"metadata",
1);
+ health_code_update(&health_thread_kernel);
+
ret = consumer_send_channel(sock, &lkm);
if (ret < 0) {
goto error;
}
ret = consumer_send_channel(sock, &lkm);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_kernel);
+
/* Prep stream message structure */
consumer_init_stream_comm_msg(&lkm,
LTTNG_CONSUMER_ADD_STREAM,
/* Prep stream message structure */
consumer_init_stream_comm_msg(&lkm,
LTTNG_CONSUMER_ADD_STREAM,
@@
-141,6
+152,8
@@
int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
pathname,
session->id);
pathname,
session->id);
+ health_code_update(&health_thread_kernel);
+
/* Send stream and file descriptor */
ret = consumer_send_stream(sock, consumer, &lkm,
&session->metadata_stream_fd, 1);
/* Send stream and file descriptor */
ret = consumer_send_stream(sock, consumer, &lkm,
&session->metadata_stream_fd, 1);
@@
-148,6
+161,8
@@
int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
goto error;
}
goto error;
}
+ health_code_update(&health_thread_kernel);
+
error:
return ret;
}
error:
return ret;
}
@@
-155,8
+170,9
@@
error:
/*
* Sending a single stream to the consumer with command ADD_STREAM.
*/
/*
* Sending a single stream to the consumer with command ADD_STREAM.
*/
-int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
- struct ltt_kernel_stream *stream, struct ltt_kernel_session *session)
+int kernel_consumer_add_stream(struct consumer_socket *sock,
+ struct ltt_kernel_channel *channel, struct ltt_kernel_stream *stream,
+ struct ltt_kernel_session *session)
{
int ret;
char tmp_path[PATH_MAX];
{
int ret;
char tmp_path[PATH_MAX];
@@
-168,6
+184,7
@@
int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
assert(stream);
assert(session);
assert(session->consumer);
assert(stream);
assert(session);
assert(session->consumer);
+ assert(sock);
DBG("Sending stream %d of channel %s to kernel consumer",
stream->fd, channel->channel->name);
DBG("Sending stream %d of channel %s to kernel consumer",
stream->fd, channel->channel->name);
@@
-211,12
+228,16
@@
int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
pathname,
session->id);
pathname,
session->id);
+ health_code_update(&health_thread_kernel);
+
/* Send stream and file descriptor */
ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
if (ret < 0) {
goto error;
}
/* Send stream and file descriptor */
ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_kernel);
+
error:
return ret;
}
error:
return ret;
}
@@
-224,7
+245,7
@@
error:
/*
* Send all stream fds of kernel channel to the consumer.
*/
/*
* Send all stream fds of kernel channel to the consumer.
*/
-int kernel_consumer_send_channel_stream(
int
sock,
+int kernel_consumer_send_channel_stream(
struct consumer_socket *
sock,
struct ltt_kernel_channel *channel, struct ltt_kernel_session *session)
{
int ret;
struct ltt_kernel_channel *channel, struct ltt_kernel_session *session)
{
int ret;
@@
-234,6
+255,7
@@
int kernel_consumer_send_channel_stream(int sock,
assert(channel);
assert(session);
assert(session->consumer);
assert(channel);
assert(session);
assert(session->consumer);
+ assert(sock);
/* Bail out if consumer is disabled */
if (!session->consumer->enabled) {
/* Bail out if consumer is disabled */
if (!session->consumer->enabled) {
@@
-269,7
+291,8
@@
error:
/*
* Send all stream fds of the kernel session to the consumer.
*/
/*
* Send all stream fds of the kernel session to the consumer.
*/
-int kernel_consumer_send_session(int sock, struct ltt_kernel_session *session)
+int kernel_consumer_send_session(struct consumer_socket *sock,
+ struct ltt_kernel_session *session)
{
int ret;
struct ltt_kernel_channel *chan;
{
int ret;
struct ltt_kernel_channel *chan;
@@
-277,6
+300,7
@@
int kernel_consumer_send_session(int sock, struct ltt_kernel_session *session)
/* Safety net */
assert(session);
assert(session->consumer);
/* Safety net */
assert(session);
assert(session->consumer);
+ assert(sock);
/* Bail out if consumer is disabled */
if (!session->consumer->enabled) {
/* Bail out if consumer is disabled */
if (!session->consumer->enabled) {
This page took
0.025345 seconds
and
4
git commands to generate.