projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ust event exclusion UST ABI to internal copy
[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 7f01de9ea55516223a78fc885886aa774485f934..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"
@@
-61,7
+61,7
@@
static char *setup_trace_path(struct consumer_output *consumer,
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
- ret = snprintf(pathname, PATH_MAX, "%s
/%s/
%s",
+ ret = snprintf(pathname, PATH_MAX, "%s
%s
%s",
consumer->dst.trace_path, consumer->subdir, ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
consumer->dst.trace_path, consumer->subdir, ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
@@
-78,7
+78,7
@@
static char *setup_trace_path(struct consumer_output *consumer,
}
}
} else {
}
}
} else {
- ret = snprintf(pathname, PATH_MAX, "%s
/
%s", consumer->subdir,
+ ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir,
ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
@@
-118,10
+118,12
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
DBG2("Asking UST consumer for channel");
/* Get and create full trace path of session. */
DBG2("Asking UST consumer for channel");
/* Get and create full trace path of session. */
- pathname = setup_trace_path(consumer, ua_sess);
- if (!pathname) {
- ret = -1;
- goto error;
+ if (ua_sess->output_traces) {
+ pathname = setup_trace_path(consumer, ua_sess);
+ if (!pathname) {
+ ret = -1;
+ goto error;
+ }
}
/* Depending on the buffer type, a different channel key is used. */
}
/* Depending on the buffer type, a different channel key is used. */
@@
-145,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,
@@
-155,11
+158,16
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
consumer->net_seq_index,
ua_chan->key,
registry->uuid,
consumer->net_seq_index,
ua_chan->key,
registry->uuid,
- chan_id);
+ chan_id,
+ ua_chan->tracefile_size,
+ ua_chan->tracefile_count,
+ ua_sess->id,
+ ua_sess->output_traces,
+ ua_sess->uid);
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;
}
@@
-172,7
+180,9
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
/* Communication protocol error. */
assert(key == ua_chan->key);
/* We need at least one where 1 stream for 1 cpu. */
/* Communication protocol error. */
assert(key == ua_chan->key);
/* We need at least one where 1 stream for 1 cpu. */
- assert(ua_chan->expected_stream_count > 0);
+ if (ua_sess->output_traces) {
+ assert(ua_chan->expected_stream_count > 0);
+ }
DBG2("UST ask channel %" PRIu64 " successfully done with %u stream(s)", key,
ua_chan->expected_stream_count);
DBG2("UST ask channel %" PRIu64 " successfully done with %u stream(s)", key,
ua_chan->expected_stream_count);
@@
-198,9
+208,14
@@
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);
assert(registry);
+ if (!consumer->enabled) {
+ ret = -LTTNG_ERR_NO_CONSUMER;
+ DBG3("Consumer is disabled");
+ goto error;
+ }
+
pthread_mutex_lock(socket->lock);
ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
pthread_mutex_lock(socket->lock);
ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
@@
-227,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;
@@
-242,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.");
}
@@
-265,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) {
@@
-275,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.");
}
@@
-322,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;
@@
-430,14
+443,12
@@
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;
}
- DBG("Metadata request received for session %
u
, key %" PRIu64,
+ DBG("Metadata request received for session %
" PRIu64 "
, key %" PRIu64,
request.session_id, request.key);
reg_uid = buffer_reg_uid_find(request.session_id,
request.session_id, request.key);
reg_uid = buffer_reg_uid_find(request.session_id,
@@
-446,10
+457,10
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
ust_reg = reg_uid->registry->reg.ust;
} else {
struct buffer_reg_pid *reg_pid =
ust_reg = reg_uid->registry->reg.ust;
} else {
struct buffer_reg_pid *reg_pid =
- buffer_reg_pid_find(request.session_id);
+ buffer_reg_pid_find(request.session_id
_per_pid
);
if (!reg_pid) {
if (!reg_pid) {
- DBG("PID registry not found for session id %
u"
,
- request.session_id);
+ DBG("PID registry not found for session id %
" PRIu64
,
+ request.session_id
_per_pid
);
msg.cmd_type = LTTNG_ERR_UND;
(void) consumer_send_msg(socket, &msg);
msg.cmd_type = LTTNG_ERR_UND;
(void) consumer_send_msg(socket, &msg);
This page took
0.030792 seconds
and
5
git commands to generate.