*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <inttypes.h>
#include <sys/mman.h>
#include <unistd.h>
const unsigned long padding_size =
subbuffer->info.data.padded_subbuf_size -
subbuffer->info.data.subbuf_size;
-
- return lttng_consumer_on_read_subbuffer_mmap(
+ const ssize_t written_bytes = lttng_consumer_on_read_subbuffer_mmap(
stream, &subbuffer->buffer.buffer, padding_size);
+
+ if (stream->net_seq_idx == -1ULL) {
+ /*
+ * When writing on disk, check that only the subbuffer (no
+ * padding) was written to disk.
+ */
+ if (written_bytes != subbuffer->info.data.padded_subbuf_size) {
+ DBG("Failed to write the entire padded subbuffer on disk (written_bytes: %zd, padded subbuffer size %lu)",
+ written_bytes,
+ subbuffer->info.data.padded_subbuf_size);
+ }
+ } else {
+ /*
+ * When streaming over the network, check that the entire
+ * subbuffer including padding was successfully written.
+ */
+ if (written_bytes != subbuffer->info.data.subbuf_size) {
+ DBG("Failed to write only the subbuffer over the network (written_bytes: %zd, subbuffer size %lu)",
+ written_bytes,
+ subbuffer->info.data.subbuf_size);
+ }
+ }
+
+ /*
+ * If `lttng_consumer_on_read_subbuffer_mmap()` returned an error, pass
+ * it along to the caller, else return zero.
+ */
+ if (written_bytes < 0) {
+ ERR("Error reading mmap subbuffer: %zd", written_bytes);
+ }
+
+ return written_bytes;
}
static ssize_t consumer_stream_consume_splice(
struct lttng_consumer_stream *stream,
const struct stream_subbuffer *subbuffer)
{
- return lttng_consumer_on_read_subbuffer_splice(ctx, stream,
- subbuffer->info.data.padded_subbuf_size, 0);
+ const ssize_t written_bytes = lttng_consumer_on_read_subbuffer_splice(
+ ctx, stream, subbuffer->info.data.padded_subbuf_size, 0);
+
+ if (written_bytes != subbuffer->info.data.padded_subbuf_size) {
+ DBG("Failed to write the entire padded subbuffer (written_bytes: %zd, padded subbuffer size %lu)",
+ written_bytes,
+ subbuffer->info.data.padded_subbuf_size);
+ }
+
+ /*
+ * If `lttng_consumer_on_read_subbuffer_splice()` returned an error,
+ * pass it along to the caller, else return zero.
+ */
+ if (written_bytes < 0) {
+ ERR("Error reading splice subbuffer: %zd", written_bytes);
+ }
+
+ return written_bytes;
}
static int consumer_stream_send_index(
int ret;
enum sync_metadata_status status;
- assert(metadata);
- assert(metadata->metadata_flag);
- assert(ctx);
+ LTTNG_ASSERT(metadata);
+ LTTNG_ASSERT(metadata->metadata_flag);
+ LTTNG_ASSERT(ctx);
/*
* In UST, since we have to write the metadata from the cache packet
struct lttng_ht_iter iter;
struct lttng_ht *ht;
- assert(ctx);
+ LTTNG_ASSERT(ctx);
/* Ease our life a bit. */
- ht = consumer_data.stream_list_ht;
+ ht = the_consumer_data.stream_list_ht;
rcu_read_lock();
/* Block until all the metadata is sent. */
pthread_mutex_lock(&stream->metadata_timer_lock);
- assert(!stream->missed_metadata_flush);
+ LTTNG_ASSERT(!stream->missed_metadata_flush);
stream->waiting_on_metadata = true;
pthread_mutex_unlock(&stream->metadata_timer_lock);
goto end;
}
+ rcu_read_lock();
+
if (trace_chunk && !lttng_trace_chunk_get(trace_chunk)) {
ERR("Failed to acquire trace chunk reference during the creation of a stream");
ret = -1;
goto error;
}
- rcu_read_lock();
stream->chan = channel;
stream->key = stream_key;
stream->trace_chunk = trace_chunk;
{
int ret;
- assert(stream);
- assert(relayd);
+ LTTNG_ASSERT(stream);
+ LTTNG_ASSERT(relayd);
if (stream->sent_to_relayd) {
uatomic_dec(&relayd->refcount);
- assert(uatomic_read(&relayd->refcount) >= 0);
+ LTTNG_ASSERT(uatomic_read(&relayd->refcount) >= 0);
}
/* Closing streams requires to lock the control socket. */
int ret;
struct consumer_relayd_sock_pair *relayd;
- assert(stream);
+ LTTNG_ASSERT(stream);
- switch (consumer_data.type) {
+ switch (the_consumer_data.type) {
case LTTNG_CONSUMER_KERNEL:
if (stream->mmap_base != NULL) {
ret = munmap(stream->mmap_base, stream->mmap_len);
}
default:
ERR("Unknown consumer_data type");
- assert(0);
+ abort();
}
/* Close output fd. Could be a socket or local file at this point. */
int ret;
struct lttng_ht_iter iter;
- assert(stream);
+ LTTNG_ASSERT(stream);
/* Should NEVER be called not in monitor mode. */
- assert(stream->chan->monitor);
+ LTTNG_ASSERT(stream->chan->monitor);
rcu_read_lock();
if (ht) {
iter.iter.node = &stream->node.node;
ret = lttng_ht_del(ht, &iter);
- assert(!ret);
+ LTTNG_ASSERT(!ret);
}
/* Delete from stream per channel ID hash table. */
* that did not add the stream to a (all) hash table. Same goes for the
* next call ht del call.
*/
- (void) lttng_ht_del(consumer_data.stream_per_chan_id_ht, &iter);
+ (void) lttng_ht_del(the_consumer_data.stream_per_chan_id_ht, &iter);
/* Delete from the global stream list. */
iter.iter.node = &stream->node_session_id.node;
/* See the previous ht del on why we ignore the returned value. */
- (void) lttng_ht_del(consumer_data.stream_list_ht, &iter);
+ (void) lttng_ht_del(the_consumer_data.stream_list_ht, &iter);
rcu_read_unlock();
if (!stream->metadata_flag) {
/* Decrement the stream count of the global consumer data. */
- assert(consumer_data.stream_count > 0);
- consumer_data.stream_count--;
+ LTTNG_ASSERT(the_consumer_data.stream_count > 0);
+ the_consumer_data.stream_count--;
}
}
*/
void consumer_stream_free(struct lttng_consumer_stream *stream)
{
- assert(stream);
+ LTTNG_ASSERT(stream);
metadata_bucket_destroy(stream->metadata_bucket);
call_rcu(&stream->node.head, free_stream_rcu);
*/
void consumer_stream_destroy_buffers(struct lttng_consumer_stream *stream)
{
- assert(stream);
+ LTTNG_ASSERT(stream);
- switch (consumer_data.type) {
+ switch (the_consumer_data.type) {
case LTTNG_CONSUMER_KERNEL:
break;
case LTTNG_CONSUMER32_UST:
break;
default:
ERR("Unknown consumer_data type");
- assert(0);
+ abort();
}
}
*/
static void destroy_close_stream(struct lttng_consumer_stream *stream)
{
- assert(stream);
+ LTTNG_ASSERT(stream);
DBG("Consumer stream destroy monitored key: %" PRIu64, stream->key);
{
struct lttng_consumer_channel *free_chan = NULL;
- assert(stream);
- assert(stream->chan);
+ LTTNG_ASSERT(stream);
+ LTTNG_ASSERT(stream->chan);
/* Update refcount of channel and see if we need to destroy it. */
if (!uatomic_sub_return(&stream->chan->refcount, 1)
void consumer_stream_destroy(struct lttng_consumer_stream *stream,
struct lttng_ht *ht)
{
- assert(stream);
+ LTTNG_ASSERT(stream);
/* Stream is in monitor mode. */
if (stream->monitor) {
* stream thus being globally visible.
*/
if (stream->globally_visible) {
- pthread_mutex_lock(&consumer_data.lock);
+ pthread_mutex_lock(&the_consumer_data.lock);
pthread_mutex_lock(&stream->chan->lock);
pthread_mutex_lock(&stream->lock);
/* Remove every reference of the stream in the consumer. */
free_chan = unref_channel(stream);
/* Indicates that the consumer data state MUST be updated after this. */
- consumer_data.need_update = 1;
+ the_consumer_data.need_update = 1;
pthread_mutex_unlock(&stream->lock);
pthread_mutex_unlock(&stream->chan->lock);
- pthread_mutex_unlock(&consumer_data.lock);
+ pthread_mutex_unlock(&the_consumer_data.lock);
} else {
/*
* If the stream is not visible globally, this needs to be done
{
int ret;
- assert(stream);
- assert(element);
+ LTTNG_ASSERT(stream);
+ LTTNG_ASSERT(element);
rcu_read_lock();
if (stream->net_seq_idx != (uint64_t) -1ULL) {
char stream_path[LTTNG_PATH_MAX];
ASSERT_LOCKED(stream->lock);
- assert(stream->trace_chunk);
+ LTTNG_ASSERT(stream->trace_chunk);
ret = utils_stream_file_path(stream->chan->pathname, stream->name,
stream->chan->tracefile_size,
goto end;
}
stream->out_fd = -1;
- }
+ }
DBG("Opening stream output file \"%s\"", stream_path);
chunk_status = lttng_trace_chunk_open_file(stream->trace_chunk, stream_path,
flags, mode, &stream->out_fd, false);
- if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
ERR("Failed to open stream file \"%s\"", stream->name);
ret = -1;
goto end;
- }
+ }
if (!stream->metadata_flag && (create_index || stream->index_file)) {
if (stream->index_file) {
* This function does not take a const stream since
* cds_lfht_is_node_deleted was not const before liburcu 0.12.
*/
- assert(stream);
+ LTTNG_ASSERT(stream);
return cds_lfht_is_node_deleted(&stream->node.node);
}
{
int ret = 0;
- assert(stream->metadata_flag);
- assert(!stream->metadata_bucket);
- assert(stream->chan->output == CONSUMER_CHANNEL_MMAP);
+ LTTNG_ASSERT(stream->metadata_flag);
+ LTTNG_ASSERT(!stream->metadata_bucket);
+ LTTNG_ASSERT(stream->chan->output == CONSUMER_CHANNEL_MMAP);
stream->metadata_bucket = metadata_bucket_create(
metadata_bucket_flush, stream);
void consumer_stream_metadata_set_version(
struct lttng_consumer_stream *stream, uint64_t new_version)
{
- assert(new_version > stream->metadata_version);
+ LTTNG_ASSERT(new_version > stream->metadata_version);
stream->metadata_version = new_version;
stream->reset_metadata_flag = 1;
{
int ret = 0;
- switch (consumer_data.type) {
+ switch (the_consumer_data.type) {
case LTTNG_CONSUMER_KERNEL:
if (producer_active) {
ret = kernctl_buffer_flush(stream->wait_fd);
break;
case LTTNG_CONSUMER32_UST:
case LTTNG_CONSUMER64_UST:
- lttng_ustconsumer_flush_buffer(stream, (int) producer_active);
+ ret = lttng_ustconsumer_flush_buffer(stream, (int) producer_active);
break;
default:
ERR("Unknown consumer_data type");
projects / lttng-tools.git / blobdiff