projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename consumer socket fd to fd_ptr
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 6c6386d2b3b1107255260110175743fa04ccf9bf..85904c812cdbab2f53ef0747014ad274a2e38ac4 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-690,9
+690,6
@@
static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
rcu_read_lock();
cds_lfht_for_each_entry(ksess->consumer->socks->ht,
&iter.iter, socket, node.node) {
rcu_read_lock();
cds_lfht_for_each_entry(ksess->consumer->socks->ht,
&iter.iter, socket, node.node) {
- /* Code flow error */
- assert(socket->fd);
-
pthread_mutex_lock(socket->lock);
ret = kernel_consumer_send_channel_stream(socket,
channel, ksess,
pthread_mutex_lock(socket->lock);
ret = kernel_consumer_send_channel_stream(socket,
channel, ksess,
@@
-1030,7
+1027,7
@@
restart:
signal_consumer_condition(consumer_data, -1);
goto error;
}
signal_consumer_condition(consumer_data, -1);
goto error;
}
- consumer_data->metadata_sock.fd = &consumer_data->metadata_fd;
+ consumer_data->metadata_sock.fd
_ptr
= &consumer_data->metadata_fd;
/* Create metadata socket lock. */
consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
if (consumer_data->metadata_sock.lock == NULL) {
/* Create metadata socket lock. */
consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
if (consumer_data->metadata_sock.lock == NULL) {
@@
-1173,8
+1170,8
@@
error:
}
consumer_data->cmd_sock = -1;
}
}
consumer_data->cmd_sock = -1;
}
- if (*consumer_data->metadata_sock.fd >= 0) {
- ret = close(*consumer_data->metadata_sock.fd);
+ if (*consumer_data->metadata_sock.fd
_ptr
>= 0) {
+ ret = close(*consumer_data->metadata_sock.fd
_ptr
);
if (ret) {
PERROR("close");
}
if (ret) {
PERROR("close");
}
This page took
0.02397 seconds
and
4
git commands to generate.