lkml.org 
[lkml]   [2013]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 3/8] perf: Gather event accounting code
    On Tue, Jul 23, 2013 at 02:31:01AM +0200, Frederic Weisbecker wrote:
    > Gather all the event accounting code to a single place,
    > once all the prerequisites are completed. This simplifies
    > the refcounting.
    >
    > Original-patch-by: Peter Zijlstra <peterz@infradead.org>
    > Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    > Cc: Jiri Olsa <jolsa@redhat.com>
    > Cc: Peter Zijlstra <peterz@infradead.org>
    > Cc: Namhyung Kim <namhyung@kernel.org>
    > Cc: Ingo Molnar <mingo@kernel.org>
    > Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    > Cc: Stephane Eranian <eranian@google.com>
    > ---
    > kernel/events/core.c | 79 +++++++++++++++++++++++++++++--------------------
    > 1 files changed, 47 insertions(+), 32 deletions(-)
    >
    > diff --git a/kernel/events/core.c b/kernel/events/core.c
    > index c5f435f..3bb73af 100644
    > --- a/kernel/events/core.c
    > +++ b/kernel/events/core.c
    > @@ -3128,6 +3128,21 @@ static void free_event_rcu(struct rcu_head *head)
    > static void ring_buffer_put(struct ring_buffer *rb);
    > static void ring_buffer_detach(struct perf_event *event, struct ring_buffer *rb);
    >
    > +static void __free_event(struct perf_event *event)
    > +{
    > + if (!event->parent) {
    > + if (event->attr.sample_type & PERF_SAMPLE_CALLCHAIN)
    > + put_callchain_buffers();
    > + }
    > +
    > + if (event->destroy)
    > + event->destroy(event);
    > +
    > + if (event->ctx)
    > + put_ctx(event->ctx);
    > +
    > + call_rcu(&event->rcu_head, free_event_rcu);
    > +}
    > static void free_event(struct perf_event *event)
    > {

    nitpick, missing nl between functions

    > irq_work_sync(&event->pending);
    > @@ -3141,8 +3156,6 @@ static void free_event(struct perf_event *event)
    > atomic_dec(&nr_comm_events);
    > if (event->attr.task)
    > atomic_dec(&nr_task_events);
    > - if (event->attr.sample_type & PERF_SAMPLE_CALLCHAIN)
    > - put_callchain_buffers();
    > if (is_cgroup_event(event)) {
    > atomic_dec(&per_cpu(perf_cgroup_events, event->cpu));
    > static_key_slow_dec_deferred(&perf_sched_events);
    > @@ -3180,13 +3193,8 @@ static void free_event(struct perf_event *event)
    > if (is_cgroup_event(event))
    > perf_detach_cgroup(event);
    >
    > - if (event->destroy)
    > - event->destroy(event);
    > -
    > - if (event->ctx)
    > - put_ctx(event->ctx);
    >
    > - call_rcu(&event->rcu_head, free_event_rcu);
    > + __free_event(event);

    nitpick, extra nl above


    \
     
     \ /
      Last update: 2013-08-01 16:01    [W:3.756 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site