This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 9fd1478a99a0dda829926649e9e8866f6931c2d5 Author: p-szafonimateusz <p-szafonimate...@xiaomi.com> AuthorDate: Mon Aug 4 09:34:41 2025 +0200 pthread: add pthread_{get|set}concurrency support Add support for pthread_{get|set}concurrency support. NuttX uses 1:1 threading model (every pthread is a kernel-managed thread), so this function has no real effect on the scheduling behavior. Signed-off-by: p-szafonimateusz <p-szafonimate...@xiaomi.com> --- Documentation/reference/user/08_pthread.rst | 2 - Documentation/standards/posix.rst | 24 ++++---- include/pthread.h | 5 ++ libs/libc/pthread/CMakeLists.txt | 3 +- libs/libc/pthread/Make.defs | 1 + libs/libc/pthread/pthread_concurrency.c | 87 +++++++++++++++++++++++++++++ 6 files changed, 107 insertions(+), 15 deletions(-) diff --git a/Documentation/reference/user/08_pthread.rst b/Documentation/reference/user/08_pthread.rst index 67208b5ca59..109279d1869 100644 --- a/Documentation/reference/user/08_pthread.rst +++ b/Documentation/reference/user/08_pthread.rst @@ -113,7 +113,6 @@ No support for the following pthread interfaces is provided by NuttX: - ``pthread_attr_getscope``. get and set the contentionscope attribute. - ``pthread_attr_setscope``. get and set the contentionscope attribute. - - ``pthread_getconcurrency``. get and set the level of concurrency. - ``pthread_getcpuclockid``. access a thread CPU-time clock. - ``pthread_mutex_getprioceiling``. get and set the priority ceiling of a mutex. @@ -123,7 +122,6 @@ No support for the following pthread interfaces is provided by NuttX: attribute of the mutex attributes object. - ``pthread_mutexattr_setprioceiling``. get and set the prioceiling attribute of the mutex attributes object. - - ``pthread_setconcurrency``. get and set the level of concurrency. .. c:function:: int pthread_attr_init(pthread_attr_t *attr); diff --git a/Documentation/standards/posix.rst b/Documentation/standards/posix.rst index 286563492b6..10241688441 100644 --- a/Documentation/standards/posix.rst +++ b/Documentation/standards/posix.rst @@ -34,7 +34,7 @@ Units of Functionality Requirements: +------------------------------+----------------+--------------------------+ | `POSIX_THREADS_EXT`_ [#fn2]_ | Yes | | +------------------------------+----------------+--------------------------+ -| `XSI_THREADS_EXT`_ | 2/4 | | +| `XSI_THREADS_EXT`_ | Yes | | +------------------------------+----------------+--------------------------+ .. [#fn1] ``fenv.h`` related functions not supported. @@ -2450,17 +2450,17 @@ XSI_THREADS_EXT XSI Threads Extensions: -+---------------------------------+---------+ -| API | Support | -+=================================+=========+ -| :c:func:`pthread_attr_getstack` | Yes | -+---------------------------------+---------+ -| :c:func:`pthread_attr_setstack` | Yes | -+---------------------------------+---------+ -| pthread_getconcurrency() | No | -+---------------------------------+---------+ -| pthread_setconcurrency() | No | -+---------------------------------+---------+ ++----------------------------------+---------+ +| API | Support | ++==================================+=========+ +| :c:func:`pthread_attr_getstack` | Yes | ++----------------------------------+---------+ +| :c:func:`pthread_attr_setstack` | Yes | ++----------------------------------+---------+ +| :c:func:`pthread_getconcurrency` | Yes | ++----------------------------------+---------+ +| :c:func:`pthread_setconcurrency` | Yes | ++----------------------------------+---------+ XSI_TIMERS ---------- diff --git a/include/pthread.h b/include/pthread.h index 56bb6aba055..8e103514654 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -626,6 +626,11 @@ int pthread_getaffinity_np(pthread_t thread, size_t cpusetsize, #define pthread_getaffinity_np(...) (-ENOSYS) #endif +/* Concurrency level */ + +int pthread_setconcurrency(int new_level); +int pthread_getconcurrency(void); + /* Thread-specific Data Interfaces */ int pthread_key_create(FAR pthread_key_t *key, diff --git a/libs/libc/pthread/CMakeLists.txt b/libs/libc/pthread/CMakeLists.txt index 61ef6158cac..415b2cecb6d 100644 --- a/libs/libc/pthread/CMakeLists.txt +++ b/libs/libc/pthread/CMakeLists.txt @@ -106,7 +106,8 @@ if(NOT CONFIG_DISABLE_PTHREAD) pthread_testcancel.c pthread_getcpuclockid.c pthread_self.c - pthread_gettid_np.c) + pthread_gettid_np.c + pthread_concurrency.c) if(CONFIG_SMP) list(APPEND SRCS pthread_attr_getaffinity.c pthread_attr_setaffinity.c) diff --git a/libs/libc/pthread/Make.defs b/libs/libc/pthread/Make.defs index 581fcc50a55..1e9476a8224 100644 --- a/libs/libc/pthread/Make.defs +++ b/libs/libc/pthread/Make.defs @@ -64,6 +64,7 @@ CSRCS += pthread_rwlock.c pthread_rwlock_rdlock.c pthread_rwlock_wrlock.c CSRCS += pthread_setcancelstate.c pthread_setcanceltype.c CSRCS += pthread_testcancel.c pthread_getcpuclockid.c CSRCS += pthread_self.c pthread_gettid_np.c +CSRCS += pthread_concurrency.c ifeq ($(CONFIG_SMP),y) CSRCS += pthread_attr_getaffinity.c pthread_attr_setaffinity.c diff --git a/libs/libc/pthread/pthread_concurrency.c b/libs/libc/pthread/pthread_concurrency.c new file mode 100644 index 00000000000..ccac4514158 --- /dev/null +++ b/libs/libc/pthread/pthread_concurrency.c @@ -0,0 +1,87 @@ +/**************************************************************************** + * libs/libc/pthread/pthread_concurrency.c + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <pthread.h> + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +static int g_pthread_concurrency_level = 0; + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: pthread_setconcurrency + * + * Description: + * The pthread_setconcurrency() function informs the implementation of + * the application's desired concurrency level. + * + * NuttX uses 1:1 threading model, so this function has no real effect + * on the scheduling behavior. + * + * Input Parameters: + * new_level - desired concurrency level + * + * Returned Value: + * Returns 0 on success, on error it returns a nonzero error number + * + ****************************************************************************/ + +int pthread_setconcurrency(int new_level) +{ + if (new_level < 0) + { + return EINVAL; + } + + g_pthread_concurrency_level = new_level; + + return OK; +} + +/**************************************************************************** + * Name: pthread_getconcurrency + * + * Description: + * The pthread_getconcurrency() returns the value previously set by + * pthread_setconcurrency(). + * + * Input Parameters: + * None + * + * Returned Value: + * Returns the current value of concurrency level. + * + ****************************************************************************/ + +int pthread_getconcurrency(void) +{ + return g_pthread_concurrency_level; +}