From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9D00746361 for ; Sat, 15 Jul 2023 15:24:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B126068C698; Sat, 15 Jul 2023 18:23:51 +0300 (EEST) Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BFB468C2C7 for ; Sat, 15 Jul 2023 18:23:41 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id CE2AAC0219 for ; Sat, 15 Jul 2023 18:23:40 +0300 (EEST) From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 18:23:37 +0300 Message-Id: <20230715152339.13234-5-remi@remlab.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <2708777.0sFzvF9Jai@basile.remlab.net> References: <2708777.0sFzvF9Jai@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Because we might as well at this point. This incidentally fixes a corner case bug that state.sys_fd == 0 could be either the initial value from .bss or a valid file descriptor (in which case it didn't 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 c90f361ff7..2e327de3a4 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -319,7 +319,9 @@ static struct { /* perf */ int nop_time; +#ifdef CONFIG_LINUX_PERF int sysfd; +#endif int cpu_flag; const char *cpu_flag_name; @@ -516,6 +518,7 @@ static int cmp_nop(const void *a, const void *b) static uint64_t (*checkasm_bench_start)(void); static uint64_t (*checkasm_bench_stop)(void); +static void (*checkasm_bench_close)(void); /* Measure the overhead of the timing code (in decicycles) */ static int measure_nop_time(void) @@ -677,6 +680,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 = { @@ -697,6 +705,7 @@ static int bench_init_linux(void) } checkasm_bench_start = checkasm_bench_linux_perf_start; checkasm_bench_stop = checkasm_bench_linux_perf_stop; + checkasm_bench_close = checkasm_bench_linux_perf_close; return 0; } #elif CONFIG_MACOS_KPERF @@ -743,14 +752,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 -} - int main(int argc, char *argv[]) { unsigned int seed = av_get_random_seed(); @@ -805,7 +806,8 @@ int main(int argc, char *argv[]) } destroy_func_tree(state.funcs); - bench_uninit(); + if (checkasm_bench_close != NULL) + checkasm_bench_close(); return ret; } -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".