projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge duplicate code in consumer for add relayd
[lttng-tools.git]
/
src
/
common
/
consumer.h
diff --git
a/src/common/consumer.h
b/src/common/consumer.h
index 8e7cec9944e88381a28fca8984ea0e3ac64c487b..da3c4ce5a69b75c8eafc5bb9eeefa4cba2778026 100644
(file)
--- a/
src/common/consumer.h
+++ b/
src/common/consumer.h
@@
-17,8
+17,8
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef
_LTTNG
_CONSUMER_H
-#define
_LTTNG
_CONSUMER_H
+#ifndef
LIB
_CONSUMER_H
+#define
LIB
_CONSUMER_H
#include <limits.h>
#include <poll.h>
#include <limits.h>
#include <poll.h>
@@
-54,6
+54,8
@@
enum lttng_consumer_command {
/* inform the consumer to quit when all fd has hang up */
LTTNG_CONSUMER_STOP,
LTTNG_CONSUMER_ADD_RELAYD_SOCKET,
/* inform the consumer to quit when all fd has hang up */
LTTNG_CONSUMER_STOP,
LTTNG_CONSUMER_ADD_RELAYD_SOCKET,
+ /* Inform the consumer to kill a specific relayd connection */
+ LTTNG_CONSUMER_DESTROY_RELAYD,
};
/* State of each fd in consumer */
};
/* State of each fd in consumer */
@@
-128,6
+130,8
@@
struct lttng_consumer_stream {
unsigned int metadata_flag;
/* Used when the stream is set for network streaming */
uint64_t relayd_stream_id;
unsigned int metadata_flag;
/* Used when the stream is set for network streaming */
uint64_t relayd_stream_id;
+ /* Next sequence number to use for trace packet */
+ uint64_t next_net_seq_num;
};
/*
};
/*
@@
-138,6
+142,14
@@
struct consumer_relayd_sock_pair {
int net_seq_idx;
/* Number of stream associated with this relayd */
unsigned int refcount;
int net_seq_idx;
/* Number of stream associated with this relayd */
unsigned int refcount;
+
+ /*
+ * This flag indicates whether or not we should destroy this object. The
+ * destruction should ONLY occurs when this flag is set and the refcount is
+ * set to zero.
+ */
+ unsigned int destroy_flag;
+
/*
* Mutex protecting the control socket to avoid out of order packets
* between threads sending data to the relayd. Since metadata data is sent
/*
* Mutex protecting the control socket to avoid out of order packets
* between threads sending data to the relayd. Since metadata data is sent
@@
-339,6
+351,7
@@
struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair(
struct consumer_relayd_sock_pair *consumer_find_relayd(int key);
int consumer_handle_stream_before_relayd(struct lttng_consumer_stream *stream,
size_t data_size);
struct consumer_relayd_sock_pair *consumer_find_relayd(int key);
int consumer_handle_stream_before_relayd(struct lttng_consumer_stream *stream,
size_t data_size);
+void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd);
extern struct lttng_consumer_local_data *lttng_consumer_create(
enum lttng_consumer_type type,
extern struct lttng_consumer_local_data *lttng_consumer_create(
enum lttng_consumer_type type,
@@
-368,5
+381,8
@@
extern int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
struct lttng_consumer_local_data *ctx);
int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);
ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
struct lttng_consumer_local_data *ctx);
int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);
+int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
+ struct lttng_consumer_local_data *ctx, int sock,
+ struct pollfd *consumer_sockpoll, struct lttcomm_sock *relayd_sock);
-#endif /*
_LTTNG
_CONSUMER_H */
+#endif /*
LIB
_CONSUMER_H */
This page took
0.025039 seconds
and
4
git commands to generate.