projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use single callsite for send/recv ops. for consumer in sessiond
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 64fa5c0bb5c1e870cd11d1f7e6cd3a69f2b7c6da..dcb5da5f44864a84af1004669c760b6a77e5f06a 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-463,7
+463,7
@@
static int init_kernel_tracing(struct ltt_kernel_session *session)
cds_lfht_for_each_entry(session->consumer->socks->ht, &iter.iter,
socket, node.node) {
/* Code flow error */
cds_lfht_for_each_entry(session->consumer->socks->ht, &iter.iter,
socket, node.node) {
/* Code flow error */
- assert(socket->fd
>= 0
);
+ assert(socket->fd);
pthread_mutex_lock(socket->lock);
ret = kernel_consumer_send_session(socket, session);
pthread_mutex_lock(socket->lock);
ret = kernel_consumer_send_session(socket, session);
@@
-675,7
+675,7
@@
int cmd_setup_relayd(struct ltt_session *session)
cds_lfht_for_each_entry(usess->consumer->socks->ht, &iter.iter,
socket, node.node) {
/* Code flow error */
cds_lfht_for_each_entry(usess->consumer->socks->ht, &iter.iter,
socket, node.node) {
/* Code flow error */
- assert(socket->fd
>= 0
);
+ assert(socket->fd);
pthread_mutex_lock(socket->lock);
ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_UST, session->id,
pthread_mutex_lock(socket->lock);
ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_UST, session->id,
@@
-694,7
+694,7
@@
int cmd_setup_relayd(struct ltt_session *session)
cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
socket, node.node) {
/* Code flow error */
cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
socket, node.node) {
/* Code flow error */
- assert(socket->fd
>= 0
);
+ assert(socket->fd);
pthread_mutex_lock(socket->lock);
ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_KERNEL, session->id,
pthread_mutex_lock(socket->lock);
ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_KERNEL, session->id,
@@
-2027,13
+2027,15
@@
int cmd_register_consumer(struct ltt_session *session, int domain,
ret = LTTNG_ERR_CONNECT_FAIL;
goto error;
}
ret = LTTNG_ERR_CONNECT_FAIL;
goto error;
}
+ cdata->cmd_sock = sock;
- socket = consumer_allocate_socket(sock);
+ socket = consumer_allocate_socket(
&cdata->cmd_
sock);
if (socket == NULL) {
ret = close(sock);
if (ret < 0) {
PERROR("close register consumer");
}
if (socket == NULL) {
ret = close(sock);
if (ret < 0) {
PERROR("close register consumer");
}
+ cdata->cmd_sock = -1;
ret = LTTNG_ERR_FATAL;
goto error;
}
ret = LTTNG_ERR_FATAL;
goto error;
}
@@
-2577,13
+2579,7
@@
static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
}
ret = kernel_snapshot_record(ksess, output, wait, nb_streams);
}
ret = kernel_snapshot_record(ksess, output, wait, nb_streams);
- if (ret < 0) {
- if (ret == -EINVAL) {
- ret = LTTNG_ERR_INVALID;
- goto error_snapshot;
- }
-
- ret = LTTNG_ERR_SNAPSHOT_FAIL;
+ if (ret != LTTNG_OK) {
goto error_snapshot;
}
goto error_snapshot;
}
@@
-2836,6
+2832,8
@@
int cmd_snapshot_record(struct ltt_session *session,
if (snapshot_success) {
session->snapshot.nb_snapshot++;
if (snapshot_success) {
session->snapshot.nb_snapshot++;
+ } else {
+ ret = LTTNG_ERR_SNAPSHOT_FAIL;
}
error:
}
error:
This page took
0.027453 seconds
and
4
git commands to generate.