projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tls-compat with hidden ring buffer context
[lttng-ust.git]
/
liblttng-ust
/
lttng-context-perf-counters.c
diff --git
a/liblttng-ust/lttng-context-perf-counters.c
b/liblttng-ust/lttng-context-perf-counters.c
index 593930843986b315144f45459fc0cbadb3b8559b..94f4e95d4589bf8bb798af3a07fa7478e1e88c96 100644
(file)
--- a/
liblttng-ust/lttng-context-perf-counters.c
+++ b/
liblttng-ust/lttng-context-perf-counters.c
@@
-7,6
+7,7
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
+#include <limits.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
@@
-17,6
+18,7
@@
#include <stdint.h>
#include <sys/mman.h>
#include <sys/syscall.h>
#include <stdint.h>
#include <sys/mman.h>
#include <sys/syscall.h>
+#include <lttng/ust-arch.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
#include <lttng/ringbuffer-context.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
#include <lttng/ringbuffer-context.h>
@@
-160,7
+162,7
@@
size_t perf_counter_get_size(struct lttng_ust_ctx_field *field, size_t offset)
{
size_t size = 0;
{
size_t size = 0;
- size += l
ib_ring_buffer_align(offset, lttng
_alignof(uint64_t));
+ size += l
ttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb
_alignof(uint64_t));
size += sizeof(uint64_t);
return size;
}
size += sizeof(uint64_t);
return size;
}
@@
-181,7
+183,7
@@
uint64_t read_perf_counter_syscall(
return count;
}
return count;
}
-#if defined(
__x86_64__) || defined(__i386__
)
+#if defined(
LTTNG_UST_ARCH_X86
)
static
uint64_t rdpmc(unsigned int counter)
static
uint64_t rdpmc(unsigned int counter)
@@
-443,8
+445,7
@@
void perf_counter_record(struct lttng_ust_ctx_field *field,
uint64_t value;
value = wrapper_perf_counter_read(field);
uint64_t value;
value = wrapper_perf_counter_read(field);
- lib_ring_buffer_align_ctx(ctx, lttng_alignof(value));
- chan->ops->event_write(ctx, &value, sizeof(value));
+ chan->ops->event_write(ctx, &value, sizeof(value), lttng_ust_rb_alignof(value));
}
static
}
static
@@
-504,7
+505,7
@@
void lttng_destroy_perf_counter_field(struct lttng_ust_ctx_field *field)
free(perf_field);
}
free(perf_field);
}
-#ifdef
__ARM_ARCH_7A__
+#ifdef
LTTNG_UST_ARCH_ARMV7
static
int perf_get_exclude_kernel(void)
static
int perf_get_exclude_kernel(void)
@@
-512,7
+513,7
@@
int perf_get_exclude_kernel(void)
return 0;
}
return 0;
}
-#else /*
__ARM_ARCH_7A__
*/
+#else /*
LTTNG_UST_ARCH_ARMV7
*/
static
int perf_get_exclude_kernel(void)
static
int perf_get_exclude_kernel(void)
@@
-520,7
+521,7
@@
int perf_get_exclude_kernel(void)
return 1;
}
return 1;
}
-#endif /*
__ARM_ARCH_7A__
*/
+#endif /*
LTTNG_UST_ARCH_ARMV7
*/
/* Called with UST lock held */
int lttng_add_perf_counter_to_ctx(uint32_t type,
/* Called with UST lock held */
int lttng_add_perf_counter_to_ctx(uint32_t type,
@@
-545,8
+546,8
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
goto perf_field_alloc_error;
}
ust_type = lttng_ust_create_type_integer(sizeof(uint64_t) * CHAR_BIT,
goto perf_field_alloc_error;
}
ust_type = lttng_ust_create_type_integer(sizeof(uint64_t) * CHAR_BIT,
- lttng_alignof(uint64_t) * CHAR_BIT,
- lttng_is_signed_type(uint64_t),
+ lttng_
ust_rb_
alignof(uint64_t) * CHAR_BIT,
+ lttng_
ust_
is_signed_type(uint64_t),
BYTE_ORDER, 10);
if (!ust_type) {
ret = -ENOMEM;
BYTE_ORDER, 10);
if (!ust_type) {
ret = -ENOMEM;
This page took
0.046702 seconds
and
4
git commands to generate.