*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
goto error;
}
- assert(session_name_len <= UINT32_MAX);
+ LTTNG_ASSERT(session_name_len <= UINT32_MAX);
msg->session_name_len = htobe32(session_name_len);
- assert(hostname_len <= UINT32_MAX);
+ LTTNG_ASSERT(hostname_len <= UINT32_MAX);
msg->hostname_len = htobe32(hostname_len);
- assert(base_path_len <= UINT32_MAX);
+ LTTNG_ASSERT(base_path_len <= UINT32_MAX);
msg->base_path_len = htobe32(base_path_len);
dst = msg->names;
int ret;
struct lttcomm_relayd_create_session_reply_2_11 reply = {};
- assert(rsock);
- assert(relayd_session_id);
+ LTTNG_ASSERT(rsock);
+ LTTNG_ASSERT(relayd_session_id);
DBG("Relayd create session");
goto error;
}
- assert(channel_name_len <= UINT32_MAX);
+ LTTNG_ASSERT(channel_name_len <= UINT32_MAX);
msg->channel_name_len = htobe32(channel_name_len);
- assert(pathname_len <= UINT32_MAX);
+ LTTNG_ASSERT(pathname_len <= UINT32_MAX);
msg->pathname_len = htobe32(pathname_len);
if (lttng_strncpy(msg->names, channel_name, channel_name_len)) {
int ret;
struct lttcomm_relayd_status_stream reply;
char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
- const char *separator;
/* Code flow error. Safety net. */
- assert(rsock);
- assert(channel_name);
- assert(domain_name);
- assert(_pathname);
- assert(trace_chunk);
+ LTTNG_ASSERT(rsock);
+ LTTNG_ASSERT(channel_name);
+ LTTNG_ASSERT(domain_name);
+ LTTNG_ASSERT(_pathname);
+ LTTNG_ASSERT(trace_chunk);
DBG("Relayd adding stream for channel name %s", channel_name);
- if (_pathname[0] == '\0') {
- separator = "";
- } else {
- separator = "/";
- }
- ret = snprintf(pathname, RELAYD_COMM_LTTNG_PATH_MAX, "%s%s%s",
- domain_name, separator, _pathname);
- if (ret <= 0 || ret >= RELAYD_COMM_LTTNG_PATH_MAX) {
- ERR("stream path too long.");
- ret = -1;
- goto error;
- }
-
/* Compat with relayd 2.1 */
if (rsock->minor == 1) {
/* For 2.1 */
- ret = relayd_add_stream_2_1(rsock, channel_name, pathname);
+ ret = relayd_add_stream_2_1(rsock, channel_name, _pathname);
} else if (rsock->minor > 1 && rsock->minor < 11) {
/* From 2.2 to 2.10 */
- ret = relayd_add_stream_2_2(rsock, channel_name, pathname,
+ ret = relayd_add_stream_2_2(rsock, channel_name, _pathname,
tracefile_size, tracefile_count);
} else {
+ const char *separator;
enum lttng_trace_chunk_status chunk_status;
uint64_t chunk_id;
+ if (_pathname[0] == '\0') {
+ separator = "";
+ } else {
+ separator = "/";
+ }
+
+ ret = snprintf(pathname, RELAYD_COMM_LTTNG_PATH_MAX, "%s%s%s",
+ domain_name, separator, _pathname);
+ if (ret <= 0 || ret >= RELAYD_COMM_LTTNG_PATH_MAX) {
+ ERR("Failed to format stream path: %s",
+ ret <= 0 ? "formatting error" :
+ "path exceeds maximal allowed length");
+ ret = -1;
+ goto error;
+ }
+
chunk_status = lttng_trace_chunk_get_id(trace_chunk,
&chunk_id);
- assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+ LTTNG_ASSERT(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
/* From 2.11 to ...*/
ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd sending streams sent.");
struct lttcomm_relayd_version msg;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd version check for major.minor %u.%u", rsock->major,
rsock->minor);
int ret;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd sending metadata of size %zu", len);
int relayd_connect(struct lttcomm_relayd_sock *rsock)
{
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
if (!rsock->sock.ops) {
/*
int ret;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
/* An invalid fd is fine, return success. */
if (rsock->sock.fd < 0) {
int ret;
/* Code flow error. Safety net. */
- assert(rsock);
- assert(hdr);
+ LTTNG_ASSERT(rsock);
+ LTTNG_ASSERT(hdr);
if (rsock->sock.fd < 0) {
return -ECONNRESET;
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd closing stream id %" PRIu64, stream_id);
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd data pending for stream id %" PRIu64, stream_id);
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd checking quiescent control state");
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd begin data pending");
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
DBG("Relayd end data pending");
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
if (rsock->minor < 4) {
DBG("Not sending indexes before protocol 2.4");
struct lttcomm_relayd_generic_reply reply;
/* Code flow error. Safety net. */
- assert(rsock);
+ LTTNG_ASSERT(rsock);
/* Should have been prevented by the sessiond. */
if (rsock->minor < 8) {
lttng_dynamic_buffer_init(&payload);
/* Code flow error. Safety net. */
- assert(sock);
+ LTTNG_ASSERT(sock);
if (new_chunk_id) {
ret = snprintf(new_chunk_id_buf, sizeof(new_chunk_id_buf),