projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: append_list_to_probes(): increment index
[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 308798eb1019943652e1d50ef67f7c1de9c2ae81..f77f67d7f4731333bd44088554e0768fce85685a 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"
@@
-102,7
+102,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
struct ust_app_channel *ua_chan, struct consumer_output *consumer,
struct consumer_socket *socket, struct ust_registry_session *registry)
{
struct ust_app_channel *ua_chan, struct consumer_output *consumer,
struct consumer_socket *socket, struct ust_registry_session *registry)
{
- int ret;
+ int ret
, output
;
uint32_t chan_id;
uint64_t key, chan_reg_key;
char *pathname = NULL;
uint32_t chan_id;
uint64_t key, chan_reg_key;
char *pathname = NULL;
@@
-141,6
+141,13
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
chan_id = chan_reg->chan_id;
}
chan_id = chan_reg->chan_id;
}
+ switch (ua_chan->attr.output) {
+ case LTTNG_UST_MMAP:
+ default:
+ output = LTTNG_EVENT_MMAP;
+ break;
+ }
+
consumer_init_ask_channel_comm_msg(&msg,
ua_chan->attr.subbuf_size,
ua_chan->attr.num_subbuf,
consumer_init_ask_channel_comm_msg(&msg,
ua_chan->attr.subbuf_size,
ua_chan->attr.num_subbuf,
@@
-148,7
+155,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
ua_sess->live_timer_interval,
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
ua_sess->live_timer_interval,
-
(int) ua_chan->attr.
output,
+ output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
pathname,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
pathname,
@@
-243,6
+250,7
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
assert(ua_chan);
assert(socket);
assert(ua_chan);
assert(socket);
+ memset(&msg, 0, sizeof(msg));
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;
@@
-300,7
+308,7
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
cds_list_add_tail(&stream->list, &ua_chan->streams.head);
ua_chan->streams.count++;
cds_list_add_tail(&stream->list, &ua_chan->streams.head);
ua_chan->streams.count++;
- DBG2("UST app stream %d received succesfully", ua_chan->streams.count);
+ DBG2("UST app stream %d received succes
s
fully", ua_chan->streams.count);
}
/* This MUST match or else we have a synchronization problem. */
}
/* This MUST match or else we have a synchronization problem. */
@@
-337,6
+345,7
@@
int ust_consumer_destroy_channel(struct consumer_socket *socket,
assert(ua_chan);
assert(socket);
assert(ua_chan);
assert(socket);
+ memset(&msg, 0, sizeof(msg));
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;
@@
-374,8
+383,8
@@
int ust_consumer_send_stream_to_ust(struct ust_app *app,
ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
- ERR("
Error ustctl send stream %s
to app pid: %d with ret %d",
- stream->
nam
e, app->pid, ret);
+ ERR("
ustctl send stream handle %d
to app pid: %d with ret %d",
+ stream->
obj->handl
e, app->pid, ret);
} else {
DBG3("UST app send stream to ust failed. Application is dead.");
}
} else {
DBG3("UST app send stream to ust failed. Application is dead.");
}
@@
-438,12
+447,12
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
assert(socket);
rcu_read_lock();
assert(socket);
rcu_read_lock();
- pthread_mutex_lock(socket->lock);
-
health_code_update();
/* Wait for a metadata request */
health_code_update();
/* Wait for a metadata request */
+ pthread_mutex_lock(socket->lock);
ret = consumer_socket_recv(socket, &request, sizeof(request));
ret = consumer_socket_recv(socket, &request, sizeof(request));
+ pthread_mutex_unlock(socket->lock);
if (ret < 0) {
goto end;
}
if (ret < 0) {
goto end;
}
@@
-462,6
+471,7
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
DBG("PID registry not found for session id %" PRIu64,
request.session_id_per_pid);
DBG("PID registry not found for session id %" PRIu64,
request.session_id_per_pid);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_ERR_UND;
(void) consumer_send_msg(socket, &msg);
/*
msg.cmd_type = LTTNG_ERR_UND;
(void) consumer_send_msg(socket, &msg);
/*
@@
-477,7
+487,9
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
}
assert(ust_reg);
}
assert(ust_reg);
+ pthread_mutex_lock(&ust_reg->lock);
ret_push = ust_app_push_metadata(ust_reg, socket, 1);
ret_push = ust_app_push_metadata(ust_reg, socket, 1);
+ pthread_mutex_unlock(&ust_reg->lock);
if (ret_push < 0) {
ERR("Pushing metadata");
ret = -1;
if (ret_push < 0) {
ERR("Pushing metadata");
ret = -1;
@@
-487,7
+499,6
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
ret = 0;
end:
ret = 0;
end:
- pthread_mutex_unlock(socket->lock);
rcu_read_unlock();
return ret;
}
rcu_read_unlock();
return ret;
}
This page took
0.026747 seconds
and
4
git commands to generate.