projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop 'linux/perf_events.h' wrapper
[lttng-modules.git]
/
src
/
lttng-context-perf-counters.c
diff --git
a/src/lttng-context-perf-counters.c
b/src/lttng-context-perf-counters.c
index f3d7bdf1ce6a34857e28397ae08250ca7f2816b4..ac79d3eeb72872f998989a9296f3c246ba831d9d 100644
(file)
--- a/
src/lttng-context-perf-counters.c
+++ b/
src/lttng-context-perf-counters.c
@@
-16,8
+16,8
@@
#include <lttng/events.h>
#include <lttng/events-internal.h>
#include <ringbuffer/frontend_types.h>
#include <lttng/events.h>
#include <lttng/events-internal.h>
#include <ringbuffer/frontend_types.h>
+#include <wrapper/cpu.h>
#include <wrapper/vmalloc.h>
#include <wrapper/vmalloc.h>
-#include <wrapper/perf.h>
#include <lttng/tracer.h>
static
#include <lttng/tracer.h>
static
@@
-32,8
+32,8
@@
size_t perf_counter_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ct
static
void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
static
void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
- struct l
ib
_ring_buffer_ctx *ctx,
- struct lttng_
channel
*chan)
+ struct l
ttng_kernel
_ring_buffer_ctx *ctx,
+ struct lttng_
kernel_channel_buffer
*chan)
{
struct lttng_perf_counter_field *perf_field = (struct lttng_perf_counter_field *) priv;
struct perf_event *event;
{
struct lttng_perf_counter_field *perf_field = (struct lttng_perf_counter_field *) priv;
struct perf_event *event;
@@
-57,8
+57,7
@@
void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
*/
value = 0;
}
*/
value = 0;
}
- 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_alignof(value));
}
#if defined(CONFIG_PERF_EVENTS) && (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0))
}
#if defined(CONFIG_PERF_EVENTS) && (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0))
@@
-98,10
+97,10
@@
void lttng_destroy_perf_counter_ctx_field(void *priv)
{
int cpu;
{
int cpu;
-
get_online_cpus
();
+
lttng_cpus_read_lock
();
for_each_online_cpu(cpu)
perf_event_release_kernel(events[cpu]);
for_each_online_cpu(cpu)
perf_event_release_kernel(events[cpu]);
-
put_online_cpus
();
+
lttng_cpus_read_unlock
();
#ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&perf_field->nb);
#endif
#ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&perf_field->nb);
#endif
@@
-126,8
+125,8
@@
int lttng_cpuhp_perf_counter_online(unsigned int cpu,
struct perf_event_attr *attr = perf_field->attr;
struct perf_event *pevent;
struct perf_event_attr *attr = perf_field->attr;
struct perf_event *pevent;
- pevent =
wrapper_
perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ pevent = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback
, NULL
);
if (!pevent || IS_ERR(pevent))
return -EINVAL;
if (pevent->state == PERF_EVENT_STATE_ERROR) {
if (!pevent || IS_ERR(pevent))
return -EINVAL;
if (pevent->state == PERF_EVENT_STATE_ERROR) {
@@
-188,8
+187,8
@@
int lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
- pevent =
wrapper_
perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ pevent = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback
, NULL
);
if (!pevent || IS_ERR(pevent))
return NOTIFY_BAD;
if (pevent->state == PERF_EVENT_STATE_ERROR) {
if (!pevent || IS_ERR(pevent))
return NOTIFY_BAD;
if (pevent->state == PERF_EVENT_STATE_ERROR) {
@@
-305,10
+304,10
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
perf_field->nb.priority = 0;
register_cpu_notifier(&perf_field->nb);
#endif
perf_field->nb.priority = 0;
register_cpu_notifier(&perf_field->nb);
#endif
-
get_online_cpus
();
+
lttng_cpus_read_lock
();
for_each_online_cpu(cpu) {
for_each_online_cpu(cpu) {
- events[cpu] =
wrapper_
perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ events[cpu] = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback
, NULL
);
if (!events[cpu] || IS_ERR(events[cpu])) {
ret = -EINVAL;
goto counter_error;
if (!events[cpu] || IS_ERR(events[cpu])) {
ret = -EINVAL;
goto counter_error;
@@
-318,7
+317,7
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
goto counter_busy;
}
}
goto counter_busy;
}
}
-
put_online_cpus
();
+
lttng_cpus_read_unlock
();
perf_field->hp_enable = 1;
}
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
perf_field->hp_enable = 1;
}
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
@@
-352,7
+351,7
@@
counter_error:
if (events[cpu] && !IS_ERR(events[cpu]))
perf_event_release_kernel(events[cpu]);
}
if (events[cpu] && !IS_ERR(events[cpu]))
perf_event_release_kernel(events[cpu]);
}
-
put_online_cpus
();
+
lttng_cpus_read_unlock
();
#ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&perf_field->nb);
#endif
#ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&perf_field->nb);
#endif
This page took
0.025738 seconds
and
4
git commands to generate.