From: Mathieu Poirier <mathieu.poirier@linaro.org> To: acme@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, suzuki.poulose@arm.com, leo.yan@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Subject: [PATCH v2 06/17] perf tools: Refactor error path in cs_etm_decoder__new() Date: Fri, 24 May 2019 11:34:57 -0600 [thread overview] Message-ID: <20190524173508.29044-7-mathieu.poirier@linaro.org> (raw) In-Reply-To: <20190524173508.29044-1-mathieu.poirier@linaro.org> There is no point in having two different error goto statement since the openCSD API to free a decoder handles NULL pointers. As such function cs_etm_decoder__free() can be called to deal with all aspect of freeing decoder memory. Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index 39fe21e1cf93..5dafec421b0d 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -577,7 +577,7 @@ cs_etm_decoder__new(int num_cpu, struct cs_etm_decoder_params *d_params, /* init library print logging support */ ret = cs_etm_decoder__init_def_logger_printing(d_params, decoder); if (ret != 0) - goto err_free_decoder_tree; + goto err_free_decoder; /* init raw frame logging if required */ cs_etm_decoder__init_raw_frame_logging(d_params, decoder); @@ -587,15 +587,13 @@ cs_etm_decoder__new(int num_cpu, struct cs_etm_decoder_params *d_params, &t_params[i], decoder); if (ret != 0) - goto err_free_decoder_tree; + goto err_free_decoder; } return decoder; -err_free_decoder_tree: - ocsd_destroy_dcd_tree(decoder->dcd_tree); err_free_decoder: - free(decoder); + cs_etm_decoder__free(decoder); return NULL; } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Mathieu Poirier <mathieu.poirier@linaro.org> To: acme@kernel.org Cc: suzuki.poulose@arm.com, peterz@infradead.org, coresight@lists.linaro.org, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, mingo@redhat.com, leo.yan@linaro.org, namhyung@kernel.org, jolsa@redhat.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 06/17] perf tools: Refactor error path in cs_etm_decoder__new() Date: Fri, 24 May 2019 11:34:57 -0600 [thread overview] Message-ID: <20190524173508.29044-7-mathieu.poirier@linaro.org> (raw) In-Reply-To: <20190524173508.29044-1-mathieu.poirier@linaro.org> There is no point in having two different error goto statement since the openCSD API to free a decoder handles NULL pointers. As such function cs_etm_decoder__free() can be called to deal with all aspect of freeing decoder memory. Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index 39fe21e1cf93..5dafec421b0d 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -577,7 +577,7 @@ cs_etm_decoder__new(int num_cpu, struct cs_etm_decoder_params *d_params, /* init library print logging support */ ret = cs_etm_decoder__init_def_logger_printing(d_params, decoder); if (ret != 0) - goto err_free_decoder_tree; + goto err_free_decoder; /* init raw frame logging if required */ cs_etm_decoder__init_raw_frame_logging(d_params, decoder); @@ -587,15 +587,13 @@ cs_etm_decoder__new(int num_cpu, struct cs_etm_decoder_params *d_params, &t_params[i], decoder); if (ret != 0) - goto err_free_decoder_tree; + goto err_free_decoder; } return decoder; -err_free_decoder_tree: - ocsd_destroy_dcd_tree(decoder->dcd_tree); err_free_decoder: - free(decoder); + cs_etm_decoder__free(decoder); return NULL; } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-24 17:35 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-24 17:34 [PATCH v2 00/17] perf tools: Coresight: Add CPU-wide trace support Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-05-24 17:34 ` [PATCH v2 01/17] perf tools: Configure contextID tracing in CPU-wide mode Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-06-07 9:21 ` Suzuki K Poulose 2019-06-07 9:21 ` Suzuki K Poulose 2019-06-07 17:40 ` Mathieu Poirier 2019-06-07 17:40 ` Mathieu Poirier 2019-06-07 18:20 ` Arnaldo Carvalho de Melo 2019-06-07 18:20 ` Arnaldo Carvalho de Melo 2019-06-07 19:33 ` Mathieu Poirier 2019-06-07 19:33 ` Mathieu Poirier 2019-06-17 19:36 ` [tip:perf/core] perf cs-etm: Remove duplicate GENMASK() define, use linux/bits.h instead tip-bot for Arnaldo Carvalho de Melo 2019-06-17 19:20 ` [tip:perf/core] perf cs-etm: Configure contextID tracing in CPU-wide mode tip-bot for Mathieu Poirier 2019-05-24 17:34 ` [PATCH v2 02/17] perf tools: Configure timestsamp generation " Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-06-07 9:41 ` Suzuki K Poulose 2019-06-07 9:41 ` Suzuki K Poulose 2019-06-07 17:46 ` Mathieu Poirier 2019-06-07 17:46 ` Mathieu Poirier 2019-06-07 18:34 ` Arnaldo Carvalho de Melo 2019-06-07 18:34 ` Arnaldo Carvalho de Melo 2019-06-17 19:20 ` [tip:perf/core] perf cs-etm: Configure timestamp " tip-bot for Mathieu Poirier 2019-05-24 17:34 ` [PATCH v2 03/17] perf tools: Configure SWITCH_EVENTS " Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-06-17 19:21 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:34 ` [PATCH v2 04/17] perf tools: Add handling of itrace start events Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-06-17 19:22 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:34 ` [PATCH v2 05/17] perf tools: Add handling of switch-CPU-wide events Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-06-17 19:22 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier [this message] 2019-05-24 17:34 ` [PATCH v2 06/17] perf tools: Refactor error path in cs_etm_decoder__new() Mathieu Poirier 2019-06-17 19:23 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:34 ` [PATCH v2 07/17] perf tools: Move packet queue out of decoder structure Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-06-17 19:24 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:34 ` [PATCH v2 08/17] perf tools: Fix indentation in function cs_etm__process_decoder_queue() Mathieu Poirier 2019-05-24 17:34 ` Mathieu Poirier 2019-06-17 19:25 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 09/17] perf tools: Introduce the concept of trace ID queues Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:25 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 10/17] perf tools: Get rid of unused cpu in struct cs_etm_queue Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:26 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 11/17] perf tools: Move thread to traceid_queue Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:27 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 12/17] perf tools: Move tid/pid " Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:27 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 13/17] perf tools: Use traceID aware memory callback API Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:28 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 14/17] perf tools: Add support for multiple traceID queues Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:29 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 15/17] perf tools: Linking PE contextID with perf thread mechanic Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:29 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 16/17] perf tools: Add notion of time to decoding code Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-06 18:50 ` Arnaldo Carvalho de Melo 2019-06-06 18:50 ` Arnaldo Carvalho de Melo 2019-06-07 14:38 ` Mathieu Poirier 2019-06-07 14:38 ` Mathieu Poirier 2019-06-17 19:30 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-24 17:35 ` [PATCH v2 17/17] perf tools: Add support for CPU-wide trace scenarios Mathieu Poirier 2019-05-24 17:35 ` Mathieu Poirier 2019-06-17 19:31 ` [tip:perf/core] perf cs-etm: " tip-bot for Mathieu Poirier 2019-05-31 1:45 ` [PATCH v2 00/17] perf tools: Coresight: Add CPU-wide trace support Leo Yan 2019-05-31 1:45 ` Leo Yan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190524173508.29044-7-mathieu.poirier@linaro.org \ --to=mathieu.poirier@linaro.org \ --cc=acme@kernel.org \ --cc=alexander.shishkin@linux.intel.com \ --cc=coresight@lists.linaro.org \ --cc=jolsa@redhat.com \ --cc=leo.yan@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ --cc=suzuki.poulose@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.