From patchwork Wed Jul 19 17:16:20 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: 42841 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b813:b0:130:ccc6:6c4b with SMTP id fi19csp1341122pzb; Wed, 19 Jul 2023 10:16:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlHOrUUE/jY/mYkOPYQhiu8s+fFBKVKUJqdS9BObGKI8/1lAMtahabJnNWJp8J4KywSVA7MZ X-Received: by 2002:aa7:dac4:0:b0:51e:da3:1585 with SMTP id x4-20020aa7dac4000000b0051e0da31585mr3308193eds.9.1689786991011; Wed, 19 Jul 2023 10:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689786990; cv=none; d=google.com; s=arc-20160816; b=utylB0aMGiPiBkVTkNcHknhoDe/wefPHJbDTqc3SLWRm1tEtpzLNmLOXj1ocKn8J4D p5tdLnLbg/YUrVdrQFsCRtBl86rf25bf2Z+ViEJ/4jzqqNGLyFz6zRnLbE8fZ17bCgQ4 TaJkrqWe8F4a3qGeeyMhkXEtTWlO67DxYwQs7t7x64htOtWl853VFrFml+z6wADSKxxV aVwr+GcPyGj6CtjPPJH3xkzfgHHduYltIbPZ08HBEOM9MAmZun6KHAjObKDW4LssjRns u1wXiHNA4SzOMRO10KEmN1aAD365wEnoV+S3q2FdHSdlMDmWIG0N2lgrFFMwxQwZ39+n QbBw== 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:message-id:date:to:from :delivered-to; bh=cJrhmd763X0CKIwUG2mzgL5CvUCbYWsDz5eo543JARE=; fh=hQcp50obTJ8bXC1it5NuEN23RGKfx0/zZ3s2gmreL+A=; b=dM3DGVVeoxkyRgGk+KggjMY9iYKkDzm7/34J07vve7uE6TBe1Bdnp9ZesDadXHQ4i6 M56NGdRNZciKl2D5ENonTP1+KFxrdHWxBFYxklGbtXpptwjUkqYdYvjEq7ZoeI8yVXm8 tHzk5C6wslC6HVokTRUhIqALKmEy257A86dd5h623Iktm0q7IULmF43F2k6swCVtYEF5 JPnkfqhpyB4Iz8KMnv1BmmN3+PbEijt7C/ghtLSbxL3wUViyIxFD38BKaMIY+HAj3S2L er94LTpwEs9rz95FC7ZpSWCWlcVJNIT2f+cJx1dsE+LhvPF5Zy01QSb8Gs3LhT+OsuVN Zrkg== 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 e16-20020a50ec90000000b0051e2a1744f3si3131368edr.26.2023.07.19.10.16.30; Wed, 19 Jul 2023 10:16:30 -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 2FBEE68C5D4; Wed, 19 Jul 2023 20:16:27 +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 02C6468BFF8 for ; Wed, 19 Jul 2023 20:16:21 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 7D9A2C01EF for ; Wed, 19 Jul 2023 20:16:20 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jul 2023 20:16:20 +0300 Message-Id: <20230719171620.22045-1-remi@remlab.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] timer: don't leak perf FD if zero 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: 70hQdCYErzTt --- libavutil/timer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/timer.h b/libavutil/timer.h index 861ba7e9d7..2cd299eca3 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -105,9 +105,9 @@ #if CONFIG_LINUX_PERF #define START_TIMER \ - static int linux_perf_fd; \ + static int linux_perf_fd = -1; \ uint64_t tperf; \ - if (!linux_perf_fd) { \ + if (linux_perf_fd == -1) { \ struct perf_event_attr attr = { \ .type = PERF_TYPE_HARDWARE, \ .size = sizeof(struct perf_event_attr), \