From patchwork Wed Jul 19 19:55:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 42847 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b813:b0:130:ccc6:6c4b with SMTP id fi19csp1427854pzb; Wed, 19 Jul 2023 12:56:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlEjB6TMSJxuoYWe1OBs9UUqKHgK7ZKwE0tM/rGLabUx2w7en8Ose8gjqYcmnDgONRtvdSCQ X-Received: by 2002:a05:6402:514f:b0:51a:2c81:72ee with SMTP id n15-20020a056402514f00b0051a2c8172eemr3227407edd.20.1689796575956; Wed, 19 Jul 2023 12:56:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689796575; cv=none; d=google.com; s=arc-20160816; b=Wf6JtBqhuNV830o1tARTALcW9So+cMHD0Sr2w/7g8pR25ntSehJyEaDv+UGuj6nWzR GLRvsGrxxZOY8lY7E1R9OVhSJrBXuAW6U9U5RMkwxTpOsQ66vCjuHLu+yUP6U9SSI+wl t4jT/NbbkEx/FeANehQT98kA3gZ9Ljt8sxJBXuT+Y5nZDp/Mf1kvswmaL41BbE4el4f/ uUm6ZS7W4ZCKiu6RD+ridqpiDTGl1v88KdzJyaV4/p8cWe/TgecVCgU8HK5AMXEUBE/F P2GNhgn4aWXcMEpm5YpBujHW5Q1dsUmHco95aaVUcSuvf9+JMZ8AQM32Av4he6USi0X6 eV/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=QZrMDfkQM0afRc8S4s89dHe/bH9TwgXWfTX/VXoVnDY=; fh=hQcp50obTJ8bXC1it5NuEN23RGKfx0/zZ3s2gmreL+A=; b=it2opUWVWGY+nQETwpvISgK8mKNXHkkLAPoyK0E9uFlQPrAhY3+ll1sYLS1tLDhOXW R2Gr2Wp4/vWM8F8K6Pkha5s7A39a6Vdp/Mtp1A3XqWQoD/cBtOiVvCg5lzrwTkVAOan/ FtK0kT2+ltGGx4I9fLqq5ODB2VEC9WcJMFrfTGPsU3TDbBXhnLozQq8DIPZcwFaltxs+ dNQfPup0SPEwYVLoBL6V18TQKxGhue25t2UCJahkdNxDeaZ93s8754tvDW+dFqwlE0ZK 1wmxShoPpC9lEB+n4z0s02YNiPybvv/BoQ8ne5ze3fOlt0H9PoiyBEdhL62Kee1FgfWA DlMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u5-20020a50eac5000000b00521830574b5si3656044edp.153.2023.07.19.12.56.15; Wed, 19 Jul 2023 12:56:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 39FDE68C636; Wed, 19 Jul 2023 22:55:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E848968C33E for ; Wed, 19 Jul 2023 22:55:41 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 67F16C021A for ; Wed, 19 Jul 2023 22:55:41 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jul 2023 22:55:38 +0300 Message-Id: <20230719195540.46961-4-remi@remlab.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <2113654.OBFZWjSADL@basile.remlab.net> References: <2113654.OBFZWjSADL@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] checkasm: make bench clean-up also a function pointer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BIYGNzAJ2gA7 There are no performance concerns with cleaning up, so might as well indirect it. This incidentally fixes a corner case (and inconsequential) bug whereby the Linux perf descriptor is zero and did not get closed. --- tests/checkasm/checkasm.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 987162e6b5..fad660a924 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -320,9 +320,12 @@ static struct { /* perf */ int nop_time; +#if CONFIG_LINUX_PERF int sysfd; +#endif uint64_t (*start)(void); uint64_t (*stop)(void); + void (*close)(void); int cpu_flag; const char *cpu_flag_name; @@ -683,6 +686,11 @@ static uint64_t checkasm_bench_linux_perf_stop(void) return (read(fd, &t, sizeof(t)) == sizeof (t)) ? t : 0; } +static void checkasm_bench_linux_perf_close(void) +{ + close(state.sysfd); +} + static int bench_init_linux(void) { struct perf_event_attr attr = { @@ -703,6 +711,7 @@ static int bench_init_linux(void) } state.start = checkasm_bench_linux_perf_start; state.stop = checkasm_bench_linux_perf_stop; + state.close = checkasm_bench_linux_perf_close; return 0; } #elif CONFIG_MACOS_KPERF @@ -742,14 +751,6 @@ static int bench_init(void) return 0; } -static void bench_uninit(void) -{ -#if CONFIG_LINUX_PERF - if (state.sysfd > 0) - close(state.sysfd); -#endif -} - static int usage(const char *path) { fprintf(stderr, @@ -816,7 +817,8 @@ int main(int argc, char *argv[]) } destroy_func_tree(state.funcs); - bench_uninit(); + if (state.close != NULL) + state.close(); return ret; }