From nobody Tue Apr 04 13:19:30 2023 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 4PrSz70x5zz43Ytk; Tue, 4 Apr 2023 13:19:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PrSz70TjJz4QNs; Tue, 4 Apr 2023 13:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680614371; 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=4AZvNUeWAzDC0dt9NgWuvVeovme0bfLcVAuRUiZm/kc=; b=TiP1cMX5MQiPhsua6QsJpHZ4U8jyUrdqzhwg7NfoM1/rseQZ5rpXhO9p4QUE8/GduJdM+P W+67GPeMoxBk4eR9k6xqpH2NJfmnleGMyvhQ3foahMQnLF9S+Ifo6Kd6mAg22X/KX3GU5w EspzHBP7ZyUgWs4Cdtw2DYyw0Gi9YY/G5rkZcbiPHdFIEZ24iVoVwRfPnPZ3G+sxRHoYdY oPw75uU0iFi0y0ecMX8PP/etv2RmFbijjpCFYKW+WmBLanaqixNjAdl+xFZq01uqxw5j14 vGBkZsg9Up32W0rGbBs03jPbge3BhYxHozkwR+93xDieCeqPOiLzohHYNepNJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680614371; 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=4AZvNUeWAzDC0dt9NgWuvVeovme0bfLcVAuRUiZm/kc=; b=MVF7rdF4qQEMPneY+J7lGVdO4zughB12dvv7/pgMebGFCGSQlMH+gU4hmA4qtqbvvS/xl5 xlGhRZmPxs7UmxJqJ+P0wD0geI2BDmTzREQZoMXi1Lbstpu5VGUceDM/Ui1Oo81QQh8LTQ IDf5UCdT5farYXhaL2pM8KvWcCzZLIclWHKwZbEenFEf48oDCL3qUf2I+ty7vL9Md+j9jW gALbAqJwLsylAEYcQY70z2GirPTJBJLM7A//jJA0fkQbGftZyDtDApRi8kK+QVMJkB7izg sfhCimJJ14tesk63TMlM8Bdu5fJRJifNYJCgwjjGLys3IElRPE54iVqc/BVrMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680614371; a=rsa-sha256; cv=none; b=mywwjw5hVD9vjgEPkKUROjqoDA+UmFqrgnKBQ7I7CiteudKyeAFDReOzpEhpJCGqE3SUbV jsaMJ6xcy/o5n+utc4AtuIT8xlDQ59uyRGhyofH74Oz7BHidMO8cQmha8Pz4kAuV57oljq FtQWHG5XjZ79dF7lNuzqbT8M8ClszZmbadYsHTnNjfPAvPKALBuiWrkrdduAYzJq4ZCPdS lp0sYvjnfNRvooCEYMGgg/NappRjTyqmpPo4fZVU+WT7D49ZvVh+Eu0N2UjthOqvbsVyhx ZIbP2G/59LZe8Nr2ufOhB4qkMCGF4lljjljV6ceMm18LWNQPCtmaUIqMCROOiQ== 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 4PrSz66XtzzhHK; Tue, 4 Apr 2023 13:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 334DJUxx084858; Tue, 4 Apr 2023 13:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 334DJUQL084857; Tue, 4 Apr 2023 13:19:30 GMT (envelope-from git) Date: Tue, 4 Apr 2023 13:19:30 GMT Message-Id: <202304041319.334DJUQL084857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: dac310248826 - main - Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dac310248826c37b60306c1b25fb94c35802196d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dac310248826c37b60306c1b25fb94c35802196d commit dac310248826c37b60306c1b25fb94c35802196d Author: Konstantin Belousov AuthorDate: 2023-03-31 22:27:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-04 13:19:08 +0000 Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39377 --- lib/libc/sys/Makefile.inc | 2 +- lib/libc/sys/Symbol.map | 2 +- lib/libc/sys/kqueue.2 | 6 +++--- sys/kern/kern_event.c | 2 +- sys/kern/syscalls.master | 2 +- sys/sys/event.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 54143b288dc4..86b3d296f561 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -430,7 +430,7 @@ MLINKS+=jail.2 jail_attach.2 \ jail.2 jail_set.2 MLINKS+=kldunload.2 kldunloadf.2 MLINKS+=kqueue.2 kevent.2 \ - kqueue.2 kqueue1.2 \ + kqueue.2 kqueuex.2 \ kqueue.2 EV_SET.3 MLINKS+=link.2 linkat.2 MLINKS+=madvise.2 posix_madvise.2 diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 7f6afd7b298b..cc90998e83fb 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -419,7 +419,7 @@ FBSD_1.6 { FBSD_1.7 { _Fork; fspacectl; - kqueue1; + kqueuex; swapoff; }; diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index a2470696d4df..af60bb396d6a 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -38,7 +38,7 @@ .Ft int .Fn kqueue "void" .Ft int -.Fn kqueue1 "u_int flags" +.Fn kqueuex "u_int flags" .Ft int .Fo kevent .Fa "int kq" @@ -92,7 +92,7 @@ flag, then the descriptor table is shared, which will allow sharing of the kqueue between two processes. .Pp The -.Fn kqueue1 +.Fn kqueuex system call also creates a new kernel event queue, and additionally takes the .Fa flags @@ -105,7 +105,7 @@ The returned file descriptor is automatically closed on The .Ql fd = kqueue() call is equivalent to -.Ql fd = kqueue1(0) . +.Ql fd = kqueuex(0) . .Pp The .Fn kevent diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 0da4325ccd6a..5cafa0c803fd 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1058,7 +1058,7 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap) } int -sys_kqueue1(struct thread *td, struct kqueue1_args *uap) +sys_kqueuex(struct thread *td, struct kqueuex_args *uap) { int flags; diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 52ae6bda5a16..92de51fc0d97 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3307,7 +3307,7 @@ ); } 583 AUE_KQUEUE STD|CAPENABLED { - int kqueue1( + int kqueuex( u_int flags ); } diff --git a/sys/sys/event.h b/sys/sys/event.h index a2c0d481ebb2..b902f195723e 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -218,7 +218,7 @@ struct freebsd11_kevent32 { #define NOTE_NSECONDS 0x00000008 /* data is nanoseconds */ #define NOTE_ABSTIME 0x00000010 /* timeout is absolute */ -/* Flags for kqueue1(2) */ +/* Flags for kqueuex(2) */ #define KQUEUE_CLOEXEC 0x00000001 /* close on exec */ struct knote; @@ -361,7 +361,7 @@ struct timespec; __BEGIN_DECLS int kqueue(void); -int kqueue1(unsigned flags); +int kqueuex(unsigned flags); int kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout);