projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: loading of live session within userspace domains
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
lttng-ctl.c
diff --git
a/src/lib/lttng-ctl/lttng-ctl.c
b/src/lib/lttng-ctl/lttng-ctl.c
index 42c9d13907f4594f60f70ec01bc76fa1242f91f0..b190937cc8f42478e51612c3df7abc665e01728f 100644
(file)
--- a/
src/lib/lttng-ctl/lttng-ctl.c
+++ b/
src/lib/lttng-ctl/lttng-ctl.c
@@
-486,10
+486,6
@@
struct lttng_handle *lttng_create_handle(const char *session_name,
{
struct lttng_handle *handle = NULL;
{
struct lttng_handle *handle = NULL;
- if (domain == NULL) {
- goto end;
- }
-
handle = zmalloc(sizeof(struct lttng_handle));
if (handle == NULL) {
PERROR("malloc handle");
handle = zmalloc(sizeof(struct lttng_handle));
if (handle == NULL) {
PERROR("malloc handle");
@@
-500,8
+496,10
@@
struct lttng_handle *lttng_create_handle(const char *session_name,
lttng_ctl_copy_string(handle->session_name, session_name,
sizeof(handle->session_name));
lttng_ctl_copy_string(handle->session_name, session_name,
sizeof(handle->session_name));
- /* Copy lttng domain */
- lttng_ctl_copy_lttng_domain(&handle->domain, domain);
+ /* Copy lttng domain or leave initialized to 0. */
+ if (domain) {
+ lttng_ctl_copy_lttng_domain(&handle->domain, domain);
+ }
end:
return handle;
end:
return handle;
@@
-1091,10
+1089,6
@@
int lttng_disable_event_ext(struct lttng_handle *handle,
}
lsm.cmd_type = LTTNG_DISABLE_EVENT;
}
lsm.cmd_type = LTTNG_DISABLE_EVENT;
- if (ev->name[0] == '\0') {
- /* Disable all events */
- lttng_ctl_copy_string(ev->name, "*", sizeof(ev->name));
- }
lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
/* FIXME: copying non-packed struct to packed struct. */
lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
/* FIXME: copying non-packed struct to packed struct. */
@@
-2003,7
+1997,8
@@
end:
int lttng_list_tracker_pids(struct lttng_handle *handle,
int *_enabled, int32_t **_pids, size_t *_nr_pids)
{
int lttng_list_tracker_pids(struct lttng_handle *handle,
int *_enabled, int32_t **_pids, size_t *_nr_pids)
{
- int ret, enabled = 1;
+ int ret;
+ int enabled = 1;
struct lttcomm_session_msg lsm;
size_t nr_pids;
int32_t *pids;
struct lttcomm_session_msg lsm;
size_t nr_pids;
int32_t *pids;
This page took
0.027061 seconds
and
4
git commands to generate.