Merge pull request #407 from apple/automerge/merge-main-2026-10-17_09-08

This commit is contained in:
Guillaume Lessard authored and GitHub committed 2026-10-18 17:22:18 -07:00
commit 6374a4ab3a
23 files changed
+124 -164

No files matched your search

-3
View File
@@ -13,12 +13,9 @@ target_include_directories(CSystem PUBLIC
$<INSTALL_INTERFACE:include/CSystem>)
install(FILES
include/CSystemDarwin.h
include/CSystemLinux.h
include/CSystemShared.h
include/CSystemWASI.h
include/CSystemWindows.h
include/CSystemFreeBSD.h
include/io_uring.h
include/module.modulemap
DESTINATION include/CSystem)
-20
View File
@@ -1,20 +0,0 @@
/*
This source file is part of the Swift System open source project
Copyright (c) 2026 Apple Inc. and the Swift System project authors
Licensed under Apache License v2.0 with Runtime Library Exception
See https://swift.org/LICENSE.txt for license information
*/
#if defined(__APPLE__)
#include <fcntl.h>
#ifdef O_CLOFORK
#define COMPATIBILITY_O_CLOFORK O_CLOFORK
#else
#define COMPATIBILITY_O_CLOFORK 0
#endif
#endif // defined(__APPLE__)
-20
View File
@@ -1,20 +0,0 @@
/*
This source file is part of the Swift System open source project
Copyright (c) 2026 Apple Inc. and the Swift System project authors
Licensed under Apache License v2.0 with Runtime Library Exception
See https://swift.org/LICENSE.txt for license information
*/
#if defined(__FreeBSD__)
#include <fcntl.h>
#ifdef O_CLOFORK
#define COMPATIBILITY_O_CLOFORK O_CLOFORK
#else
#define COMPATIBILITY_O_CLOFORK 0
#endif
#endif // defined(__FreeBSD__)
+20 -12
View File
@@ -1,7 +1,7 @@
/*
This source file is part of the Swift System open source project
Copyright (c) 2020 Apple Inc. and the Swift System project authors
Copyright (c) 2020 - 2026 Apple Inc. and the Swift System project authors
Licensed under Apache License v2.0 with Runtime Library Exception
See https://swift.org/LICENSE.txt for license information
@@ -9,16 +9,24 @@
#ifdef __linux__
#include <sys/epoll.h>
// Glibc doesn't export eventfd, which the tests use.
#include <sys/eventfd.h>
#include <sys/socket.h>
#include <sys/sysinfo.h>
#include <sys/timerfd.h>
#include <sys/types.h>
#include <errno.h>
#include <pthread.h>
#include <sched.h>
#include <unistd.h>
#include "io_uring.h"
#endif
#if !defined(__ANDROID__)
#include <stddef.h>
#include "io_uring.h"
// Defined in shims.c, which can include the libc headers they need.
extern int csystem_io_uring_setup(unsigned int entries,
struct io_uring_params *p);
extern int csystem_io_uring_enter(int fd, unsigned int to_submit,
unsigned int min_complete,
unsigned int flags, void *sig);
extern int csystem_io_uring_enter2(int fd, unsigned int to_submit,
unsigned int min_complete,
unsigned int flags, void *args, size_t sz);
extern int csystem_io_uring_register(int fd, unsigned int opcode, void *arg,
unsigned int nr_args);
#endif // !defined(__ANDROID__)
#endif // __linux__
-17
View File
@@ -1,17 +0,0 @@
/*
This source file is part of the Swift System open source project
Copyright (c) 2020 Apple Inc. and the Swift System project authors
Licensed under Apache License v2.0 with Runtime Library Exception
See https://swift.org/LICENSE.txt for license information
*/
#if defined(_WIN32)
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#define VC_EXTRA_LEAN
#include <Windows.h>
#endif
+3 -43
View File
@@ -1,7 +1,6 @@
#include <unistd.h>
#include <sys/syscall.h>
#include <sys/uio.h>
#include <signal.h>
#pragma once
// Types only: the syscall wrappers need libc headers, so they're in shims.c.
#define __SWIFT_IORING_SQE_FALLBACK_STRUCT { \
__u8 opcode; \
@@ -193,19 +192,6 @@ struct io_uring_params {
};
#endif // __has_include(<linux/io_uring.h>)
#ifndef SWIFT_IORING_C_WRAPPER
#define SWIFT_IORING_C_WRAPPER
# ifndef __NR_io_uring_setup
# define __NR_io_uring_setup 425
# endif
# ifndef __NR_io_uring_enter
# define __NR_io_uring_enter 426
# endif
# ifndef __NR_io_uring_register
# define __NR_io_uring_register 427
# endif
/*
struct io_uring_getevents_arg {
__u64 sigmask;
@@ -220,29 +206,3 @@ struct swift_io_uring_getevents_arg {
__u32 min_wait_usec;
__u64 ts;
};
static inline int io_uring_register(int fd, unsigned int opcode, void *arg,
unsigned int nr_args)
{
return syscall(__NR_io_uring_register, fd, opcode, arg, nr_args);
}
static inline int io_uring_setup(unsigned int entries, struct io_uring_params *p)
{
return syscall(__NR_io_uring_setup, entries, p);
}
static inline int io_uring_enter2(int fd, unsigned int to_submit, unsigned int min_complete,
unsigned int flags, void *args, size_t sz)
{
return syscall(__NR_io_uring_enter, fd, to_submit, min_complete,
flags, args, sz);
}
static inline int io_uring_enter(int fd, unsigned int to_submit, unsigned int min_complete,
unsigned int flags, sigset_t *sig)
{
return io_uring_enter2(fd, to_submit, min_complete, flags, sig, _NSIG / 8);
}
#endif
+11 -3
View File
@@ -1,9 +1,17 @@
// System imports CSystem with `internal import`. Don't include a header that
// the platform's C module also includes: CSystem would then co-own its
// declarations, so Swift would limit them to CSystem's import access level and
// could credit their members to CSystem under MemberImportVisibility.
// (CSystemWASI.h still does; see Constants.swift.)
module CSystem {
header "CSystemShared.h"
header "CSystemDarwin.h"
header "CSystemLinux.h"
header "CSystemWASI.h"
header "CSystemWindows.h"
header "CSystemFreeBSD.h"
export *
}
// IORing's inlinable code stores these types, so System imports this module
// with `public import`. Keep libc headers out of it too.
module CSystemIOUring {
header "io_uring.h"
}
+39 -8
View File
@@ -14,19 +14,14 @@
#include <unistd.h>
#endif
#if defined(__FreeBSD__)
#include <CSystemFreeBSD.h>
#endif
#ifdef __linux__
#define _GNU_SOURCE
#include <signal.h>
#include <sys/syscall.h>
#include <unistd.h>
#include <CSystemLinux.h>
#endif
#if defined(_WIN32)
#include <CSystemWindows.h>
#endif
#include <errno.h>
#if !defined(_WIN32) && !defined(__wasi__) && !defined(__APPLE__)
@@ -70,3 +65,39 @@ extern int csystem_posix_dup3(int fildes, int fildes2, int flag) {
return -1;
#endif
}
#if defined(__linux__) && !defined(__ANDROID__)
# ifndef __NR_io_uring_setup
# define __NR_io_uring_setup 425
# endif
# ifndef __NR_io_uring_enter
# define __NR_io_uring_enter 426
# endif
# ifndef __NR_io_uring_register
# define __NR_io_uring_register 427
# endif
extern int csystem_io_uring_setup(unsigned int entries,
struct io_uring_params *p) {
return syscall(__NR_io_uring_setup, entries, p);
}
extern int csystem_io_uring_enter2(int fd, unsigned int to_submit,
unsigned int min_complete,
unsigned int flags, void *args, size_t sz) {
return syscall(__NR_io_uring_enter, fd, to_submit, min_complete, flags,
args, sz);
}
extern int csystem_io_uring_enter(int fd, unsigned int to_submit,
unsigned int min_complete,
unsigned int flags, void *sig) {
return csystem_io_uring_enter2(fd, to_submit, min_complete, flags, sig,
_NSIG / 8);
}
extern int csystem_io_uring_register(int fd, unsigned int opcode, void *arg,
unsigned int nr_args) {
return syscall(__NR_io_uring_register, fd, opcode, arg, nr_args);
}
#endif // defined(__linux__) && !defined(__ANDROID__)
@@ -9,7 +9,6 @@
#if !os(Windows)
import CSystem
#if SYSTEM_PACKAGE_DARWIN
import Darwin
#elseif canImport(Glibc)
@@ -17,6 +16,7 @@ import Glibc
#elseif canImport(Musl)
import Musl
#elseif canImport(WASILibc)
internal import CSystem // For the members of system_dirent
import WASILibc
#elseif canImport(Android)
import Android
-3
View File
@@ -15,15 +15,12 @@
#if SYSTEM_PACKAGE_DARWIN
import Darwin
#elseif canImport(Glibc)
import CSystem
import Glibc
#elseif canImport(Musl)
import CSystem
import Musl
#elseif canImport(WASILibc)
import WASILibc
#elseif canImport(Android)
import CSystem
import Android
#else
#error("Unsupported Platform")
+1 -1
View File
@@ -10,7 +10,7 @@
#if compiler(>=6.2) && $Lifetimes
#if os(Linux)
import CSystem
public import CSystemIOUring
public extension IORing {
struct Completion: ~Copyable {
+1 -1
View File
@@ -10,7 +10,7 @@
#if compiler(>=6.2) && $Lifetimes
#if os(Linux)
import CSystem
public import CSystemIOUring
@usableFromInline
internal enum IORequestCore {
+8 -7
View File
@@ -10,14 +10,15 @@
#if compiler(>=6.2) && $Lifetimes
#if os(Linux)
import CSystem
internal import CSystem
public import CSystemIOUring
#if canImport(Glibc)
import Glibc
#elseif canImport(Musl)
import Musl
#endif
/// Throwing wrapper around the `io_uring_enter2` shim.
/// Throwing wrapper around the `csystem_io_uring_enter2` shim.
///
/// On success returns the syscall's non-negative result (the number of SQEs
/// consumed by the kernel). On failure, reads `errno` and throws the matching
@@ -32,14 +33,14 @@ internal func _ioUringEnter2(
argsSize: Int
) throws(Errno) -> Int32 {
let result = valueOrErrno(retryOnInterrupt: true) {
io_uring_enter2(
csystem_io_uring_enter2(
ringDescriptor, toSubmit, minComplete, flags, args, argsSize
)
}
return try result.get()
}
/// Throwing wrapper around the `io_uring_enter` shim.
/// Throwing wrapper around the `csystem_io_uring_enter` shim.
///
/// On success returns the syscall's non-negative result (the number of SQEs
/// consumed by the kernel). On failure, reads `errno` and throws the matching
@@ -53,12 +54,12 @@ internal func _ioUringEnter(
sig: UnsafeMutablePointer<sigset_t>?
) throws(Errno) -> Int32 {
let result = valueOrErrno(retryOnInterrupt: true) {
io_uring_enter(ringDescriptor, toSubmit, minComplete, flags, sig)
csystem_io_uring_enter(ringDescriptor, toSubmit, minComplete, flags, sig)
}
return try result.get()
}
/// Throwing wrapper around the `io_uring_register` shim.
/// Throwing wrapper around the `csystem_io_uring_register` shim.
///
/// On success returns the syscall's non-negative result. On failure, reads
/// `errno` and throws the matching `Errno`. `EINTR` is retried automatically.
@@ -70,7 +71,7 @@ internal func _ioUringRegister(
nrArgs: UInt32
) throws(Errno) -> Int32 {
let result = valueOrErrno(retryOnInterrupt: true) {
io_uring_register(ringDescriptor, opcode, arg, nrArgs)
csystem_io_uring_register(ringDescriptor, opcode, arg, nrArgs)
}
return try result.get()
}
+3 -2
View File
@@ -10,7 +10,8 @@
#if compiler(>=6.2) && $Lifetimes
#if os(Linux)
import CSystem
internal import CSystem
public import CSystemIOUring
// needed for mmap
#if canImport(Glibc)
import Glibc
@@ -232,7 +233,7 @@ private func setUpRing(
var err: Errno? = nil
let ringDescriptor = withUnsafeMutablePointer(to: &params) {
let result = io_uring_setup(queueDepth, $0)
let result = csystem_io_uring_setup(queueDepth, $0)
if result < 0 {
err = Errno.current
}
+1 -1
View File
@@ -10,7 +10,7 @@
#if compiler(>=6.2) && $Lifetimes
#if os(Linux)
import CSystem
public import CSystemIOUring
#if canImport(Glibc)
import Glibc
#elseif canImport(Musl)
+2 -6
View File
@@ -10,19 +10,15 @@
#if SYSTEM_PACKAGE_DARWIN
import Darwin
#elseif os(Windows)
import CSystem
import ucrt
#elseif canImport(Glibc)
import CSystem
import Glibc
#elseif canImport(Musl)
import CSystem
import Musl
#elseif canImport(WASILibc)
import WASILibc
#elseif canImport(Bionic)
import CSystem
import Bionic
#elseif canImport(Android)
import Android
#else
#error("Unsupported Platform")
#endif
+7 -2
View File
@@ -11,11 +11,11 @@
// they can be used anywhere without imports and without confusion to
// unavailable local decls.
import CSystem
#if SYSTEM_PACKAGE_DARWIN
import Darwin
#elseif os(Windows)
import ucrt
import WinSDK
#elseif canImport(Glibc)
import Glibc
#elseif canImport(Musl)
@@ -28,6 +28,11 @@ import Android
#error("Unsupported Platform")
#endif
// Some WASI constants come from CSystem and are inlined into clients.
#if os(WASI)
public import CSystem
#endif
// MARK: errno
#if SYSTEM_PACKAGE_DARWIN
@_alwaysEmitIntoClient
@@ -629,7 +634,7 @@ internal var _O_CLOEXEC: CInt {
@_alwaysEmitIntoClient
internal var _O_CLOFORK: CInt {
#if SYSTEM_PACKAGE_DARWIN || os(FreeBSD)
COMPATIBILITY_O_CLOFORK
0x0800_0000 // O_CLOFORK, which SDKs before macOS 27 and older FreeBSD lack
#elseif !os(WASI) && !os(Linux) && !os(Android)
O_CLOFORK
#else
+1 -6
View File
@@ -10,23 +10,18 @@
// Internal wrappers and typedefs which help reduce #if littering in System's
// code base.
// TODO: Should CSystem just include all the header files we need?
#if SYSTEM_PACKAGE_DARWIN
import Darwin
#elseif os(Windows)
import CSystem
import ucrt
import WinSDK
#elseif canImport(Glibc)
import CSystem
import Glibc
#elseif canImport(Musl)
import CSystem
import Musl
#elseif canImport(WASILibc)
import WASILibc
#elseif canImport(Android)
import CSystem
import Android
#else
#error("Unsupported Platform")
+1 -1
View File
@@ -7,7 +7,7 @@
See https://swift.org/LICENSE.txt for license information
*/
import CSystem
internal import CSystem
#if SYSTEM_PACKAGE_DARWIN
import Darwin
#elseif canImport(Glibc)
+5 -2
View File
@@ -16,8 +16,9 @@
// - Access raw C members of vended types (e.g. CInterop.Stat) as a downstream
// consumer would. Don't go through the Swift (e.g. Stat) wrapper since its
// accesses happen inside System, where importing CSystem is fine.
// - Touch every direct member the public API exposes. One field is not always
// a safe proxy for the rest.
// - Touch every direct member the public API exposes, and the members of C
// types it exposes through them (e.g. timespec). One field is not always a
// safe proxy for the rest.
#if canImport(Glibc) || canImport(Musl) || canImport(Android)
#if canImport(Glibc)
@@ -43,5 +44,7 @@ func _mivProbe(_ s: CInterop.Stat) {
_ = s.st_atim
_ = s.st_mtim
_ = s.st_ctim
_ = s.st_atim.tv_sec
_ = s.st_atim.tv_nsec
}
#endif
@@ -201,6 +201,22 @@ final class FileOperationsTest: XCTestCase {
}
}
}
#if canImport(Darwin, _version: 428) // The macOS 27 SDK defines O_CLOFORK.
func testAdHocPipeCloseOnFork() throws {
guard #available(macOS 27.0, iOS 27.0, watchOS 27.0, tvOS 27.0, visionOS 27.0, *) else {
throw XCTSkip("pipe2 and PipeOptions require anyAppleOS 27 or newer")
}
// System spells O_CLOFORK as a literal on Darwin.
XCTAssertEqual(FileDescriptor.PipeOptions.closeOnFork.rawValue, O_CLOFORK)
let pipe = try FileDescriptor.pipe(options: .closeOnFork)
try pipe.readEnd.closeAfter {
try pipe.writeEnd.closeAfter {
XCTAssertEqual(fcntl(pipe.readEnd.rawValue, F_GETFD) & FD_CLOFORK, FD_CLOFORK)
}
}
}
#endif
#endif // !os(WASI)
#if !os(Windows)
+4 -3
View File
@@ -2,7 +2,8 @@
#if os(Linux)
import XCTest
import CSystem //for eventfd
import CSystem // for eventfd and csystem_io_uring_setup
import CSystemIOUring
#if canImport(Glibc)
import Glibc // for errno
#elseif canImport(Musl)
@@ -30,7 +31,7 @@ let failureMessage = "Runtime environment does not support IORing."
func isUringEnabled() throws -> Bool {
// Even if the kernel supports io_uring, the SystemPackage build may have
// been compiled against older kernel headers that lack features it needs
// (gated on IORING_TIMEOUT_BOOTTIME in CSystem); in that configuration
// (gated on IORING_TIMEOUT_BOOTTIME in io_uring.h); in that configuration
// IORing.init throws ENOTSUP. Treat that as disabled so tests skip cleanly
// instead of failing.
do throws(Errno) {
@@ -61,7 +62,7 @@ func isUringEnabled() throws -> Bool {
// - EPERM or EACCES -> treat as disabled
// - propagate any other error.
var params = io_uring_params()
let raw = io_uring_setup(1, &params)
let raw = csystem_io_uring_setup(1, &params)
if raw < 0 {
let err = Errno(rawValue: errno)
switch err {
-2
View File
@@ -16,10 +16,8 @@ import Testing
#if SYSTEM_PACKAGE_DARWIN
import Darwin
#elseif canImport(Glibc)
import CSystem
import Glibc
#elseif canImport(Musl)
import CSystem
import Musl
#elseif canImport(WASILibc)
import CSystem