projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Conditionally disable test requiring shared libs
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 3a70d48692917108d8ed1447b6a7a2a409542d3d..bdc9c9acab52a1cbe893efe1faaa50198b27206e 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-105,7
+105,7
@@
static int build_network_session_path(char *dst, size_t size,
* Do we have a UST url set. If yes, this means we have both kernel and UST
* to print.
*/
* Do we have a UST url set. If yes, this means we have both kernel and UST
* to print.
*/
- if (
strlen(tmp_uurl) > 0
) {
+ if (
*tmp_uurl != '\0'
) {
ret = snprintf(dst, size, "[K]: %s [data: %d] -- [U]: %s [data: %d]",
tmp_urls, kdata_port, tmp_uurl, udata_port);
} else {
ret = snprintf(dst, size, "[K]: %s [data: %d] -- [U]: %s [data: %d]",
tmp_urls, kdata_port, tmp_uurl, udata_port);
} else {
@@
-766,6
+766,8
@@
int cmd_disable_channel(struct ltt_session *session, int domain,
usess = session->ust_session;
usess = session->ust_session;
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
@@
-810,6
+812,7
@@
int cmd_disable_channel(struct ltt_session *session, int domain,
ret = LTTNG_OK;
error:
ret = LTTNG_OK;
error:
+ rcu_read_unlock();
return ret;
}
return ret;
}
@@
-830,6
+833,8
@@
int cmd_enable_channel(struct ltt_session *session,
DBG("Enabling channel %s for session %s", attr->name, session->name);
DBG("Enabling channel %s for session %s", attr->name, session->name);
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
@@
-898,6
+903,7
@@
int cmd_enable_channel(struct ltt_session *session,
}
error:
}
error:
+ rcu_read_unlock();
return ret;
}
return ret;
}
@@
-910,6
+916,8
@@
int cmd_disable_event(struct ltt_session *session, int domain,
{
int ret;
{
int ret;
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
@@
-924,7
+932,7
@@
int cmd_disable_event(struct ltt_session *session, int domain,
goto error;
}
goto error;
}
- ret = event_kernel_disable_tracepoint(k
sess, k
chan, event_name);
+ ret = event_kernel_disable_tracepoint(kchan, event_name);
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-968,6
+976,7
@@
int cmd_disable_event(struct ltt_session *session, int domain,
ret = LTTNG_OK;
error:
ret = LTTNG_OK;
error:
+ rcu_read_unlock();
return ret;
}
return ret;
}
@@
-979,6
+988,8
@@
int cmd_disable_event_all(struct ltt_session *session, int domain,
{
int ret;
{
int ret;
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
@@
-993,7
+1004,7
@@
int cmd_disable_event_all(struct ltt_session *session, int domain,
goto error;
}
goto error;
}
- ret = event_kernel_disable_all(k
sess, k
chan);
+ ret = event_kernel_disable_all(kchan);
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-1037,6
+1048,7
@@
int cmd_disable_event_all(struct ltt_session *session, int domain,
ret = LTTNG_OK;
error:
ret = LTTNG_OK;
error:
+ rcu_read_unlock();
return ret;
}
return ret;
}
@@
-1126,6
+1138,8
@@
int cmd_enable_event(struct ltt_session *session, int domain,
assert(event);
assert(channel_name);
assert(event);
assert(channel_name);
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
@@
-1160,8
+1174,7
@@
int cmd_enable_event(struct ltt_session *session, int domain,
goto error;
}
goto error;
}
- ret = event_kernel_enable_tracepoint(session->kernel_session, kchan,
- event);
+ ret = event_kernel_enable_tracepoint(kchan, event);
if (ret != LTTNG_OK) {
if (channel_created) {
/* Let's not leak a useless channel. */
if (ret != LTTNG_OK) {
if (channel_created) {
/* Let's not leak a useless channel. */
@@
-1225,6
+1238,7
@@
int cmd_enable_event(struct ltt_session *session, int domain,
ret = LTTNG_OK;
error:
ret = LTTNG_OK;
error:
+ rcu_read_unlock();
return ret;
}
return ret;
}
@@
-1241,6
+1255,8
@@
int cmd_enable_event_all(struct ltt_session *session, int domain,
assert(session);
assert(channel_name);
assert(session);
assert(channel_name);
+ rcu_read_lock();
+
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
switch (domain) {
case LTTNG_DOMAIN_KERNEL:
{
@@
-1274,21
+1290,18
@@
int cmd_enable_event_all(struct ltt_session *session, int domain,
switch (event_type) {
case LTTNG_EVENT_SYSCALL:
switch (event_type) {
case LTTNG_EVENT_SYSCALL:
- ret = event_kernel_enable_all_syscalls(session->kernel_session,
- kchan, kernel_tracer_fd);
+ ret = event_kernel_enable_all_syscalls(kchan, kernel_tracer_fd);
break;
case LTTNG_EVENT_TRACEPOINT:
/*
* This call enables all LTTNG_KERNEL_TRACEPOINTS and
* events already registered to the channel.
*/
break;
case LTTNG_EVENT_TRACEPOINT:
/*
* This call enables all LTTNG_KERNEL_TRACEPOINTS and
* events already registered to the channel.
*/
- ret = event_kernel_enable_all_tracepoints(session->kernel_session,
- kchan, kernel_tracer_fd);
+ ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd);
break;
case LTTNG_EVENT_ALL:
/* Enable syscalls and tracepoints */
break;
case LTTNG_EVENT_ALL:
/* Enable syscalls and tracepoints */
- ret = event_kernel_enable_all(session->kernel_session,
- kchan, kernel_tracer_fd);
+ ret = event_kernel_enable_all(kchan, kernel_tracer_fd);
break;
default:
ret = LTTNG_ERR_KERN_ENABLE_FAIL;
break;
default:
ret = LTTNG_ERR_KERN_ENABLE_FAIL;
@@
-1375,6
+1388,7
@@
int cmd_enable_event_all(struct ltt_session *session, int domain,
ret = LTTNG_OK;
error:
ret = LTTNG_OK;
error:
+ rcu_read_unlock();
return ret;
}
return ret;
}
This page took
0.027879 seconds
and
5
git commands to generate.