lkml.org 
[lkml]   [2016]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/27] perf machine: Destructors should accept NULL
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    And do nothing, just like free(), to avoid having to test it in callers,
    usually in error paths.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/n/tip-q42gj3b3znhho9z1mrbo4jce@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/machine.c | 6 ++++--
    tools/perf/util/probe-event.c | 6 ++----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
    index a0c186acb1f3..bc2cdbd09a25 100644
    --- a/tools/perf/util/machine.c
    +++ b/tools/perf/util/machine.c
    @@ -138,8 +138,10 @@ void machine__exit(struct machine *machine)

    void machine__delete(struct machine *machine)
    {
    - machine__exit(machine);
    - free(machine);
    + if (machine) {
    + machine__exit(machine);
    + free(machine);
    + }
    }

    void machines__init(struct machines *machines)
    diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
    index 084756c17309..caad19d8c7ef 100644
    --- a/tools/perf/util/probe-event.c
    +++ b/tools/perf/util/probe-event.c
    @@ -102,10 +102,8 @@ out:

    void exit_probe_symbol_maps(void)
    {
    - if (host_machine) {
    - machine__delete(host_machine);
    - host_machine = NULL;
    - }
    + machine__delete(host_machine);
    + host_machine = NULL;
    symbol__exit();
    }

    --
    2.5.5
    \
     
     \ /
      Last update: 2016-06-24 00:21    [W:4.098 / U:0.548 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site