projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: send per-pid session id in channel creation
[lttng-tools.git]
/
src
/
common
/
consumer.h
diff --git
a/src/common/consumer.h
b/src/common/consumer.h
index bf87609f3f1aea428128895cdab7ba20cf1f8568..ca567d7ff8844dcdb99b5aab0bb20bf4897e4256 100644
(file)
--- a/
src/common/consumer.h
+++ b/
src/common/consumer.h
@@
-54,6
+54,8
@@
enum lttng_consumer_command {
LTTNG_CONSUMER_CLOSE_METADATA,
LTTNG_CONSUMER_SETUP_METADATA,
LTTNG_CONSUMER_FLUSH_CHANNEL,
LTTNG_CONSUMER_CLOSE_METADATA,
LTTNG_CONSUMER_SETUP_METADATA,
LTTNG_CONSUMER_FLUSH_CHANNEL,
+ LTTNG_CONSUMER_SNAPSHOT_CHANNEL,
+ LTTNG_CONSUMER_SNAPSHOT_METADATA,
};
/* State of each fd in consumer */
};
/* State of each fd in consumer */
@@
-85,6
+87,8
@@
enum consumer_channel_type {
CONSUMER_CHANNEL_TYPE_DATA = 1,
};
CONSUMER_CHANNEL_TYPE_DATA = 1,
};
+extern struct lttng_consumer_global_data consumer_data;
+
struct stream_list {
struct cds_list_head head;
unsigned int count;
struct stream_list {
struct cds_list_head head;
unsigned int count;
@@
-102,6
+106,11
@@
struct lttng_consumer_channel {
int refcount;
/* Tracing session id on the session daemon side. */
uint64_t session_id;
int refcount;
/* Tracing session id on the session daemon side. */
uint64_t session_id;
+ /*
+ * Session id when requesting metadata to the session daemon for
+ * a session with per-PID buffers.
+ */
+ uint64_t session_id_per_pid;
/* Channel trace file path name. */
char pathname[PATH_MAX];
/* Channel name. */
/* Channel trace file path name. */
char pathname[PATH_MAX];
/* Channel name. */
@@
-130,6
+139,13
@@
struct lttng_consumer_channel {
* LTTNG_CONSUMER_GET_CHANNEL.
*/
struct stream_list streams;
* LTTNG_CONSUMER_GET_CHANNEL.
*/
struct stream_list streams;
+
+ /*
+ * List of streams in no monitor mode for this channel. Used ONLY for
+ * snapshots recording.
+ */
+ struct stream_list stream_no_monitor_list;
+
/*
* Set if the channel is metadata. We keep a reference to the stream
* because we have to flush data once pushed by the session daemon. For a
/*
* Set if the channel is metadata. We keep a reference to the stream
* because we have to flush data once pushed by the session daemon. For a
@@
-152,6
+168,12
@@
struct lttng_consumer_channel {
/* On-disk circular buffer */
uint64_t tracefile_size;
uint64_t tracefile_count;
/* On-disk circular buffer */
uint64_t tracefile_size;
uint64_t tracefile_count;
+ /*
+ * Monitor or not the streams of this channel meaning this indicates if the
+ * streams should be sent to the data/metadata thread or added to the no
+ * monitor list of the channel.
+ */
+ unsigned int monitor;
};
/*
};
/*
@@
-243,6
+265,9
@@
struct lttng_consumer_stream {
/* On-disk circular buffer */
uint64_t tracefile_size_current;
uint64_t tracefile_count_current;
/* On-disk circular buffer */
uint64_t tracefile_size_current;
uint64_t tracefile_count_current;
+
+ /* Node for the no monitor stream list in a channel. */
+ struct cds_list_head no_monitor_node;
};
/*
};
/*
@@
-458,7
+483,7
@@
struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
const char *channel_name,
uid_t uid,
gid_t gid,
const char *channel_name,
uid_t uid,
gid_t gid,
-
in
t relayd_id,
+
uint64_
t relayd_id,
uint64_t session_id,
int cpu,
int *alloc_ret,
uint64_t session_id,
int cpu,
int *alloc_ret,
@@
-469,10
+494,12
@@
struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
const char *name,
uid_t uid,
gid_t gid,
const char *name,
uid_t uid,
gid_t gid,
-
in
t relayd_id,
+
uint64_
t relayd_id,
enum lttng_event_output output,
uint64_t tracefile_size,
enum lttng_event_output output,
uint64_t tracefile_size,
- uint64_t tracefile_count);
+ uint64_t tracefile_count,
+ uint64_t session_id_per_pid,
+ unsigned int monitor);
void consumer_del_stream(struct lttng_consumer_stream *stream,
struct lttng_ht *ht);
void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
void consumer_del_stream(struct lttng_consumer_stream *stream,
struct lttng_ht *ht);
void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
@@
-531,5
+558,6
@@
int consumer_send_status_channel(int sock,
struct lttng_consumer_channel *channel);
void notify_thread_del_channel(struct lttng_consumer_local_data *ctx,
uint64_t key);
struct lttng_consumer_channel *channel);
void notify_thread_del_channel(struct lttng_consumer_local_data *ctx,
uint64_t key);
+void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd);
#endif /* LIB_CONSUMER_H */
#endif /* LIB_CONSUMER_H */
This page took
0.024873 seconds
and
4
git commands to generate.