projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: agent events HT should be destroyed from the cleanup thread
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.c
diff --git
a/src/bin/lttng-sessiond/consumer.c
b/src/bin/lttng-sessiond/consumer.c
index 8806e9c322bef43b818975bee8f44bc520e3aa53..ce3e5da9adda44d3481c4bb07785a30f76ac14f5 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-207,6
+207,7
@@
int consumer_send_destroy_relayd(struct consumer_socket *sock,
DBG2("Sending destroy relayd command to consumer sock %d", *sock->fd_ptr);
DBG2("Sending destroy relayd command to consumer sock %d", *sock->fd_ptr);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_RELAYD;
msg.u.destroy_relayd.net_seq_idx = consumer->net_seq_index;
msg.cmd_type = LTTNG_CONSUMER_DESTROY_RELAYD;
msg.u.destroy_relayd.net_seq_idx = consumer->net_seq_index;
@@
-965,6
+966,7
@@
int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
assert(consumer);
assert(consumer_sock);
assert(consumer);
assert(consumer_sock);
+ memset(&msg, 0, sizeof(msg));
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
ret = LTTNG_OK;
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
ret = LTTNG_OK;
@@
-1078,12
+1080,12
@@
int consumer_is_data_pending(uint64_t session_id,
assert(consumer);
assert(consumer);
-
msg.cmd_type = LTTNG_CONSUMER_DATA_PENDING
;
+
DBG3("Consumer data pending for id %" PRIu64, session_id)
;
+ memset(&msg, 0, sizeof(msg));
+ msg.cmd_type = LTTNG_CONSUMER_DATA_PENDING;
msg.u.data_pending.session_id = session_id;
msg.u.data_pending.session_id = session_id;
- DBG3("Consumer data pending for id %" PRIu64, session_id);
-
/* Send command for each consumer */
rcu_read_lock();
cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket,
/* Send command for each consumer */
rcu_read_lock();
cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket,
@@
-1136,6
+1138,7
@@
int consumer_flush_channel(struct consumer_socket *socket, uint64_t key)
DBG2("Consumer flush channel key %" PRIu64, key);
DBG2("Consumer flush channel key %" PRIu64, key);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_FLUSH_CHANNEL;
msg.u.flush_channel.key = key;
msg.cmd_type = LTTNG_CONSUMER_FLUSH_CHANNEL;
msg.u.flush_channel.key = key;
@@
-1168,6
+1171,7
@@
int consumer_close_metadata(struct consumer_socket *socket,
DBG2("Consumer close metadata channel key %" PRIu64, metadata_key);
DBG2("Consumer close metadata channel key %" PRIu64, metadata_key);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_CLOSE_METADATA;
msg.u.close_metadata.key = metadata_key;
msg.cmd_type = LTTNG_CONSUMER_CLOSE_METADATA;
msg.u.close_metadata.key = metadata_key;
@@
-1200,6
+1204,7
@@
int consumer_setup_metadata(struct consumer_socket *socket,
DBG2("Consumer setup metadata channel key %" PRIu64, metadata_key);
DBG2("Consumer setup metadata channel key %" PRIu64, metadata_key);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_SETUP_METADATA;
msg.u.setup_metadata.key = metadata_key;
msg.cmd_type = LTTNG_CONSUMER_SETUP_METADATA;
msg.u.setup_metadata.key = metadata_key;
@@
-1233,6
+1238,7
@@
int consumer_push_metadata(struct consumer_socket *socket,
DBG2("Consumer push metadata to consumer socket %d", *socket->fd_ptr);
DBG2("Consumer push metadata to consumer socket %d", *socket->fd_ptr);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_PUSH_METADATA;
msg.u.push_metadata.key = metadata_key;
msg.u.push_metadata.target_offset = target_offset;
msg.cmd_type = LTTNG_CONSUMER_PUSH_METADATA;
msg.u.push_metadata.key = metadata_key;
msg.u.push_metadata.target_offset = target_offset;
This page took
0.028231 seconds
and
4
git commands to generate.