projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Channel rotate pipe between sessiond and the consumers
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
stream.h
diff --git
a/src/bin/lttng-relayd/stream.h
b/src/bin/lttng-relayd/stream.h
index ca6be8133dc9cd963f5fcdbdae379b813119ef84..e385032cb71f98d4994dfad241e915f61e0cb28a 100644
(file)
--- a/
src/bin/lttng-relayd/stream.h
+++ b/
src/bin/lttng-relayd/stream.h
@@
-37,12
+37,6
@@
struct relay_stream {
uint64_t stream_handle;
struct relay_stream {
uint64_t stream_handle;
- /*
- * reflock used to synchronize the closing of this stream.
- * stream reflock nests inside viewer stream reflock.
- * stream reflock nests inside index reflock.
- */
- pthread_mutex_t reflock;
struct urcu_ref ref;
/* Back reference to trace. Protected by refcount on trace object. */
struct ctf_trace *trace;
struct urcu_ref ref;
/* Back reference to trace. Protected by refcount on trace object. */
struct ctf_trace *trace;
@@
-58,8
+52,8
@@
struct relay_stream {
/* FD on which to write the stream data. */
struct stream_fd *stream_fd;
/* FD on which to write the stream data. */
struct stream_fd *stream_fd;
- /*
FD
on which to write the index data. */
- struct
stream_fd *index_fd
;
+ /*
index file
on which to write the index data. */
+ struct
lttng_index_file *index_file
;
char *path_name;
char *channel_name;
char *path_name;
char *channel_name;
@@
-85,7
+79,8
@@
struct relay_stream {
*/
struct tracefile_array *tfa;
*/
struct tracefile_array *tfa;
- bool closed; /* Stream is closed. */
+ bool closed; /* Stream is closed. */
+ bool close_requested; /* Close command has been received. */
/*
* Counts number of indexes in indexes_ht. Redundant info.
/*
* Counts number of indexes in indexes_ht. Redundant info.
@@
-132,6
+127,7
@@
struct relay_stream {
* Node of stream within global stream hash table.
*/
struct lttng_ht_node_u64 node;
* Node of stream within global stream hash table.
*/
struct lttng_ht_node_u64 node;
+ bool in_stream_ht; /* is stream in stream hash table. */
struct rcu_head rcu_node; /* For call_rcu teardown. */
};
struct rcu_head rcu_node; /* For call_rcu teardown. */
};
@@
-143,7
+139,7
@@
struct relay_stream *stream_create(struct ctf_trace *trace,
struct relay_stream *stream_get_by_id(uint64_t stream_id);
bool stream_get(struct relay_stream *stream);
void stream_put(struct relay_stream *stream);
struct relay_stream *stream_get_by_id(uint64_t stream_id);
bool stream_get(struct relay_stream *stream);
void stream_put(struct relay_stream *stream);
-void stream_close(struct relay_stream *stream);
+void
try_
stream_close(struct relay_stream *stream);
void stream_publish(struct relay_stream *stream);
void print_relay_streams(void);
void stream_publish(struct relay_stream *stream);
void print_relay_streams(void);
This page took
0.024489 seconds
and
4
git commands to generate.