summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6bf5e7c)
This removes all the type mismatch warnings for x86 architecture.
Signed-off-by: David Goulet <dgoulet@efficios.com>
DBG("Socket %d did an orderly shutdown", sock->fd);
} else {
ERR("Relay didn't receive valid add_stream struct size. "
DBG("Socket %d did an orderly shutdown", sock->fd);
} else {
ERR("Relay didn't receive valid add_stream struct size. "
- "Expected %lu, got %d", len, ret);
+ "Expected %zu, got %d", len, ret);
- DBG3("Consumer pushing metadata on sock %d of len %lu", socket->fd, len);
+ DBG3("Consumer pushing metadata on sock %d of len %zu", socket->fd, len);
ret = lttcomm_send_unix_sock(socket->fd, metadata_str, len);
if (ret < 0) {
ret = lttcomm_send_unix_sock(socket->fd, metadata_str, len);
if (ret < 0) {
- DBG3("Relayd waiting for reply of size %ld", size);
+ DBG3("Relayd waiting for reply of size %zu", size);
ret = rsock->sock.ops->recvmsg(&rsock->sock, data, size, 0);
if (ret <= 0 || ret != size) {
ret = rsock->sock.ops->recvmsg(&rsock->sock, data, size, 0);
if (ret <= 0 || ret != size) {
/* Orderly shutdown. */
DBG("Socket %d has performed an orderly shutdown", rsock->sock.fd);
} else {
/* Orderly shutdown. */
DBG("Socket %d has performed an orderly shutdown", rsock->sock.fd);
} else {
- DBG("Receiving reply failed on sock %d for size %lu with ret %d",
+ DBG("Receiving reply failed on sock %d for size %zu with ret %d",
rsock->sock.fd, size, ret);
}
/* Always return -1 here and the caller can use errno. */
rsock->sock.fd, size, ret);
}
/* Always return -1 here and the caller can use errno. */
assert(rsock);
assert(hdr);
assert(rsock);
assert(hdr);
- DBG3("Relayd sending data header of size %ld", size);
+ DBG3("Relayd sending data header of size %zu", size);
/* Again, safety net */
if (size == 0) {
/* Again, safety net */
if (size == 0) {
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);
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;
}
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;
}
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) {
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) {
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;
}
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;
}
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;
}
* 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: %zd != len: %lu != subbuf_size: %lu)",
+ "(ret: %ld != 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);
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 %lu)",
+ DBG("Consumer received unexpected message size %d (expects %zu)",
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);
/*