projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: use system LTTng-UST headers when available
[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 ad076e3c3173085f922c3d7864d9959bb9c93c9c..8dc0fd905ae823d53709dd498dc68583acfb288a 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,14
+24,16
@@
#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 "health-sessiond.h"
#include "ust-consumer.h"
#include <common/defaults.h>
#include "consumer.h"
#include "health-sessiond.h"
#include "ust-consumer.h"
+#include "lttng-ust-error.h"
#include "buffer-registry.h"
#include "session.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
+74,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
+96,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.
*/
@@
-175,6
+176,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,
@@
-191,6
+193,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,
+ ua_chan->attr.blocking_timeout,
root_shm_path, shm_path);
health_code_update();
root_shm_path, shm_path);
health_code_update();
@@
-224,6
+227,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,
@@
-231,6
+236,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);
@@
-244,15
+250,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;
}
@@
-313,7
+322,6
@@
int ust_consumer_get_channel(struct consumer_socket *socket,
free(stream);
if (ret == -LTTNG_UST_ERR_NOENT) {
DBG3("UST app consumer has no more stream available");
free(stream);
if (ret == -LTTNG_UST_ERR_NOENT) {
DBG3("UST app consumer has no more stream available");
- ret = 0;
break;
}
if (ret != -EPIPE) {
break;
}
if (ret != -EPIPE) {
@@
-401,7
+409,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",
@@
-436,7
+446,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",
@@
-494,7
+506,9
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_ERR_UND;
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_ERR_UND;
+ pthread_mutex_lock(socket->lock);
(void) consumer_send_msg(socket, &msg);
(void) consumer_send_msg(socket, &msg);
+ pthread_mutex_unlock(socket->lock);
/*
* This is possible since the session might have been destroyed
* during a consumer metadata request. So here, return gracefully
/*
* This is possible since the session might have been destroyed
* during a consumer metadata request. So here, return gracefully
This page took
0.026706 seconds
and
4
git commands to generate.