projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add EEXIST support for kernel event on the tracer side
[lttng-tools.git]
/
liblttngctl
/
lttngctl.c
diff --git
a/liblttngctl/lttngctl.c
b/liblttngctl/lttngctl.c
index b64ace2e6d80de0ce085791f698604e53f8eb523..0442a4f02bdbc686a868bf1abbc40a1896420894 100644
(file)
--- a/
liblttngctl/lttngctl.c
+++ b/
liblttngctl/lttngctl.c
@@
-152,6
+152,10
@@
static int check_tracing_group(const char *grp_name)
/* Alloc group list of the right size */
grp_list = malloc(grp_list_size * sizeof(gid_t));
/* Alloc group list of the right size */
grp_list = malloc(grp_list_size * sizeof(gid_t));
+ if (!grp_list) {
+ ret = -1;
+ goto end;
+ }
grp_id = getgroups(grp_list_size, grp_list);
if (grp_id < -1) {
perror("getgroups");
grp_id = getgroups(grp_list_size, grp_list);
if (grp_id < -1) {
perror("getgroups");
@@
-488,7
+492,7
@@
int lttng_enable_event(struct lttng_handle *handle,
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (!handle) {
+ if (!handle
|| ev == NULL
) {
return -1;
}
return -1;
}
@@
-502,12
+506,12
@@
int lttng_enable_event(struct lttng_handle *handle,
copy_lttng_domain(&lsm.domain, &handle->domain);
copy_lttng_domain(&lsm.domain, &handle->domain);
- if (ev) {
+ if (ev
->name[0] != '\0'
) {
lsm.cmd_type = LTTNG_ENABLE_EVENT;
lsm.cmd_type = LTTNG_ENABLE_EVENT;
- memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
} else {
lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
}
} else {
lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
}
+ memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
This page took
0.023676 seconds
and
4
git commands to generate.