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: event name length check is too strict
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.cpp
diff --git
a/src/bin/lttng-sessiond/ust-app.cpp
b/src/bin/lttng-sessiond/ust-app.cpp
index 08089e77e7c56966ab8f41ef6673949bc4415342..1ae2bbac3e0c278b38b961aec677b98726907103 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.cpp
+++ b/
src/bin/lttng-sessiond/ust-app.cpp
@@
-287,6
+287,7
@@
void delete_ust_app_ctx(int sock, struct ust_app_ctx *ua_ctx,
int ret;
LTTNG_ASSERT(ua_ctx);
int ret;
LTTNG_ASSERT(ua_ctx);
+ ASSERT_RCU_READ_LOCKED();
if (ua_ctx->obj) {
pthread_mutex_lock(&app->sock_lock);
if (ua_ctx->obj) {
pthread_mutex_lock(&app->sock_lock);
@@
-321,6
+322,7
@@
void delete_ust_app_event(int sock, struct ust_app_event *ua_event,
int ret;
LTTNG_ASSERT(ua_event);
int ret;
LTTNG_ASSERT(ua_event);
+ ASSERT_RCU_READ_LOCKED();
free(ua_event->filter);
if (ua_event->exclusion != NULL)
free(ua_event->filter);
if (ua_event->exclusion != NULL)
@@
-443,6
+445,7
@@
void delete_ust_app_stream(int sock, struct ust_app_stream *stream,
struct ust_app *app)
{
LTTNG_ASSERT(stream);
struct ust_app *app)
{
LTTNG_ASSERT(stream);
+ ASSERT_RCU_READ_LOCKED();
(void) release_ust_app_stream(sock, stream, app);
free(stream);
(void) release_ust_app_stream(sock, stream, app);
free(stream);
@@
-543,6
+546,7
@@
void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
struct ust_registry_session *registry;
LTTNG_ASSERT(ua_chan);
struct ust_registry_session *registry;
LTTNG_ASSERT(ua_chan);
+ ASSERT_RCU_READ_LOCKED();
DBG3("UST app deleting channel %s", ua_chan->name);
DBG3("UST app deleting channel %s", ua_chan->name);
@@
-664,6
+668,7
@@
ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
LTTNG_ASSERT(registry);
LTTNG_ASSERT(socket);
LTTNG_ASSERT(registry);
LTTNG_ASSERT(socket);
+ ASSERT_RCU_READ_LOCKED();
metadata_key = registry->metadata_key;
metadata_key = registry->metadata_key;
@@
-800,6
+805,7
@@
static int push_metadata(struct ust_registry_session *registry,
LTTNG_ASSERT(registry);
LTTNG_ASSERT(consumer);
LTTNG_ASSERT(registry);
LTTNG_ASSERT(consumer);
+ ASSERT_RCU_READ_LOCKED();
pthread_mutex_lock(®istry->lock);
if (registry->metadata_closed) {
pthread_mutex_lock(®istry->lock);
if (registry->metadata_closed) {
@@
-915,6
+921,7
@@
void delete_ust_app_session(int sock, struct ust_app_session *ua_sess,
struct ust_registry_session *registry;
LTTNG_ASSERT(ua_sess);
struct ust_registry_session *registry;
LTTNG_ASSERT(ua_sess);
+ ASSERT_RCU_READ_LOCKED();
pthread_mutex_lock(&ua_sess->lock);
pthread_mutex_lock(&ua_sess->lock);
@@
-1442,6
+1449,8
@@
struct ust_app *ust_app_find_by_sock(int sock)
struct lttng_ht_node_ulong *node;
struct lttng_ht_iter iter;
struct lttng_ht_node_ulong *node;
struct lttng_ht_iter iter;
+ ASSERT_RCU_READ_LOCKED();
+
lttng_ht_lookup(ust_app_ht_by_sock, (void *)((unsigned long) sock), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
lttng_ht_lookup(ust_app_ht_by_sock, (void *)((unsigned long) sock), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
@@
-1464,6
+1473,8
@@
static struct ust_app *find_app_by_notify_sock(int sock)
struct lttng_ht_node_ulong *node;
struct lttng_ht_iter iter;
struct lttng_ht_node_ulong *node;
struct lttng_ht_iter iter;
+ ASSERT_RCU_READ_LOCKED();
+
lttng_ht_lookup(ust_app_ht_by_notify_sock, (void *)((unsigned long) sock),
&iter);
node = lttng_ht_iter_get_node_ulong(&iter);
lttng_ht_lookup(ust_app_ht_by_notify_sock, (void *)((unsigned long) sock),
&iter);
node = lttng_ht_iter_get_node_ulong(&iter);
@@
-1532,6
+1543,7
@@
static struct ust_app_event_notifier_rule *find_ust_app_event_notifier_rule(
struct ust_app_event_notifier_rule *event_notifier_rule = NULL;
LTTNG_ASSERT(ht);
struct ust_app_event_notifier_rule *event_notifier_rule = NULL;
LTTNG_ASSERT(ht);
+ ASSERT_RCU_READ_LOCKED();
lttng_ht_lookup(ht, &token, &iter);
node = lttng_ht_iter_get_node_u64(&iter);
lttng_ht_lookup(ht, &token, &iter);
node = lttng_ht_iter_get_node_u64(&iter);
@@
-1986,7
+1998,7
@@
error:
* Should be called with session mutex held.
*/
static
* Should be called with session mutex held.
*/
static
-int create_ust_event(struct ust_app *app,
struct ust_app_session *ua_sess,
+int create_ust_event(struct ust_app *app,
struct ust_app_channel *ua_chan, struct ust_app_event *ua_event)
{
int ret = 0;
struct ust_app_channel *ua_chan, struct ust_app_event *ua_event)
{
int ret = 0;
@@
-2137,7
+2149,7
@@
static int init_ust_event_notifier_from_event_rule(
event_notifier->event.instrumentation = LTTNG_UST_ABI_TRACEPOINT;
ret = lttng_strncpy(event_notifier->event.name, pattern,
event_notifier->event.instrumentation = LTTNG_UST_ABI_TRACEPOINT;
ret = lttng_strncpy(event_notifier->event.name, pattern,
-
LTTNG_UST_ABI_SYM_NAME_LEN - 1
);
+
sizeof(event_notifier->event.name)
);
if (ret) {
ERR("Failed to copy event rule pattern to notifier: pattern = '%s' ",
pattern);
if (ret) {
ERR("Failed to copy event rule pattern to notifier: pattern = '%s' ",
pattern);
@@
-2809,6
+2821,7
@@
struct ust_app_ctx *find_ust_app_context(struct lttng_ht *ht,
LTTNG_ASSERT(uctx);
LTTNG_ASSERT(ht);
LTTNG_ASSERT(uctx);
LTTNG_ASSERT(ht);
+ ASSERT_RCU_READ_LOCKED();
/* Lookup using the lttng_ust_context_type and a custom match fct. */
cds_lfht_lookup(ht->ht, ht->hash_fct((void *) uctx->ctx, lttng_ht_seed),
/* Lookup using the lttng_ust_context_type and a custom match fct. */
cds_lfht_lookup(ht->ht, ht->hash_fct((void *) uctx->ctx, lttng_ht_seed),
@@
-2837,6
+2850,8
@@
int create_ust_app_channel_context(struct ust_app_channel *ua_chan,
int ret = 0;
struct ust_app_ctx *ua_ctx;
int ret = 0;
struct ust_app_ctx *ua_ctx;
+ ASSERT_RCU_READ_LOCKED();
+
DBG2("UST app adding context to channel %s", ua_chan->name);
ua_ctx = find_ust_app_context(ua_chan->ctx, uctx);
DBG2("UST app adding context to channel %s", ua_chan->name);
ua_ctx = find_ust_app_context(ua_chan->ctx, uctx);
@@
-2871,8
+2886,8
@@
error:
* Called with UST app session lock held.
*/
static
* Called with UST app session lock held.
*/
static
-int enable_ust_app_event(struct ust_app_
session *ua_sess
,
- struct ust_app
_event *ua_event, struct ust_app
*app)
+int enable_ust_app_event(struct ust_app_
event *ua_event
,
+ struct ust_app *app)
{
int ret;
{
int ret;
@@
-2890,8
+2905,8
@@
error:
/*
* Disable on the tracer side a ust app event for the session and channel.
*/
/*
* Disable on the tracer side a ust app event for the session and channel.
*/
-static int disable_ust_app_event(struct ust_app_
session *ua_sess
,
- struct ust_app
_event *ua_event, struct ust_app
*app)
+static int disable_ust_app_event(struct ust_app_
event *ua_event
,
+ struct ust_app *app)
{
int ret;
{
int ret;
@@
-2938,6
+2953,8
@@
static int enable_ust_app_channel(struct ust_app_session *ua_sess,
struct lttng_ht_node_str *ua_chan_node;
struct ust_app_channel *ua_chan;
struct lttng_ht_node_str *ua_chan_node;
struct ust_app_channel *ua_chan;
+ ASSERT_RCU_READ_LOCKED();
+
lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
ua_chan_node = lttng_ht_iter_get_node_str(&iter);
if (ua_chan_node == NULL) {
lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
ua_chan_node = lttng_ht_iter_get_node_str(&iter);
if (ua_chan_node == NULL) {
@@
-2966,8
+2983,7
@@
error:
*/
static int do_consumer_create_channel(struct ltt_ust_session *usess,
struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan,
*/
static int do_consumer_create_channel(struct ltt_ust_session *usess,
struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan,
- int bitness, struct ust_registry_session *registry,
- uint64_t trace_archive_id)
+ int bitness, struct ust_registry_session *registry)
{
int ret;
unsigned int nb_fd = 0;
{
int ret;
unsigned int nb_fd = 0;
@@
-3367,6
+3383,7
@@
static int create_channel_per_uid(struct ust_app *app,
LTTNG_ASSERT(usess);
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(ua_chan);
LTTNG_ASSERT(usess);
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(ua_chan);
+ ASSERT_RCU_READ_LOCKED();
DBG("UST app creating channel %s with per UID buffers", ua_chan->name);
DBG("UST app creating channel %s with per UID buffers", ua_chan->name);
@@
-3402,8
+3419,7
@@
static int create_channel_per_uid(struct ust_app *app,
* ust app channel object with all streams and data object.
*/
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
* ust app channel object with all streams and data object.
*/
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
- app->bits_per_long, reg_uid->registry->reg.ust,
- session->most_recent_chunk_id.value);
+ app->bits_per_long, reg_uid->registry->reg.ust);
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
@@
-3517,8
+3533,7
@@
static int create_channel_per_pid(struct ust_app *app,
/* Create and get channel on the consumer side. */
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
/* Create and get channel on the consumer side. */
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
- app->bits_per_long, registry,
- session->most_recent_chunk_id.value);
+ app->bits_per_long, registry);
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
@@
-3587,6
+3602,7
@@
static int ust_app_channel_send(struct ust_app *app,
LTTNG_ASSERT(usess->active);
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(ua_chan);
LTTNG_ASSERT(usess->active);
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(ua_chan);
+ ASSERT_RCU_READ_LOCKED();
/* Handle buffer type before sending the channel to the application. */
switch (usess->buffer_type) {
/* Handle buffer type before sending the channel to the application. */
switch (usess->buffer_type) {
@@
-3637,7
+3653,8
@@
error:
*/
static int ust_app_channel_allocate(struct ust_app_session *ua_sess,
struct ltt_ust_channel *uchan,
*/
static int ust_app_channel_allocate(struct ust_app_session *ua_sess,
struct ltt_ust_channel *uchan,
- enum lttng_ust_abi_chan_type type, struct ltt_ust_session *usess,
+ enum lttng_ust_abi_chan_type type,
+ struct ltt_ust_session *usess __attribute__((unused)),
struct ust_app_channel **ua_chanp)
{
int ret = 0;
struct ust_app_channel **ua_chanp)
{
int ret = 0;
@@
-3645,6
+3662,8
@@
static int ust_app_channel_allocate(struct ust_app_session *ua_sess,
struct lttng_ht_node_str *ua_chan_node;
struct ust_app_channel *ua_chan;
struct lttng_ht_node_str *ua_chan_node;
struct ust_app_channel *ua_chan;
+ ASSERT_RCU_READ_LOCKED();
+
/* Lookup channel in the ust app session */
lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
ua_chan_node = lttng_ht_iter_get_node_str(&iter);
/* Lookup channel in the ust app session */
lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);
ua_chan_node = lttng_ht_iter_get_node_str(&iter);
@@
-3685,13
+3704,15
@@
error:
* Called with ust app session mutex held.
*/
static
* Called with ust app session mutex held.
*/
static
-int create_ust_app_event(struct ust_app_
session *ua_sess
,
- struct
ust_app_channel *ua_chan, struct
ltt_ust_event *uevent,
+int create_ust_app_event(struct ust_app_
channel *ua_chan
,
+ struct ltt_ust_event *uevent,
struct ust_app *app)
{
int ret = 0;
struct ust_app_event *ua_event;
struct ust_app *app)
{
int ret = 0;
struct ust_app_event *ua_event;
+ ASSERT_RCU_READ_LOCKED();
+
ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr);
if (ua_event == NULL) {
/* Only failure mode of alloc_ust_app_event(). */
ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr);
if (ua_event == NULL) {
/* Only failure mode of alloc_ust_app_event(). */
@@
-3701,7
+3722,7
@@
int create_ust_app_event(struct ust_app_session *ua_sess,
shadow_copy_event(ua_event, uevent);
/* Create it on the tracer side */
shadow_copy_event(ua_event, uevent);
/* Create it on the tracer side */
- ret = create_ust_event(app, ua_
sess, ua_
chan, ua_event);
+ ret = create_ust_event(app, ua_chan, ua_event);
if (ret < 0) {
/*
* Not found previously means that it does not exist on the
if (ret < 0) {
/*
* Not found previously means that it does not exist on the
@@
-3746,6
+3767,8
@@
int create_ust_app_event_notifier_rule(struct lttng_trigger *trigger,
int ret = 0;
struct ust_app_event_notifier_rule *ua_event_notifier_rule;
int ret = 0;
struct ust_app_event_notifier_rule *ua_event_notifier_rule;
+ ASSERT_RCU_READ_LOCKED();
+
ua_event_notifier_rule = alloc_ust_app_event_notifier_rule(trigger);
if (ua_event_notifier_rule == NULL) {
ret = -ENOMEM;
ua_event_notifier_rule = alloc_ust_app_event_notifier_rule(trigger);
if (ua_event_notifier_rule == NULL) {
ret = -ENOMEM;
@@
-3803,6
+3826,7
@@
static int create_ust_app_metadata(struct ust_app_session *ua_sess,
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(app);
LTTNG_ASSERT(consumer);
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(app);
LTTNG_ASSERT(consumer);
+ ASSERT_RCU_READ_LOCKED();
registry = get_session_registry(ua_sess);
/* The UST app session is held registry shall not be null. */
registry = get_session_registry(ua_sess);
/* The UST app session is held registry shall not be null. */
@@
-4834,7
+4858,7
@@
int ust_app_disable_event_glb(struct ltt_ust_session *usess,
continue;
}
continue;
}
- ret = disable_ust_app_event(ua_
sess, ua_
event, app);
+ ret = disable_ust_app_event(ua_event, app);
if (ret < 0) {
/* XXX: Report error someday... */
continue;
if (ret < 0) {
/* XXX: Report error someday... */
continue;
@@
-4993,7
+5017,7
@@
int ust_app_enable_event_glb(struct ltt_ust_session *usess,
goto next_app;
}
goto next_app;
}
- ret = enable_ust_app_event(ua_
sess, ua_
event, app);
+ ret = enable_ust_app_event(ua_event, app);
if (ret < 0) {
pthread_mutex_unlock(&ua_sess->lock);
goto error;
if (ret < 0) {
pthread_mutex_unlock(&ua_sess->lock);
goto error;
@@
-5057,7
+5081,7
@@
int ust_app_create_event_glb(struct ltt_ust_session *usess,
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
- ret = create_ust_app_event(ua_
sess, ua_
chan, uevent, app);
+ ret = create_ust_app_event(ua_chan, uevent, app);
pthread_mutex_unlock(&ua_sess->lock);
if (ret < 0) {
if (ret != -LTTNG_UST_ERR_EXIST) {
pthread_mutex_unlock(&ua_sess->lock);
if (ret < 0) {
if (ret != -LTTNG_UST_ERR_EXIST) {
@@
-5753,7
+5777,7
@@
end:
static
int ust_app_channel_synchronize_event(struct ust_app_channel *ua_chan,
static
int ust_app_channel_synchronize_event(struct ust_app_channel *ua_chan,
- struct ltt_ust_event *uevent,
struct ust_app_session *ua_sess,
+ struct ltt_ust_event *uevent,
struct ust_app *app)
{
int ret = 0;
struct ust_app *app)
{
int ret = 0;
@@
-5762,15
+5786,15
@@
int ust_app_channel_synchronize_event(struct ust_app_channel *ua_chan,
ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
uevent->filter, uevent->attr.loglevel, uevent->exclusion);
if (!ua_event) {
ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
uevent->filter, uevent->attr.loglevel, uevent->exclusion);
if (!ua_event) {
- ret = create_ust_app_event(ua_
sess, ua_
chan, uevent, app);
+ ret = create_ust_app_event(ua_chan, uevent, app);
if (ret < 0) {
goto end;
}
} else {
if (ua_event->enabled != uevent->enabled) {
ret = uevent->enabled ?
if (ret < 0) {
goto end;
}
} else {
if (ua_event->enabled != uevent->enabled) {
ret = uevent->enabled ?
- enable_ust_app_event(ua_
sess, ua_
event, app) :
- disable_ust_app_event(ua_
sess, ua_
event, app);
+ enable_ust_app_event(ua_event, app) :
+ disable_ust_app_event(ua_event, app);
}
}
}
}
@@
-5790,6
+5814,8
@@
void ust_app_synchronize_event_notifier_rules(struct ust_app *app)
struct ust_app_event_notifier_rule *event_notifier_rule;
unsigned int count, i;
struct ust_app_event_notifier_rule *event_notifier_rule;
unsigned int count, i;
+ ASSERT_RCU_READ_LOCKED();
+
if (!ust_app_supports_notifiers(app)) {
goto end;
}
if (!ust_app_supports_notifiers(app)) {
goto end;
}
@@
-5941,6
+5967,7
@@
void ust_app_synchronize_all_channels(struct ltt_ust_session *usess,
LTTNG_ASSERT(usess);
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(app);
LTTNG_ASSERT(usess);
LTTNG_ASSERT(ua_sess);
LTTNG_ASSERT(app);
+ ASSERT_RCU_READ_LOCKED();
cds_lfht_for_each_entry(usess->domain_global.channels->ht, &uchan_iter,
uchan, node.node) {
cds_lfht_for_each_entry(usess->domain_global.channels->ht, &uchan_iter,
uchan, node.node) {
@@
-5970,7
+5997,7
@@
void ust_app_synchronize_all_channels(struct ltt_ust_session *usess,
cds_lfht_for_each_entry(uchan->events->ht, &uevent_iter, uevent,
node.node) {
ret = ust_app_channel_synchronize_event(ua_chan,
cds_lfht_for_each_entry(uchan->events->ht, &uevent_iter, uevent,
node.node) {
ret = ust_app_channel_synchronize_event(ua_chan,
- uevent,
ua_sess,
app);
+ uevent, app);
if (ret) {
goto end;
}
if (ret) {
goto end;
}
@@
-6070,6
+6097,7
@@
void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
{
LTTNG_ASSERT(usess);
LTTNG_ASSERT(usess->active);
{
LTTNG_ASSERT(usess);
LTTNG_ASSERT(usess->active);
+ ASSERT_RCU_READ_LOCKED();
DBG2("UST app global update for app sock %d for session id %" PRIu64,
app->sock, usess->id);
DBG2("UST app global update for app sock %d for session id %" PRIu64,
app->sock, usess->id);
@@
-6104,6
+6132,8
@@
void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
*/
void ust_app_global_update_event_notifier_rules(struct ust_app *app)
{
*/
void ust_app_global_update_event_notifier_rules(struct ust_app *app)
{
+ ASSERT_RCU_READ_LOCKED();
+
DBG2("UST application global event notifier rules update: app = '%s', pid = %d",
app->name, app->pid);
DBG2("UST application global event notifier rules update: app = '%s', pid = %d",
app->name, app->pid);
@@
-6266,6
+6296,7
@@
static struct ust_app_session *find_session_by_objd(struct ust_app *app,
struct ust_app_session *ua_sess = NULL;
LTTNG_ASSERT(app);
struct ust_app_session *ua_sess = NULL;
LTTNG_ASSERT(app);
+ ASSERT_RCU_READ_LOCKED();
lttng_ht_lookup(app->ust_sessions_objd, (void *)((unsigned long) objd), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
lttng_ht_lookup(app->ust_sessions_objd, (void *)((unsigned long) objd), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
@@
-6293,6
+6324,7
@@
static struct ust_app_channel *find_channel_by_objd(struct ust_app *app,
struct ust_app_channel *ua_chan = NULL;
LTTNG_ASSERT(app);
struct ust_app_channel *ua_chan = NULL;
LTTNG_ASSERT(app);
+ ASSERT_RCU_READ_LOCKED();
lttng_ht_lookup(app->ust_objd, (void *)((unsigned long) objd), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
lttng_ht_lookup(app->ust_objd, (void *)((unsigned long) objd), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
@@
-6989,7
+7021,7
@@
void ust_app_destroy(struct ust_app *app)
*/
enum lttng_error_code ust_app_snapshot_record(
const struct ltt_ust_session *usess,
*/
enum lttng_error_code ust_app_snapshot_record(
const struct ltt_ust_session *usess,
- const struct consumer_output *output,
int wait,
+ const struct consumer_output *output,
uint64_t nb_packets_per_stream)
{
int ret = 0;
uint64_t nb_packets_per_stream)
{
int ret = 0;
@@
-7049,8
+7081,7
@@
enum lttng_error_code ust_app_snapshot_record(
buf_reg_chan, node.node) {
status = consumer_snapshot_channel(socket,
buf_reg_chan->consumer_key,
buf_reg_chan, node.node) {
status = consumer_snapshot_channel(socket,
buf_reg_chan->consumer_key,
- output, 0, usess->uid,
- usess->gid, &trace_path[consumer_path_offset], wait,
+ output, 0, &trace_path[consumer_path_offset],
nb_packets_per_stream);
if (status != LTTNG_OK) {
goto error;
nb_packets_per_stream);
if (status != LTTNG_OK) {
goto error;
@@
-7058,8
+7089,7
@@
enum lttng_error_code ust_app_snapshot_record(
}
status = consumer_snapshot_channel(socket,
reg->registry->reg.ust->metadata_key, output, 1,
}
status = consumer_snapshot_channel(socket,
reg->registry->reg.ust->metadata_key, output, 1,
- usess->uid, usess->gid, &trace_path[consumer_path_offset],
- wait, 0);
+ &trace_path[consumer_path_offset], 0);
if (status != LTTNG_OK) {
goto error;
}
if (status != LTTNG_OK) {
goto error;
}
@@
-7112,9
+7142,7
@@
enum lttng_error_code ust_app_snapshot_record(
ua_chan, node.node) {
status = consumer_snapshot_channel(socket,
ua_chan->key, output, 0,
ua_chan, node.node) {
status = consumer_snapshot_channel(socket,
ua_chan->key, output, 0,
- lttng_credentials_get_uid(&ua_sess->effective_credentials),
- lttng_credentials_get_gid(&ua_sess->effective_credentials),
- &trace_path[consumer_path_offset], wait,
+ &trace_path[consumer_path_offset],
nb_packets_per_stream);
switch (status) {
case LTTNG_OK:
nb_packets_per_stream);
switch (status) {
case LTTNG_OK:
@@
-7133,9
+7161,7
@@
enum lttng_error_code ust_app_snapshot_record(
}
status = consumer_snapshot_channel(socket,
registry->metadata_key, output, 1,
}
status = consumer_snapshot_channel(socket,
registry->metadata_key, output, 1,
- lttng_credentials_get_uid(&ua_sess->effective_credentials),
- lttng_credentials_get_gid(&ua_sess->effective_credentials),
- &trace_path[consumer_path_offset], wait, 0);
+ &trace_path[consumer_path_offset], 0);
switch (status) {
case LTTNG_OK:
break;
switch (status) {
case LTTNG_OK:
break;
@@
-7428,7
+7454,6
@@
enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
buf_reg_chan, node.node) {
ret = consumer_rotate_channel(socket,
buf_reg_chan->consumer_key,
buf_reg_chan, node.node) {
ret = consumer_rotate_channel(socket,
buf_reg_chan->consumer_key,
- usess->uid, usess->gid,
usess->consumer,
/* is_metadata_channel */ false);
if (ret < 0) {
usess->consumer,
/* is_metadata_channel */ false);
if (ret < 0) {
@@
-7454,7
+7479,6
@@
enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
ret = consumer_rotate_channel(socket,
reg->registry->reg.ust->metadata_key,
ret = consumer_rotate_channel(socket,
reg->registry->reg.ust->metadata_key,
- usess->uid, usess->gid,
usess->consumer,
/* is_metadata_channel */ true);
if (ret < 0) {
usess->consumer,
/* is_metadata_channel */ true);
if (ret < 0) {
@@
-7498,8
+7522,6
@@
enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
ua_chan, node.node) {
ret = consumer_rotate_channel(socket,
ua_chan->key,
ua_chan, node.node) {
ret = consumer_rotate_channel(socket,
ua_chan->key,
- lttng_credentials_get_uid(&ua_sess->effective_credentials),
- lttng_credentials_get_gid(&ua_sess->effective_credentials),
ua_sess->consumer,
/* is_metadata_channel */ false);
if (ret < 0) {
ua_sess->consumer,
/* is_metadata_channel */ false);
if (ret < 0) {
@@
-7515,8
+7537,6
@@
enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
(void) push_metadata(registry, usess->consumer);
ret = consumer_rotate_channel(socket,
registry->metadata_key,
(void) push_metadata(registry, usess->consumer);
ret = consumer_rotate_channel(socket,
registry->metadata_key,
- lttng_credentials_get_uid(&ua_sess->effective_credentials),
- lttng_credentials_get_gid(&ua_sess->effective_credentials),
ua_sess->consumer,
/* is_metadata_channel */ true);
if (ret < 0) {
ua_sess->consumer,
/* is_metadata_channel */ true);
if (ret < 0) {
This page took
0.033941 seconds
and
4
git commands to generate.