projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify terminolgy around cpu ids and array length
[lttng-ust.git]
/
src
/
lib
/
lttng-ust-ctl
/
ustctl.c
diff --git
a/src/lib/lttng-ust-ctl/ustctl.c
b/src/lib/lttng-ust-ctl/ustctl.c
index 8c60bdb2927a720abcb000a08de6fa909e742e71..6faaef5ed44ff4fcc88a31b181ddd511c3f87cce 100644
(file)
--- a/
src/lib/lttng-ust-ctl/ustctl.c
+++ b/
src/lib/lttng-ust-ctl/ustctl.c
@@
-1,7
+1,7
@@
/*
* SPDX-License-Identifier: GPL-2.0-only
*
/*
* SPDX-License-Identifier: GPL-2.0-only
*
- * Copyright (C) 2011
Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011
EfficiOS Inc.
* Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
@@
-1257,7
+1257,7
@@
int lttng_ust_ctl_duplicate_ust_object_data(struct lttng_ust_abi_object_data **d
obj->u.channel.wakeup_fd =
dup(src->u.channel.wakeup_fd);
if (obj->u.channel.wakeup_fd < 0) {
obj->u.channel.wakeup_fd =
dup(src->u.channel.wakeup_fd);
if (obj->u.channel.wakeup_fd < 0) {
- ret = errno;
+ ret =
-
errno;
goto chan_error_wakeup_fd;
}
} else {
goto chan_error_wakeup_fd;
}
} else {
@@
-1293,7
+1293,7
@@
int lttng_ust_ctl_duplicate_ust_object_data(struct lttng_ust_abi_object_data **d
obj->u.stream.wakeup_fd =
dup(src->u.stream.wakeup_fd);
if (obj->u.stream.wakeup_fd < 0) {
obj->u.stream.wakeup_fd =
dup(src->u.stream.wakeup_fd);
if (obj->u.stream.wakeup_fd < 0) {
- ret = errno;
+ ret =
-
errno;
goto stream_error_wakeup_fd;
}
} else {
goto stream_error_wakeup_fd;
}
} else {
@@
-1305,7
+1305,7
@@
int lttng_ust_ctl_duplicate_ust_object_data(struct lttng_ust_abi_object_data **d
obj->u.stream.shm_fd =
dup(src->u.stream.shm_fd);
if (obj->u.stream.shm_fd < 0) {
obj->u.stream.shm_fd =
dup(src->u.stream.shm_fd);
if (obj->u.stream.shm_fd < 0) {
- ret = errno;
+ ret =
-
errno;
goto stream_error_shm_fd;
}
} else {
goto stream_error_shm_fd;
}
} else {
@@
-1344,7
+1344,7
@@
int lttng_ust_ctl_duplicate_ust_object_data(struct lttng_ust_abi_object_data **d
obj->u.counter_global.shm_fd =
dup(src->u.counter_global.shm_fd);
if (obj->u.counter_global.shm_fd < 0) {
obj->u.counter_global.shm_fd =
dup(src->u.counter_global.shm_fd);
if (obj->u.counter_global.shm_fd < 0) {
- ret = errno;
+ ret =
-
errno;
goto error_type;
}
}
goto error_type;
}
}
@@
-1358,7
+1358,7
@@
int lttng_ust_ctl_duplicate_ust_object_data(struct lttng_ust_abi_object_data **d
obj->u.counter_cpu.shm_fd =
dup(src->u.counter_cpu.shm_fd);
if (obj->u.counter_cpu.shm_fd < 0) {
obj->u.counter_cpu.shm_fd =
dup(src->u.counter_cpu.shm_fd);
if (obj->u.counter_cpu.shm_fd < 0) {
- ret = errno;
+ ret =
-
errno;
goto error_type;
}
}
goto error_type;
}
}
@@
-1384,7
+1384,7
@@
error:
int lttng_ust_ctl_get_nr_stream_per_channel(void)
{
int lttng_ust_ctl_get_nr_stream_per_channel(void)
{
- return
num_possible_cpus
();
+ return
get_possible_cpus_array_len
();
}
struct lttng_ust_ctl_consumer_channel *
}
struct lttng_ust_ctl_consumer_channel *
@@
-2904,7
+2904,7
@@
int lttng_ust_ctl_regenerate_statedump(int sock, int handle)
int lttng_ust_ctl_get_nr_cpu_per_counter(void)
{
int lttng_ust_ctl_get_nr_cpu_per_counter(void)
{
- return
num_possible_cpus
();
+ return
get_possible_cpus_array_len
();
}
struct lttng_ust_ctl_daemon_counter *
}
struct lttng_ust_ctl_daemon_counter *
This page took
0.02654 seconds
and
4
git commands to generate.