From 43736b71dd051212d5c55be9fa21c45993017fbb Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Fri, 22 Oct 2021 18:21:33 +0300 Subject: [PATCH] Add sched_get/setaffinity(3) for compatibility with Linux. Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D32901 --- include/sched.h | 7 +++++++ lib/libc/gen/Makefile.inc | 2 ++ lib/libc/gen/Symbol.map | 5 +++++ lib/libc/gen/sched_getaffinity.c | 36 ++++++++++++++++++++++++++++++++ lib/libc/gen/sched_setaffinity.c | 36 ++++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 lib/libc/gen/sched_getaffinity.c create mode 100644 lib/libc/gen/sched_setaffinity.c diff --git a/include/sched.h b/include/sched.h index 1a8eac18109c..531ecb1bb9a3 100644 --- a/include/sched.h +++ b/include/sched.h @@ -43,4 +43,11 @@ typedef struct _cpuset cpu_set_t; #endif /* _WITH_CPU_SET_T */ #endif /* __BSD_VISIBLE */ +__BEGIN_DECLS +#if __BSD_VISIBLE +int sched_getaffinity(pid_t pid, size_t cpusetsz, cpuset_t *cpuset); +int sched_setaffinity(int pid, size_t cpusetsz, const cpuset_t *cpuset); +#endif /* __BSD_VISIBLE */ +__END_DECLS + #endif /* __SCHED_H__ */ diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index aa9a4c0cbf67..75bc30d70976 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -123,6 +123,8 @@ SRCS+= __getosreldate.c \ scandir.c \ scandir_b.c \ scandir-compat11.c \ + sched_getaffinity.c \ + sched_setaffinity.c \ seed48.c \ seekdir.c \ semctl.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index c89eb63caada..a4630749ae7e 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -435,6 +435,11 @@ FBSD_1.6 { tcsetwinsize; }; +FBSD_1.7 { + sched_getaffinity; + sched_setaffinity; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; diff --git a/lib/libc/gen/sched_getaffinity.c b/lib/libc/gen/sched_getaffinity.c new file mode 100644 index 000000000000..191374a3c5e3 --- /dev/null +++ b/lib/libc/gen/sched_getaffinity.c @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +int +sched_getaffinity(pid_t pid, size_t cpusetsz, cpuset_t *cpuset) +{ + return (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, + cpusetsz, cpuset)); +} diff --git a/lib/libc/gen/sched_setaffinity.c b/lib/libc/gen/sched_setaffinity.c new file mode 100644 index 000000000000..9368b1752b74 --- /dev/null +++ b/lib/libc/gen/sched_setaffinity.c @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +int +sched_setaffinity(pid_t pid, size_t cpusetsz, const cpuset_t *cpuset) +{ + return (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, + cpusetsz, cpuset)); +}