lkml.org 
[lkml]   [2015]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/10] perf session env: Rename exit method
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    The semantic associated in tools/perf/ with foo__delete(instance) is to
    release all resources referenced by 'instance' members and then release
    the memory for 'instance' itself.

    The perf_session_env__delete() function isn't doing this, it just does
    the first part, but the space used by 'instance' itself isn't freed, as
    it is embedded in a larger structure, that will be freed at other stage.

    For these cases we se foo__exit(), i.e. the usage is:

    void foo__delete(foo)
    {
    if (foo) {
    foo__exit(foo);
    free(foo);
    }
    }

    But when we have something like:

    struct bar {
    struct foo foo;
    . . .
    }

    Then we can't really call foo__delete(&bar.foo), we must have this
    instead:

    void bar__exit(bar)
    {
    foo__exit(&bar.foo);
    /* free other bar-> resources */
    }

    void bar__delete(bar)
    {
    if (bar) {
    bar__exit(bar);
    free(bar);
    }
    }

    So just rename perf_session_env__delete() to perf_session_env__exit().

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Kan Liang <kan.liang@intel.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-djbgpcfo5udqptx3q0flwtmk@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/session.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
    index 2d9574710543..f51eb54aeeb3 100644
    --- a/tools/perf/util/session.c
    +++ b/tools/perf/util/session.c
    @@ -170,7 +170,7 @@ static void perf_session__delete_threads(struct perf_session *session)
    machine__delete_threads(&session->machines.host);
    }

    -static void perf_session_env__delete(struct perf_session_env *env)
    +static void perf_session_env__exit(struct perf_session_env *env)
    {
    zfree(&env->hostname);
    zfree(&env->os_release);
    @@ -193,7 +193,7 @@ void perf_session__delete(struct perf_session *session)
    auxtrace_index__free(&session->auxtrace_index);
    perf_session__destroy_kernel_maps(session);
    perf_session__delete_threads(session);
    - perf_session_env__delete(&session->header.env);
    + perf_session_env__exit(&session->header.env);
    machines__exit(&session->machines);
    if (session->file)
    perf_data_file__close(session->file);
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-07-30 18:41    [W:4.157 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site