projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add exclusion data to trace_ust_find_event
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index d6fe58cd971aa9f1f770f99860a65129c329ac76..ee56d6dea67b61406fd1d5ba946c03a23e6612a3 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-28,7
+28,7
@@
#include <common/defaults.h>
#include "consumer.h"
#include <common/defaults.h>
#include "consumer.h"
-#include "health.h"
+#include "health
-sessiond
.h"
#include "ust-consumer.h"
#include "buffer-registry.h"
#include "session.h"
#include "ust-consumer.h"
#include "buffer-registry.h"
#include "session.h"
@@
-147,6
+147,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
ua_chan->attr.overwrite,
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
ua_chan->attr.overwrite,
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
+ ua_sess->live_timer_interval,
(int) ua_chan->attr.output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
(int) ua_chan->attr.output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
@@
-166,7
+167,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
health_code_update();
health_code_update();
- ret =
lttcomm_send_unix_sock(socket->fd
, &msg, sizeof(msg));
+ ret =
consumer_socket_send(socket
, &msg, sizeof(msg));
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
@@
-207,7
+208,6
@@
int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
assert(ua_chan);
assert(consumer);
assert(socket);
assert(ua_chan);
assert(consumer);
assert(socket);
- assert(socket->fd >= 0);
assert(registry);
if (!consumer->enabled) {
assert(registry);
if (!consumer->enabled) {
@@
-242,7
+242,6
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
assert(ua_chan);
assert(socket);
assert(ua_chan);
assert(socket);
- assert(socket->fd >= 0);
msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
msg.u.get_channel.key = ua_chan->key;
msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
msg.u.get_channel.key = ua_chan->key;
@@
-257,11
+256,11
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
}
/* First, get the channel from consumer. */
}
/* First, get the channel from consumer. */
- ret = ustctl_recv_channel_from_consumer(
socket->fd
, &ua_chan->obj);
+ ret = ustctl_recv_channel_from_consumer(
*socket->fd_ptr
, &ua_chan->obj);
if (ret < 0) {
if (ret != -EPIPE) {
ERR("Error recv channel from consumer %d with ret %d",
if (ret < 0) {
if (ret != -EPIPE) {
ERR("Error recv channel from consumer %d with ret %d",
-
socket->fd
, ret);
+
*socket->fd_ptr
, ret);
} else {
DBG3("UST app recv channel from consumer. Consumer is dead.");
}
} else {
DBG3("UST app recv channel from consumer. Consumer is dead.");
}
@@
-280,7
+279,7
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
}
/* Stream object is populated by this call if successful. */
}
/* Stream object is populated by this call if successful. */
- ret = ustctl_recv_stream_from_consumer(
socket->fd
, &stream->obj);
+ ret = ustctl_recv_stream_from_consumer(
*socket->fd_ptr
, &stream->obj);
if (ret < 0) {
free(stream);
if (ret == -LTTNG_UST_ERR_NOENT) {
if (ret < 0) {
free(stream);
if (ret == -LTTNG_UST_ERR_NOENT) {
@@
-290,7
+289,7
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
}
if (ret != -EPIPE) {
ERR("Recv stream from consumer %d with ret %d",
}
if (ret != -EPIPE) {
ERR("Recv stream from consumer %d with ret %d",
-
socket->fd
, ret);
+
*socket->fd_ptr
, ret);
} else {
DBG3("UST app recv stream from consumer. Consumer is dead.");
}
} else {
DBG3("UST app recv stream from consumer. Consumer is dead.");
}
@@
-337,7
+336,6
@@
int ust_consumer_destroy_channel(struct consumer_socket *socket,
assert(ua_chan);
assert(socket);
assert(ua_chan);
assert(socket);
- assert(socket->fd >= 0);
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = ua_chan->key;
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = ua_chan->key;
@@
-445,10
+443,8
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
health_code_update();
/* Wait for a metadata request */
health_code_update();
/* Wait for a metadata request */
- ret = lttcomm_recv_unix_sock(socket->fd, &request, sizeof(request));
- if (ret <= 0) {
- ERR("Consumer closed the metadata socket");
- ret = -1;
+ ret = consumer_socket_recv(socket, &request, sizeof(request));
+ if (ret < 0) {
goto end;
}
goto end;
}
This page took
0.026081 seconds
and
4
git commands to generate.