projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: sessiond: remove left-over code
[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 0246501a53a31c69bc1ea3a9cddbaec75c67f6d4..88db75f8f4d7da8f1f2ae5cc3d7978cae26fafdd 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.cpp
+++ b/
src/bin/lttng-sessiond/ust-app.cpp
@@
-3461,11
+3461,7
@@
static int create_channel_per_uid(struct ust_app *app,
/* Notify the notification subsystem of the channel's creation. */
notification_ret = notification_thread_command_add_channel(
/* Notify the notification subsystem of the channel's creation. */
notification_ret = notification_thread_command_add_channel(
- the_notification_thread_handle, session->name,
- lttng_credentials_get_uid(
- &ua_sess->effective_credentials),
- lttng_credentials_get_gid(
- &ua_sess->effective_credentials),
+ the_notification_thread_handle, session->id,
ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
if (notification_ret != LTTNG_OK) {
ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
if (notification_ret != LTTNG_OK) {
@@
-3563,11
+3559,7
@@
static int create_channel_per_pid(struct ust_app *app,
}
cmd_ret = notification_thread_command_add_channel(
}
cmd_ret = notification_thread_command_add_channel(
- the_notification_thread_handle, session->name,
- lttng_credentials_get_uid(
- &ua_sess->effective_credentials),
- lttng_credentials_get_gid(
- &ua_sess->effective_credentials),
+ the_notification_thread_handle, session->id,
ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
if (cmd_ret != LTTNG_OK) {
ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
if (cmd_ret != LTTNG_OK) {
@@
-6453,22
+6445,13
@@
static int handle_app_register_channel_notification(int sock,
}
}
}
}
- /* Append to metadata */
- if (!ust_reg_chan._metadata_dumped) {
- /*ret_code = ust_metadata_channel_statedump(registry, ust_reg_chan);*/
- if (ret_code) {
- ERR("Error appending channel metadata (errno = %d)", ret_code);
- goto reply;
- }
- }
-
reply:
DBG3("UST app replying to register channel key %" PRIu64
" with id %u, ret = %d", chan_reg_key, chan_id,
ret_code);
ret = lttng_ust_ctl_reply_register_channel(sock, chan_id,
reply:
DBG3("UST app replying to register channel key %" PRIu64
" with id %u, ret = %d", chan_reg_key, chan_id,
ret_code);
ret = lttng_ust_ctl_reply_register_channel(sock, chan_id,
- ust_reg_chan.header_type == lst::stream_class::header_type::COMPACT ?
+ ust_reg_chan.header_type
_
== lst::stream_class::header_type::COMPACT ?
LTTNG_UST_CTL_CHANNEL_HEADER_COMPACT :
LTTNG_UST_CTL_CHANNEL_HEADER_LARGE,
ret_code);
LTTNG_UST_CTL_CHANNEL_HEADER_COMPACT :
LTTNG_UST_CTL_CHANNEL_HEADER_LARGE,
ret_code);
This page took
0.02506 seconds
and
4
git commands to generate.