projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests fix: initialize kernel extended channel attributes
[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 8a3533ba10c360097a8fb2cb0099a4f3d986f324..fe2c8f4c8055b41048e6b9645ab7e2e2572f5c21 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-15,7
+15,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <errno.h>
#include <stdio.h>
#define _LGPL_SOURCE
#include <errno.h>
#include <stdio.h>
@@
-25,7
+24,7
@@
#include <inttypes.h>
#include <common/common.h>
#include <inttypes.h>
#include <common/common.h>
-#include <common/consumer.h>
+#include <common/consumer
/consumer
.h>
#include <common/defaults.h>
#include "consumer.h"
#include <common/defaults.h>
#include "consumer.h"
@@
-33,6
+32,7
@@
#include "ust-consumer.h"
#include "buffer-registry.h"
#include "session.h"
#include "ust-consumer.h"
#include "buffer-registry.h"
#include "session.h"
+#include "lttng-sessiond.h"
/*
* Return allocated full pathname of the session using the consumer trace path
/*
* Return allocated full pathname of the session using the consumer trace path
@@
-73,7
+73,7
@@
static char *setup_trace_path(struct consumer_output *consumer,
ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG,
ua_sess->euid, ua_sess->egid);
if (ret < 0) {
ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG,
ua_sess->euid, ua_sess->egid);
if (ret < 0) {
- if (
ret != -
EEXIST) {
+ if (
errno !=
EEXIST) {
ERR("Trace directory creation error");
goto error;
}
ERR("Trace directory creation error");
goto error;
}
@@
-95,7
+95,7
@@
error:
}
/*
}
/*
- * Send a single channel to the consumer using command A
DD_CHANNEL
.
+ * Send a single channel to the consumer using command A
SK_CHANNEL_CREATION
.
*
* Consumer socket lock MUST be acquired before calling this.
*/
*
* Consumer socket lock MUST be acquired before calling this.
*/
@@
-110,6
+110,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
struct lttcomm_consumer_msg msg;
struct ust_registry_channel *chan_reg;
char shm_path[PATH_MAX] = "";
struct lttcomm_consumer_msg msg;
struct ust_registry_channel *chan_reg;
char shm_path[PATH_MAX] = "";
+ char root_shm_path[PATH_MAX] = "";
assert(ua_sess);
assert(ua_chan);
assert(ua_sess);
assert(ua_chan);
@@
-156,6
+157,8
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
strncat(shm_path, "_",
sizeof(shm_path) - strlen(shm_path) - 1);
}
strncat(shm_path, "_",
sizeof(shm_path) - strlen(shm_path) - 1);
}
+ strncpy(root_shm_path, ua_sess->root_shm_path, sizeof(root_shm_path));
+ root_shm_path[sizeof(root_shm_path) - 1] = '\0';
}
switch (ua_chan->attr.output) {
}
switch (ua_chan->attr.output) {
@@
-172,6
+175,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,
+ ua_chan->monitor_timer_interval,
output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
@@
-188,7
+192,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
ua_sess->id,
ua_sess->output_traces,
ua_sess->uid,
ua_sess->id,
ua_sess->output_traces,
ua_sess->uid,
- shm_path);
+
root_shm_path,
shm_path);
health_code_update();
health_code_update();
@@
-221,6
+225,8
@@
error:
/*
* Ask consumer to create a channel for a given session.
*
/*
* Ask consumer to create a channel for a given session.
*
+ * Session list and rcu read side locks must be held by the caller.
+ *
* Returns 0 on success else a negative value.
*/
int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
* Returns 0 on success else a negative value.
*/
int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
@@
-228,6
+234,7
@@
int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
struct consumer_socket *socket, struct ust_registry_session *registry)
{
int ret;
struct consumer_socket *socket, struct ust_registry_session *registry)
{
int ret;
+ struct ltt_session *session;
assert(ua_sess);
assert(ua_chan);
assert(ua_sess);
assert(ua_chan);
@@
-241,15
+248,18
@@
int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
goto error;
}
goto error;
}
- pthread_mutex_lock(socket->lock);
+ session = session_find_by_id(ua_sess->tracing_id);
+ assert(session);
+ pthread_mutex_lock(socket->lock);
ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
+ pthread_mutex_unlock(socket->lock);
if (ret < 0) {
if (ret < 0) {
+ ERR("ask_channel_creation consumer command failed");
goto error;
}
error:
goto error;
}
error:
- pthread_mutex_unlock(socket->lock);
return ret;
}
return ret;
}
@@
-398,7
+408,9
@@
int ust_consumer_send_stream_to_ust(struct ust_app *app,
DBG2("UST consumer send stream to app %d", app->sock);
/* Relay stream to application. */
DBG2("UST consumer send stream to app %d", app->sock);
/* Relay stream to application. */
+ pthread_mutex_lock(&app->sock_lock);
ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
+ pthread_mutex_unlock(&app->sock_lock);
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
ERR("ustctl send stream handle %d to app pid: %d with ret %d",
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
ERR("ustctl send stream handle %d to app pid: %d with ret %d",
@@
-433,7
+445,9
@@
int ust_consumer_send_channel_to_ust(struct ust_app *app,
app->sock, app->pid, channel->name, channel->tracing_channel_id);
/* Send stream to application. */
app->sock, app->pid, channel->name, channel->tracing_channel_id);
/* Send stream to application. */
+ pthread_mutex_lock(&app->sock_lock);
ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj);
ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj);
+ pthread_mutex_unlock(&app->sock_lock);
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
ERR("Error ustctl send channel %s to app pid: %d with ret %d",
if (ret < 0) {
if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
ERR("Error ustctl send channel %s to app pid: %d with ret %d",
@@
-508,12
+522,15
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
pthread_mutex_lock(&ust_reg->lock);
ret_push = ust_app_push_metadata(ust_reg, socket, 1);
pthread_mutex_unlock(&ust_reg->lock);
pthread_mutex_lock(&ust_reg->lock);
ret_push = ust_app_push_metadata(ust_reg, socket, 1);
pthread_mutex_unlock(&ust_reg->lock);
- if (ret_push < 0) {
+ if (ret_push == -EPIPE) {
+ DBG("Application or relay closed while pushing metadata");
+ } else if (ret_push < 0) {
ERR("Pushing metadata");
ret = -1;
goto end;
ERR("Pushing metadata");
ret = -1;
goto end;
+ } else {
+ DBG("UST Consumer metadata pushed successfully");
}
}
- DBG("UST Consumer metadata pushed successfully");
ret = 0;
end:
ret = 0;
end:
This page took
0.029491 seconds
and
4
git commands to generate.