projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng-consumerd: cpu hotplug: send "streams_sent" command
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer.h
diff --git
a/src/common/consumer/consumer.h
b/src/common/consumer/consumer.h
index 256ea1976016feffcf805d5d5bd0df3d8598a2bf..7375373c76113ab791a5e06027e8f0599a1494f6 100644
(file)
--- a/
src/common/consumer/consumer.h
+++ b/
src/common/consumer/consumer.h
@@
-61,6
+61,7
@@
enum lttng_consumer_command {
LTTNG_CONSUMER_DISCARDED_EVENTS,
LTTNG_CONSUMER_LOST_PACKETS,
LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
LTTNG_CONSUMER_DISCARDED_EVENTS,
LTTNG_CONSUMER_LOST_PACKETS,
LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
+ LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE,
};
/* State of each fd in consumer */
};
/* State of each fd in consumer */
@@
-160,6
+161,7
@@
struct lttng_consumer_channel {
/* Metadata cache is metadata channel */
struct consumer_metadata_cache *metadata_cache;
/* Metadata cache is metadata channel */
struct consumer_metadata_cache *metadata_cache;
+
/* For UST metadata periodical flush */
int switch_timer_enabled;
timer_t switch_timer;
/* For UST metadata periodical flush */
int switch_timer_enabled;
timer_t switch_timer;
@@
-170,6
+172,10
@@
struct lttng_consumer_channel {
timer_t live_timer;
int live_timer_error;
timer_t live_timer;
int live_timer_error;
+ /* For channel monitoring timer. */
+ int monitor_timer_enabled;
+ timer_t monitor_timer;
+
/* On-disk circular buffer */
uint64_t tracefile_size;
uint64_t tracefile_count;
/* On-disk circular buffer */
uint64_t tracefile_size;
uint64_t tracefile_count;
@@
-218,6
+224,8
@@
struct lttng_consumer_channel {
uint64_t discarded_events;
/* Total number of missed packets due to overwriting (overwrite). */
uint64_t lost_packets;
uint64_t discarded_events;
/* Total number of missed packets due to overwriting (overwrite). */
uint64_t lost_packets;
+
+ bool streams_sent_to_relayd;
};
/*
};
/*
@@
-337,9
+345,9
@@
struct lttng_consumer_stream {
* Lock to use the stream FDs since they are used between threads.
*
* This is nested INSIDE the consumer_data lock.
* Lock to use the stream FDs since they are used between threads.
*
* This is nested INSIDE the consumer_data lock.
- * This is nested INSIDE the metadata cache lock.
* This is nested INSIDE the channel lock.
* This is nested INSIDE the channel timer lock.
* This is nested INSIDE the channel lock.
* This is nested INSIDE the channel timer lock.
+ * This is nested OUTSIDE the metadata cache lock.
* This is nested OUTSIDE consumer_relayd_sock_pair lock.
*/
pthread_mutex_t lock;
* This is nested OUTSIDE consumer_relayd_sock_pair lock.
*/
pthread_mutex_t lock;
@@
-390,9
+398,9
@@
struct lttng_consumer_stream {
/* Copy of the sequence number of the last packet extracted. */
uint64_t last_sequence_number;
/*
/* Copy of the sequence number of the last packet extracted. */
uint64_t last_sequence_number;
/*
- *
FD
of the index file for this stream.
+ *
Index file object
of the index file for this stream.
*/
*/
-
int index_fd
;
+
struct lttng_index_file *index_file
;
/*
* Local pipe to extract data when using splice.
/*
* Local pipe to extract data when using splice.
@@
-539,6
+547,11
@@
struct lttng_consumer_local_data {
int consumer_should_quit[2];
/* Metadata poll thread pipe. Transfer metadata stream to it */
struct lttng_pipe *consumer_metadata_pipe;
int consumer_should_quit[2];
/* Metadata poll thread pipe. Transfer metadata stream to it */
struct lttng_pipe *consumer_metadata_pipe;
+ /*
+ * Pipe used by the channel monitoring timers to provide state samples
+ * to the session daemon (write-only).
+ */
+ int channel_monitor_pipe;
};
/*
};
/*
@@
-591,6
+604,9
@@
struct lttng_consumer_global_data {
struct lttng_ht *stream_per_chan_id_ht;
};
struct lttng_ht *stream_per_chan_id_ht;
};
+/* Flag used to temporarily pause data consumption from testpoints. */
+extern int data_consumption_paused;
+
/*
* Init consumer data structures.
*/
/*
* Init consumer data structures.
*/
This page took
0.02529 seconds
and
4
git commands to generate.