projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo in ust consumer log message (channek -> channel)
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index b26cc19f923d23da7806be92069c395b7a99aaa3..70bd140672e8ddb7aa5d4c3c39835148aee85ec9 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-407,9
+407,7
@@
error_shm_open:
return -1;
}
return -1;
}
-static int open_ust_stream_fd(struct lttng_consumer_channel *channel,
- struct ustctl_consumer_channel_attr *attr,
- int cpu)
+static int open_ust_stream_fd(struct lttng_consumer_channel *channel, int cpu)
{
char shm_path[PATH_MAX];
int ret;
{
char shm_path[PATH_MAX];
int ret;
@@
-464,7
+462,7
@@
static int create_ust_channel(struct lttng_consumer_channel *channel,
goto error_alloc;
}
for (i = 0; i < nr_stream_fds; i++) {
goto error_alloc;
}
for (i = 0; i < nr_stream_fds; i++) {
- stream_fds[i] = open_ust_stream_fd(channel,
attr,
i);
+ stream_fds[i] = open_ust_stream_fd(channel, i);
if (stream_fds[i] < 0) {
ret = -1;
goto error_open;
if (stream_fds[i] < 0) {
ret = -1;
goto error_open;
@@
-540,11
+538,11
@@
error:
}
/*
}
/*
- * Send channel to sessiond.
+ * Send channel to sessiond
and relayd if applicable
.
*
* Return 0 on success or else a negative value.
*/
*
* Return 0 on success or else a negative value.
*/
-static int send_
sessiond_channel
(int sock,
+static int send_
channel_to_sessiond_and_relayd
(int sock,
struct lttng_consumer_channel *channel,
struct lttng_consumer_local_data *ctx, int *relayd_error)
{
struct lttng_consumer_channel *channel,
struct lttng_consumer_local_data *ctx, int *relayd_error)
{
@@
-564,6
+562,8
@@
static int send_sessiond_channel(int sock,
health_code_update();
/* Try to send the stream to the relayd if one is available. */
health_code_update();
/* Try to send the stream to the relayd if one is available. */
+ DBG("Sending stream %" PRIu64 " of channel \"%s\" to relayd",
+ stream->key, channel->name);
ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
if (ret < 0) {
/*
ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
if (ret < 0) {
/*
@@
-639,7
+639,7
@@
error:
* Return 0 on success or else, a negative value is returned and the channel
* MUST be destroyed by consumer_del_channel().
*/
* Return 0 on success or else, a negative value is returned and the channel
* MUST be destroyed by consumer_del_channel().
*/
-static int ask_channel(struct lttng_consumer_local_data *ctx,
int sock,
+static int ask_channel(struct lttng_consumer_local_data *ctx,
struct lttng_consumer_channel *channel,
struct ustctl_consumer_channel_attr *attr)
{
struct lttng_consumer_channel *channel,
struct ustctl_consumer_channel_attr *attr)
{
@@
-1492,7
+1492,7
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
health_code_update();
health_code_update();
- ret = ask_channel(ctx,
sock,
channel, &attr);
+ ret = ask_channel(ctx, channel, &attr);
if (ret < 0) {
goto end_channel_error;
}
if (ret < 0) {
goto end_channel_error;
}
@@
-1577,8
+1577,9
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
health_code_update();
health_code_update();
- /* Send everything to sessiond. */
- ret = send_sessiond_channel(sock, channel, ctx, &relayd_err);
+ /* Send the channel to sessiond (and relayd, if applicable). */
+ ret = send_channel_to_sessiond_and_relayd(sock, channel, ctx,
+ &relayd_err);
if (ret < 0) {
if (relayd_err) {
/*
if (ret < 0) {
if (relayd_err) {
/*
@@
-3117,7
+3118,7
@@
int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
request.key = channel->key;
DBG("Sending metadata request to sessiond, session id %" PRIu64
request.key = channel->key;
DBG("Sending metadata request to sessiond, session id %" PRIu64
- ", per-pid %" PRIu64 ", app UID %u and channe
k
key %" PRIu64,
+ ", per-pid %" PRIu64 ", app UID %u and channe
l
key %" PRIu64,
request.session_id, request.session_id_per_pid, request.uid,
request.key);
request.session_id, request.session_id_per_pid, request.uid,
request.key);
This page took
0.027202 seconds
and
5
git commands to generate.