diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
commit | fa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch) | |
tree | 7d0ae09775ea950056193eaa2ca93844299d46f1 /tests/glthread/yield.h | |
parent | c78359d9542c86b972aac373efcf7bc7a8a560e5 (diff) | |
parent | 2959e59fab3bab834368adefd90bd4b1b094366b (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/glthread/yield.h')
-rw-r--r-- | tests/glthread/yield.h | 57 |
1 files changed, 18 insertions, 39 deletions
diff --git a/tests/glthread/yield.h b/tests/glthread/yield.h index 4bb3ed4..f74267e 100644 --- a/tests/glthread/yield.h +++ b/tests/glthread/yield.h @@ -1,18 +1,18 @@ /* Yielding the processor to other threads and processes. - Copyright (C) 2005-2018 Free Software Foundation, Inc. + Copyright (C) 2005-2022 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, see <https://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* This file contains a primitive for yielding the processor to other threads. extern void gl_thread_yield (void); @@ -25,18 +25,18 @@ /* ========================================================================= */ -#if USE_POSIX_THREADS +#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS -/* Use the POSIX threads library. */ +/* Use the ISO C threads library. */ -# include <sched.h> +# include <threads.h> # ifdef __cplusplus extern "C" { # endif # define gl_thread_yield() \ - sched_yield () + thrd_yield () # ifdef __cplusplus } @@ -46,39 +46,18 @@ extern "C" { /* ========================================================================= */ -#if USE_PTH_THREADS - -/* Use the GNU Pth threads library. */ - -# include <pth.h> - -# ifdef __cplusplus -extern "C" { -# endif - -# define gl_thread_yield() \ - pth_yield (NULL) - -# ifdef __cplusplus -} -# endif - -#endif - -/* ========================================================================= */ - -#if USE_SOLARIS_THREADS +#if USE_POSIX_THREADS -/* Use the old Solaris threads library. */ +/* Use the POSIX threads library. */ -# include <thread.h> +# include <sched.h> # ifdef __cplusplus extern "C" { # endif # define gl_thread_yield() \ - thr_yield () + sched_yield () # ifdef __cplusplus } @@ -108,7 +87,7 @@ extern "C" { /* ========================================================================= */ -#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS) +#if !(USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ |