projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support LTTNG_KERNEL_SESSION_SET_CREATION_DATETIME of lttng-modules
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
stream.c
diff --git
a/src/bin/lttng-relayd/stream.c
b/src/bin/lttng-relayd/stream.c
index d11e436a9587019c54920841013fb9fad249088c..efe132d1cbdebf27f943b7f5f0aa28ff3c6e68f7 100644
(file)
--- a/
src/bin/lttng-relayd/stream.c
+++ b/
src/bin/lttng-relayd/stream.c
@@
-383,6
+383,7
@@
static int create_index_file(struct relay_stream *stream,
int ret;
uint32_t major, minor;
char *index_subpath = NULL;
int ret;
uint32_t major, minor;
char *index_subpath = NULL;
+ enum lttng_trace_chunk_status status;
ASSERT_LOCKED(stream->lock);
ASSERT_LOCKED(stream->lock);
@@
-404,10
+405,11
@@
static int create_index_file(struct relay_stream *stream,
goto end;
}
goto end;
}
-
ret
= lttng_trace_chunk_create_subdirectory(chunk,
+
status
= lttng_trace_chunk_create_subdirectory(chunk,
index_subpath);
free(index_subpath);
index_subpath);
free(index_subpath);
- if (ret) {
+ if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ ret = -1;
goto end;
}
stream->index_file = lttng_index_file_create_from_trace_chunk(
goto end;
}
stream->index_file = lttng_index_file_create_from_trace_chunk(
@@
-920,7
+922,7
@@
int stream_init_packet(struct relay_stream *stream, size_t packet_size,
}
DBG("New stream packet causes stream file rotation: stream_id = %" PRIu64
", current_file_size = %" PRIu64
}
DBG("New stream packet causes stream file rotation: stream_id = %" PRIu64
", current_file_size = %" PRIu64
- ", packet_size = %
" PRIu64 "
, current_file_index = %" PRIu64
+ ", packet_size = %
zu
, current_file_index = %" PRIu64
" new_file_index = %" PRIu64,
stream->stream_handle,
stream->tracefile_size_current, packet_size,
" new_file_index = %" PRIu64,
stream->stream_handle,
stream->tracefile_size_current, packet_size,
@@
-998,10
+1000,10
@@
int stream_write(struct relay_stream *stream,
stream->metadata_received += packet->size + padding_len;
}
stream->metadata_received += packet->size + padding_len;
}
- DBG("Wrote to %sstream %" PRIu64 ": data_length = %
" PRIu64 ", padding_length = %" PRIu64
,
+ DBG("Wrote to %sstream %" PRIu64 ": data_length = %
zu, padding_length = %zu"
,
stream->is_metadata ? "metadata " : "",
stream->stream_handle,
stream->is_metadata ? "metadata " : "",
stream->stream_handle,
- packet ? packet->size : 0, padding_len);
+ packet ? packet->size :
(size_t)
0, padding_len);
end:
return ret;
}
end:
return ret;
}
This page took
0.029607 seconds
and
4
git commands to generate.