From nobody Fri Jul 4 14:56:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bYcCC1xJbz61HTW; Fri, 04 Jul 2025 14:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYcCB6qktz43Fl; Fri, 04 Jul 2025 14:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8b4MrGTsYo6XEUE/fWhy/+ahGqivc3c57ZEHXHsOyHo=; b=I2LMaLj7LFGygMtFGUa+2Xbnsgn7s7gYo766uQk0z/h7AFYGXLaG5ynUCdGOcXthCIqJwR q+YWsI2VSF67vSejceWg2gSDKYFR5+N38+VXQ2u9pK7JZSuY4J1oF9asF5tepP9VnKg8Do xAl1EsuFVU16sIhce6g4b9wxWr2nQF++VAKJKttIdlb+1pH8GvC3cg81vG9rofts454u+d 3eVjBPp/rPMuowdWxATs+xBkJK8zwCx8P0m5ShtDQgch5Bt0aR8eyUhoVL0Dv44H5moP+r Xj8vPVNG2YfOg2X4LwtdieVngCXukfjJxI0SFzgdjRvVosAHt3j4IxXXrhLwlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8b4MrGTsYo6XEUE/fWhy/+ahGqivc3c57ZEHXHsOyHo=; b=RVp4a6riVtGXbxn9BUIO+DRvxHRCnCyd/JzaOU2k80AWh5TsJ0mOJzOd+rkbzodpOaW+5d jEtvGmEkebn139rWedgoYn6e3LgyESG6RxaB6QPgCgbLAFT94N7wBbDNVQHowbSE24rMJU Y3xtQERwJAc2vYbgLkq3gVmIgEWscgcQQd5eSZZKaxESGJ85ZFqw/ewonoyq9U5w6SFTJC 2dAtkmOaWk5qKhhhOvZ+PfadmYOLXuM/0t8AYaqPuVJokTQgQgO+U5Nck7GTTWakRcIDoi 2EyZoANlPD2iwQEE+IE5zVDfsLG9VHI63NduzpybEXP6aqdZ7RMf6xEUhhK+1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751640967; a=rsa-sha256; cv=none; b=ZAkGorcdtVm7aTqAwWfKs8SNBk1RlOFr1XWDkR99t5OgOjtVTvfXczADQGXlsZPu1yPgix O2D+Rylw5XgGAhygxmEAZVsveLW6yn1MGH0uLHIL6braqur3c1fZmNca8DRpH5Y/Nl4MFW zZq3PbQgMaMOP+iSr6v8ckfvq2V+L0JdU0x0eZUpAPbqgoXQ+OhDIPOBuyaB9zk2YehJdI 3I+7c1HLBxfaQcjlWPDGfxL3/z4O/cfE5dYQmRE0S87TDacF1W81YHsYn992f1pbyF4mlE cfgMyW9+gPrGhbrcLduD4OC64pUvfFxGQHdiVtv7DXI84MBah2/n5c5XDPgKjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bYcCB6JTvzvXR; Fri, 04 Jul 2025 14:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 564Eu6J6073894; Fri, 4 Jul 2025 14:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564Eu6JI073891; Fri, 4 Jul 2025 14:56:06 GMT (envelope-from git) Date: Fri, 4 Jul 2025 14:56:06 GMT Message-Id: <202507041456.564Eu6JI073891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 79102e108099 - main - libprocstat: Add handling for inotify descriptors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79102e108099237b1d702e960706a739c7b071bd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=79102e108099237b1d702e960706a739c7b071bd commit 79102e108099237b1d702e960706a739c7b071bd Author: Mark Johnston AuthorDate: 2025-06-09 20:03:08 +0000 Commit: Mark Johnston CommitDate: 2025-07-04 14:42:34 +0000 libprocstat: Add handling for inotify descriptors MFC after: 3 months Sponsored by: Klara, Inc. --- lib/libprocstat/libprocstat.c | 5 +++++ lib/libprocstat/libprocstat.h | 1 + 2 files changed, 6 insertions(+) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 29f464ef6414..eb8137f6c76f 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -625,6 +625,10 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap type = PS_FST_TYPE_EVENTFD; data = file.f_data; break; + case DTYPE_INOTIFY: + type = PS_FST_TYPE_INOTIFY; + data = file.f_data; + break; default: continue; } @@ -717,6 +721,7 @@ kinfo_type2fst(int kftype) { KF_TYPE_SOCKET, PS_FST_TYPE_SOCKET }, { KF_TYPE_VNODE, PS_FST_TYPE_VNODE }, { KF_TYPE_EVENTFD, PS_FST_TYPE_EVENTFD }, + { KF_TYPE_INOTIFY, PS_FST_TYPE_INOTIFY }, { KF_TYPE_UNKNOWN, PS_FST_TYPE_UNKNOWN } }; #define NKFTYPES (sizeof(kftypes2fst) / sizeof(*kftypes2fst)) diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h index 0e9a4214414c..548747f90171 100644 --- a/lib/libprocstat/libprocstat.h +++ b/lib/libprocstat/libprocstat.h @@ -71,6 +71,7 @@ #define PS_FST_TYPE_PROCDESC 13 #define PS_FST_TYPE_DEV 14 #define PS_FST_TYPE_EVENTFD 15 +#define PS_FST_TYPE_INOTIFY 16 /* * Special descriptor numbers.