projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for '-Wunused-parameter'
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer-stream.cpp
diff --git
a/src/common/consumer/consumer-stream.cpp
b/src/common/consumer/consumer-stream.cpp
index f9807cb0173f4bf6f4a7c0e9f838afb4631c16ec..ebbd66a8ba06abc8b871001a272d2e888cd1a0c0 100644
(file)
--- a/
src/common/consumer/consumer-stream.cpp
+++ b/
src/common/consumer/consumer-stream.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2011
Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011
EfficiOS Inc.
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
*
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
*
@@
-160,7
+160,7
@@
void ctf_packet_index_populate(struct ctf_packet_index *index,
}
static ssize_t consumer_stream_consume_mmap(
}
static ssize_t consumer_stream_consume_mmap(
- struct lttng_consumer_local_data *ctx,
+ struct lttng_consumer_local_data *ctx
__attribute__((unused))
,
struct lttng_consumer_stream *stream,
const struct stream_subbuffer *subbuffer)
{
struct lttng_consumer_stream *stream,
const struct stream_subbuffer *subbuffer)
{
@@
-231,7
+231,7
@@
static ssize_t consumer_stream_consume_splice(
static int consumer_stream_send_index(
struct lttng_consumer_stream *stream,
const struct stream_subbuffer *subbuffer,
static int consumer_stream_send_index(
struct lttng_consumer_stream *stream,
const struct stream_subbuffer *subbuffer,
- struct lttng_consumer_local_data *ctx)
+ struct lttng_consumer_local_data *ctx
__attribute__((unused))
)
{
off_t packet_offset = 0;
struct ctf_packet_index index = {};
{
off_t packet_offset = 0;
struct ctf_packet_index index = {};
@@
-591,8
+591,8
@@
end:
*/
static
int post_consume_open_new_packet(struct lttng_consumer_stream *stream,
*/
static
int post_consume_open_new_packet(struct lttng_consumer_stream *stream,
- const struct stream_subbuffer *subbuffer,
- struct lttng_consumer_local_data *ctx)
+ const struct stream_subbuffer *subbuffer
__attribute__((unused))
,
+ struct lttng_consumer_local_data *ctx
__attribute__((unused))
)
{
int ret = 0;
{
int ret = 0;
@@
-669,6
+669,7
@@
struct lttng_consumer_stream *consumer_stream_create(
goto error;
}
goto error;
}
+ stream->send_node = CDS_LIST_HEAD_INIT(stream->send_node);
stream->chan = channel;
stream->key = stream_key;
stream->trace_chunk = trace_chunk;
stream->chan = channel;
stream->key = stream_key;
stream->trace_chunk = trace_chunk;
@@
-1060,6
+1061,8
@@
void consumer_stream_destroy(struct lttng_consumer_stream *stream,
{
LTTNG_ASSERT(stream);
{
LTTNG_ASSERT(stream);
+ cds_list_del_init(&stream->send_node);
+
/* Stream is in monitor mode. */
if (stream->monitor) {
struct lttng_consumer_channel *free_chan = NULL;
/* Stream is in monitor mode. */
if (stream->monitor) {
struct lttng_consumer_channel *free_chan = NULL;
@@
-1092,6
+1095,7
@@
void consumer_stream_destroy(struct lttng_consumer_stream *stream,
* If the stream is not visible globally, this needs to be done
* outside of the consumer data lock section.
*/
* If the stream is not visible globally, this needs to be done
* outside of the consumer data lock section.
*/
+ destroy_close_stream(stream);
free_chan = unref_channel(stream);
}
free_chan = unref_channel(stream);
}
@@
-1270,7
+1274,7
@@
end:
}
static ssize_t metadata_bucket_consume(
}
static ssize_t metadata_bucket_consume(
- struct lttng_consumer_local_data *unused,
+ struct lttng_consumer_local_data *unused
__attribute__((unused))
,
struct lttng_consumer_stream *stream,
const struct stream_subbuffer *subbuffer)
{
struct lttng_consumer_stream *stream,
const struct stream_subbuffer *subbuffer)
{
This page took
0.026844 seconds
and
4
git commands to generate.