projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer metadata switch timer error handling
[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 bc0f585385814f1ba25be632f2a21fbd04232de9..0edb513f89c15263b2244983dcbf22626f95c734 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-223,7
+223,9
@@
static int send_stream_to_relayd(struct lttng_consumer_stream *stream)
pthread_mutex_lock(&relayd->ctrl_sock_mutex);
/* Add stream on the relayd */
ret = relayd_add_stream(&relayd->control_sock, stream->name,
pthread_mutex_lock(&relayd->ctrl_sock_mutex);
/* Add stream on the relayd */
ret = relayd_add_stream(&relayd->control_sock, stream->name,
- stream->chan->pathname, &stream->relayd_stream_id);
+ stream->chan->pathname, &stream->relayd_stream_id,
+ stream->chan->tracefile_size,
+ stream->chan->tracefile_count);
pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
if (ret < 0) {
goto error;
pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
if (ret < 0) {
goto error;
@@
-554,7
+556,7
@@
int lttng_ustconsumer_push_metadata(struct lttng_consumer_channel *metadata,
ret = ustctl_write_metadata_to_channel(metadata->uchan,
metadata_str + target_offset, len);
if (ret < 0) {
ret = ustctl_write_metadata_to_channel(metadata->uchan,
metadata_str + target_offset, len);
if (ret < 0) {
- ERR("ustctl write metadata fail with ret %d, len %
ld"
, ret, len);
+ ERR("ustctl write metadata fail with ret %d, len %
" PRIu64
, ret, len);
goto error;
}
goto error;
}
@@
-577,11
+579,11
@@
static int flush_channel(uint64_t chan_key)
struct lttng_ht *ht;
struct lttng_ht_iter iter;
struct lttng_ht *ht;
struct lttng_ht_iter iter;
- DBG("UST consumer flush channel key %
lu"
, chan_key);
+ DBG("UST consumer flush channel key %
" PRIu64
, chan_key);
channel = consumer_find_channel(chan_key);
if (!channel) {
channel = consumer_find_channel(chan_key);
if (!channel) {
- ERR("UST consumer flush channel %
lu
not found", chan_key);
+ ERR("UST consumer flush channel %
" PRIu64 "
not found", chan_key);
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto error;
}
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto error;
}
@@
-611,11
+613,11
@@
static int close_metadata(uint64_t chan_key)
int ret;
struct lttng_consumer_channel *channel;
int ret;
struct lttng_consumer_channel *channel;
- DBG("UST consumer close metadata key %
lu"
, chan_key);
+ DBG("UST consumer close metadata key %
" PRIu64
, chan_key);
channel = consumer_find_channel(chan_key);
if (!channel) {
channel = consumer_find_channel(chan_key);
if (!channel) {
- ERR("UST consumer close metadata %
lu
not found", chan_key);
+ ERR("UST consumer close metadata %
" PRIu64 "
not found", chan_key);
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto error;
}
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto error;
}
@@
-646,7
+648,7
@@
static int setup_metadata(struct lttng_consumer_local_data *ctx, uint64_t key)
int ret;
struct lttng_consumer_channel *metadata;
int ret;
struct lttng_consumer_channel *metadata;
- DBG("UST consumer setup metadata key %
lu"
, key);
+ DBG("UST consumer setup metadata key %
" PRIu64
, key);
metadata = consumer_find_channel(key);
if (!metadata) {
metadata = consumer_find_channel(key);
if (!metadata) {
@@
-699,7
+701,7
@@
int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset,
int ret, ret_code = LTTNG_OK;
char *metadata_str;
int ret, ret_code = LTTNG_OK;
char *metadata_str;
- DBG("UST consumer push metadata key %
lu of len %lu"
, key, len);
+ DBG("UST consumer push metadata key %
" PRIu64 " of len %" PRIu64
, key, len);
metadata_str = zmalloc(len * sizeof(char));
if (!metadata_str) {
metadata_str = zmalloc(len * sizeof(char));
if (!metadata_str) {
@@
-941,7
+943,7
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
channel = consumer_find_channel(key);
if (!channel) {
channel = consumer_find_channel(key);
if (!channel) {
- ERR("UST consumer get channel key %
lu
not found", key);
+ ERR("UST consumer get channel key %
" PRIu64 "
not found", key);
ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto end_msg_sessiond;
}
ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto end_msg_sessiond;
}
@@
-992,7
+994,7
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
channel = consumer_find_channel(key);
if (!channel) {
channel = consumer_find_channel(key);
if (!channel) {
- ERR("UST consumer get channel key %
lu
not found", key);
+ ERR("UST consumer get channel key %
" PRIu64 "
not found", key);
ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto end_msg_sessiond;
}
ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
goto end_msg_sessiond;
}
@@
-1031,11
+1033,12
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
uint64_t offset = msg.u.push_metadata.target_offset;
struct lttng_consumer_channel *channel;
uint64_t offset = msg.u.push_metadata.target_offset;
struct lttng_consumer_channel *channel;
- DBG("UST consumer push metadata key %lu of len %lu", key, len);
+ DBG("UST consumer push metadata key %" PRIu64 " of len %" PRIu64, key,
+ len);
channel = consumer_find_channel(key);
if (!channel) {
channel = consumer_find_channel(key);
if (!channel) {
- ERR("UST consumer push metadata %
lu
not found", key);
+ ERR("UST consumer push metadata %
" PRIu64 "
not found", key);
ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
}
ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
}
@@
-1272,7
+1275,7
@@
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
* happen and it is OK with the code flow.
*/
DBG("Error writing to tracefile "
* happen and it is OK with the code flow.
*/
DBG("Error writing to tracefile "
- "(ret: %
z
d != len: %lu != subbuf_size: %lu)",
+ "(ret: %
l
d != len: %lu != subbuf_size: %lu)",
ret, len, subbuf_size);
}
err = ustctl_put_next_subbuf(ustream);
ret, len, subbuf_size);
}
err = ustctl_put_next_subbuf(ustream);
@@
-1431,7
+1434,7
@@
int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
ret = lttcomm_recv_unix_sock(ctx->consumer_metadata_socket, &msg,
sizeof(msg));
if (ret != sizeof(msg)) {
ret = lttcomm_recv_unix_sock(ctx->consumer_metadata_socket, &msg,
sizeof(msg));
if (ret != sizeof(msg)) {
- DBG("Consumer received unexpected message size %d (expects %
l
u)",
+ DBG("Consumer received unexpected message size %d (expects %
z
u)",
ret, sizeof(msg));
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_ERROR_RECV_CMD);
/*
ret, sizeof(msg));
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_ERROR_RECV_CMD);
/*
This page took
0.026693 seconds
and
4
git commands to generate.