projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: health subsystem issues with shared code
[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 2a9bf9983d937223e5131ed5c0d374599c052000..7fae5b0e96f08c2c1c1deb8197e4e9ec4f73c2e8 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-52,11
+52,15
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
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;
}
@@
-120,14
+124,18
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
session->metadata->fd,
session->metadata->conf->attr.subbuf_size,
0, /* for kernel */
session->metadata->fd,
session->metadata->conf->attr.subbuf_size,
0, /* for kernel */
-
"metadata"
,
+
DEFAULT_METADATA_NAME
,
1);
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,
@@
-140,10
+148,12
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
session->gid,
consumer->net_seq_index,
1, /* Metadata flag set */
session->gid,
consumer->net_seq_index,
1, /* Metadata flag set */
-
"metadata"
,
+
DEFAULT_METADATA_NAME
,
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);
@@
-151,6
+161,8
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
goto error;
}
goto error;
}
+ health_code_update(&health_thread_kernel);
+
error:
return ret;
}
error:
return ret;
}
@@
-216,12
+228,16
@@
int kernel_consumer_add_stream(struct consumer_socket *sock,
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;
}
This page took
0.025364 seconds
and
4
git commands to generate.