From patchwork Thu Aug 17 20:45:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13356935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47034C7112B for ; Thu, 17 Aug 2023 20:46:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355002AbjHQUqB (ORCPT ); Thu, 17 Aug 2023 16:46:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355001AbjHQUp3 (ORCPT ); Thu, 17 Aug 2023 16:45:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C40C35B0 for ; Thu, 17 Aug 2023 13:45:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ECDEE65A21 for ; Thu, 17 Aug 2023 20:45:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00DDFC433AB; Thu, 17 Aug 2023 20:45:23 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qWjs1-000Tpx-1W; Thu, 17 Aug 2023 16:45:29 -0400 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Cc: Ross Zwisler , Stevie Alvarez , "Steven Rostedt (Google)" Subject: [PATCH v4 15/20] libtraceeval histogram: Do the release on updates Date: Thu, 17 Aug 2023 16:45:23 -0400 Message-Id: <20230817204528.114577-16-rostedt@goodmis.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230817204528.114577-1-rostedt@goodmis.org> References: <20230817204528.114577-1-rostedt@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (Google)" If no copy() function exists for a type but a release() function does, then do the release on the old copy. Signed-off-by: Steven Rostedt (Google) --- src/histograms.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/histograms.c b/src/histograms.c index 08d711239284..185480cabad2 100644 --- a/src/histograms.c +++ b/src/histograms.c @@ -595,12 +595,16 @@ static int copy_traceeval_data(struct traceeval_type *type, /* * Free @data with respect to @size and @type. * - * Does not call the release callback on the data. + * Does not call the release() callback if a copy() exists. */ static void data_release(size_t size, union traceeval_data **data, struct traceeval_type *type) { for (size_t i = 0; i < size; i++) { + /* A copy should handle releases */ + if (type[i].release && !type[i].copy) + type[i].release(&type[i], &(*data)[i]); + if (type[i].type == TRACEEVAL_TYPE_STRING) free((*data)[i].string); }