projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: implicit conversion from enumeration
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index d15329ffab2f91c601a8b838af5cd805470f10ab..cca522dadd5a3210fd5ef79d5496e13eeedddfbc 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-35,6
+35,7
@@
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/sessiond-comm/relayd.h>
#include <common/compat/fcntl.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/sessiond-comm/relayd.h>
#include <common/compat/fcntl.h>
+#include <common/compat/endian.h>
#include <common/pipe.h>
#include <common/relayd/relayd.h>
#include <common/utils.h>
#include <common/pipe.h>
#include <common/relayd/relayd.h>
#include <common/utils.h>
@@
-561,7
+562,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
* happens while tearing down.
*/
ERR("Unable to find channel key %" PRIu64, msg.u.stream.channel_key);
* happens while tearing down.
*/
ERR("Unable to find channel key %" PRIu64, msg.u.stream.channel_key);
- ret_code = LTT
NG_ERR_KERN
_CHAN_NOT_FOUND;
+ ret_code = LTT
COMM_CONSUMERD
_CHAN_NOT_FOUND;
}
health_code_update();
}
health_code_update();
@@
-764,7
+765,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
*/
ERR("Unable to find channel key %" PRIu64,
msg.u.sent_streams.channel_key);
*/
ERR("Unable to find channel key %" PRIu64,
msg.u.sent_streams.channel_key);
- ret_code = LTT
NG_ERR_KERN
_CHAN_NOT_FOUND;
+ ret_code = LTT
COMM_CONSUMERD
_CHAN_NOT_FOUND;
}
health_code_update();
}
health_code_update();
@@
-815,7
+816,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
relayd = consumer_find_relayd(index);
if (relayd == NULL) {
DBG("Unable to find relayd %" PRIu64, index);
relayd = consumer_find_relayd(index);
if (relayd == NULL) {
DBG("Unable to find relayd %" PRIu64, index);
- ret_code = LTT
NG_ERR_NO_CONSUMER
;
+ ret_code = LTT
COMM_CONSUMERD_RELAYD_FAIL
;
}
/*
}
/*
@@
-874,7
+875,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
msg.u.snapshot_channel.relayd_id, ctx);
if (ret < 0) {
ERR("Snapshot metadata failed");
msg.u.snapshot_channel.relayd_id, ctx);
if (ret < 0) {
ERR("Snapshot metadata failed");
- ret_code = LTT
NG_ERR_KERN_META_FAIL
;
+ ret_code = LTT
COMM_CONSUMERD_ERROR_METADATA
;
}
} else {
ret = lttng_kconsumer_snapshot_channel(msg.u.snapshot_channel.key,
}
} else {
ret = lttng_kconsumer_snapshot_channel(msg.u.snapshot_channel.key,
@@
-884,7
+885,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
ctx);
if (ret < 0) {
ERR("Snapshot channel failed");
ctx);
if (ret < 0) {
ERR("Snapshot channel failed");
- ret_code = LTT
NG_ERR_KERN_CHAN_FAIL
;
+ ret_code = LTT
COMM_CONSUMERD_CHAN_NOT_FOUND
;
}
}
}
}
@@
-905,7
+906,7
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
channel = consumer_find_channel(key);
if (!channel) {
ERR("Kernel consumer destroy channel %" PRIu64 " not found", key);
channel = consumer_find_channel(key);
if (!channel) {
ERR("Kernel consumer destroy channel %" PRIu64 " not found", key);
- ret_code = LTT
NG_ERR_KERN
_CHAN_NOT_FOUND;
+ ret_code = LTT
COMM_CONSUMERD
_CHAN_NOT_FOUND;
}
health_code_update();
}
health_code_update();
This page took
0.028425 seconds
and
4
git commands to generate.