From nobody Fri Jul 4 14:55:54 2025 X-Original-To: dev-commits-src-all@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 4bYcBz3VnKz61HLR; Fri, 04 Jul 2025 14:55:55 +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 4bYcBy6P9pz43Gg; Fri, 04 Jul 2025 14:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640954; 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=mU9ASvjDrItpJiURB6sWIO14JkFejF5DTZK3tcTZdgQ=; b=bYn1sldn6FlW7//ReIsRPQO+4zE598kVKnLqC2alF0z4lS2pN/7q5noK71Famy3NCbeL6A G6vwbHnymdKa3g9ahWPHIc72/RuekOkcxfi0LBXG+NRZlcYuadsARiEWfLQKtyPqW5MWF7 grcGLSyjzYM8OoqCi1Fov39we/y8L5aA0OSThbHlZ+vLPwgdeknYigQpKmu2dC809/Il/k FHaFR7+HC7fZ54M/mIfvCOamn5pmQUjDz551vjFIEJqhwHj4FFIo+S6DAZijyEhoOxvNTp L5gBJFROFJnV2Ks+uHT7KePHBhxmn8/ceYMADPEEd7m2/Sxeyg+XLYdroLbGtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751640954; 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=mU9ASvjDrItpJiURB6sWIO14JkFejF5DTZK3tcTZdgQ=; b=ynLluHL5Kkka+UnvMzmdC2DOWw56y6e3Hzzj+t3IVIhTE/ENHrZaEcMh7DdFKVug+HAajI P7wnT1S55yFzsxFTZBkrG9wqlfLy0bYNYJg3yDfu6+mzPjWZBuH5UAHK9wuoyUqEGdEOLm bCNjxWVnCTiRDZinpLZ4JgiTRL0P/5xBclaAzAU7c8NJoDL3AeJ/p21wDHs8iADjDLz3uE ZDLtNM+D2UJBv5bzaFwtWIu619QUfFlEBQpRIj9TUlthn9ms/Mbjsd3VAmhbgIITPb84Kb cWgXyOKq+xn7miIKC4GDXuOQcVwo/ltbMT7cZM9RXyBTSG+aOkqGQm5Ebv9lvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751640954; a=rsa-sha256; cv=none; b=mxDOB027Q08Epl5T0PX0plyMJdAO9HHdNYicdyZwjdjeW7Ge2iTL/lRFVHa/X+LReSPQ1m GkFLg9fGYHTcwp7jhS472+WzAVN6MedOPLiogHSmQcuynJf6hbNATmyKk9TBPjCBq02tCJ BJR7jOmFLc1YgGDR8kpAlycqNK4Bo2s7jvrHMTMF8mYE3yjnfACIkj+n8E2MoZXJK461fv uVC6E5+jbh0wJ/tNyU672ajhi5/0TYIHwfq2QJedSnmwooOrIvqDkj8DA5nsrrXJoP+p8k Vg3Dtxv4p2d1DvLf70ZBT9/1Bt+UKdhx4LxPMFTWzar9aVWljCbztCMshtW5pA== 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 4bYcBy5vsfztd7; Fri, 04 Jul 2025 14:55:54 +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 564Etse6073503; Fri, 4 Jul 2025 14:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564Etss1073500; Fri, 4 Jul 2025 14:55:54 GMT (envelope-from git) Date: Fri, 4 Jul 2025 14:55:54 GMT Message-Id: <202507041455.564Etss1073500@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: 245ff4c4b2c2 - main - libc: Add inotify support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 245ff4c4b2c2728674121a5d9736a5e079bd00b2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=245ff4c4b2c2728674121a5d9736a5e079bd00b2 commit 245ff4c4b2c2728674121a5d9736a5e079bd00b2 Author: Mark Johnston AuthorDate: 2025-07-03 20:08:59 +0000 Commit: Mark Johnston CommitDate: 2025-07-04 14:42:33 +0000 libc: Add inotify support inotify_init() and inotify_init1() are implemented using __specialfd(2). inotify_add_watch() is implemented in terms of inotify_add_watch_at(2). Reviewed by: kib MFC after: 3 months Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50315 --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 3 +++ lib/libc/gen/inotify.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index ad13aaa65621..4d064d18d36e 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -89,6 +89,7 @@ SRCS+= \ glob.c \ glob-compat11.c \ initgroups.c \ + inotify.c \ isatty.c \ isinf.c \ isnan.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 8faecf4b3048..50dbf3425964 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -464,6 +464,9 @@ FBSD_1.8 { fdscandir_b; fts_open_b; glob_b; + inotify_add_watch; + inotify_init; + inotify_init1; psiginfo; rtld_get_var; rtld_set_var; diff --git a/lib/libc/gen/inotify.c b/lib/libc/gen/inotify.c new file mode 100644 index 000000000000..7ce53aaccd58 --- /dev/null +++ b/lib/libc/gen/inotify.c @@ -0,0 +1,48 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Klara, Inc. + */ + +#include "namespace.h" +#include +#include +#include +#include "un-namespace.h" +#include "libc_private.h" + +/* + * Provide compatibility with libinotify, which uses different values for these + * flags. + */ +#define IN_NONBLOCK_OLD 0x80000 +#define IN_CLOEXEC_OLD 0x00800 + +int +inotify_add_watch(int fd, const char *pathname, uint32_t mask) +{ + return (inotify_add_watch_at(fd, AT_FDCWD, pathname, mask)); +} + +int +inotify_init1(int flags) +{ + struct specialfd_inotify args; + + if ((flags & IN_NONBLOCK_OLD) != 0) { + flags &= ~IN_NONBLOCK_OLD; + flags |= IN_NONBLOCK; + } + if ((flags & IN_CLOEXEC_OLD) != 0) { + flags &= ~IN_CLOEXEC_OLD; + flags |= IN_CLOEXEC; + } + args.flags = flags; + return (__sys___specialfd(SPECIALFD_INOTIFY, &args, sizeof(args))); +} + +int +inotify_init(void) +{ + return (inotify_init1(0)); +}