projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: libcounter bad compare
[lttng-ust.git]
/
libcounter
/
counter.c
diff --git
a/libcounter/counter.c
b/libcounter/counter.c
index 4010d5dd7f152b8c29d300d4e15ac751a6c04cc5..91506faf084fcbdf253855f35ff34e50b0017924 100644
(file)
--- a/
libcounter/counter.c
+++ b/
libcounter/counter.c
@@
-75,9
+75,9
@@
static int lttng_counter_layout_init(struct lib_counter *counter, int cpu, int s
counters_offset = shm_length;
shm_length += counter_size * nr_elem;
overflow_offset = shm_length;
counters_offset = shm_length;
shm_length += counter_size * nr_elem;
overflow_offset = shm_length;
- shm_length += ALIGN(nr_elem, 8) / 8;
+ shm_length +=
LTTNG_UST_
ALIGN(nr_elem, 8) / 8;
underflow_offset = shm_length;
underflow_offset = shm_length;
- shm_length += ALIGN(nr_elem, 8) / 8;
+ shm_length +=
LTTNG_UST_
ALIGN(nr_elem, 8) / 8;
layout->shm_len = shm_length;
if (counter->is_daemon) {
/* Allocate and clear shared memory. */
layout->shm_len = shm_length;
if (counter->is_daemon) {
/* Allocate and clear shared memory. */
@@
-188,7
+188,7
@@
int validate_args(const struct lib_counter_config *config,
return -1;
if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && counter_cpu_fds)
return -1;
return -1;
if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && counter_cpu_fds)
return -1;
- if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && counter_cpu_fds >= 0)
+ if (!(config->alloc & COUNTER_ALLOC_PER_CPU) &&
nr_
counter_cpu_fds >= 0)
return -1;
if (counter_cpu_fds && nr_cpus != nr_counter_cpu_fds)
return -1;
return -1;
if (counter_cpu_fds && nr_cpus != nr_counter_cpu_fds)
return -1;
This page took
0.024724 seconds
and
4
git commands to generate.