pkarashchenko commented on a change in pull request #5498:
URL: https://github.com/apache/incubator-nuttx/pull/5498#discussion_r806720452
##########
File path: libs/libc/tls/Kconfig
##########
@@ -54,4 +54,14 @@ config TLS_NELEM
NOTE that the special value of CONFIG_TLS_NELEM disables these
TLS interfaces.
+config TLS_TASK_NELEM
+ int "Number of Task Local Storage elements"
+ default 0
Review comment:
I think that together with ``uintptr_t ta_telem[CONFIG_TLS_TASK_NELEM];
it breaks C89 compatibility
##########
File path: libs/libc/tls/Kconfig
##########
@@ -54,4 +54,14 @@ config TLS_NELEM
NOTE that the special value of CONFIG_TLS_NELEM disables these
TLS interfaces.
+config TLS_TASK_NELEM
+ int "Number of Task Local Storage elements"
+ default 0
Review comment:
Sorry. Missed that!
##########
File path: sched/task/task_tls_alloc.c
##########
@@ -0,0 +1,113 @@
+/****************************************************************************
+ * sched/task/task_tls_alloc.c
+ *
+ * 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 <sys/types.h>
+#include <unistd.h>
+#include <sched.h>
+#include <errno.h>
+
+#include <nuttx/tls.h>
+#include <nuttx/semaphore.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#if CONFIG_TLS_TASK_NELEM > 0
+
+static int g_tlsset = 0;
+static sem_t g_tlssem = SEM_INITIALIZER(1);
+static tls_dtor_t g_tlsdtor[CONFIG_TLS_TASK_NELEM];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int task_tls_alloc(tls_dtor_t dtor)
+{
+ int ret;
+ int candidate;
+
+ ret = nxsem_wait(&g_tlssem);
+
+ if (ret < 0)
+ {
+ return ret;
+ }
+
+ ret = -EAGAIN;
+
+ for (candidate = 0; candidate < CONFIG_TLS_TASK_NELEM; candidate++)
+ {
+ int mask = 1 << candidate;
+ if ((g_tlsset & mask) == 0)
+ {
+ g_tlsset |= mask;
+ g_tlsdtor[candidate] = dtor;
+ ret = candidate;
+ break;
+ }
+ }
+
+ nxsem_post(&g_tlssem);
+ return ret;
+}
+
+/****************************************************************************
+ * Name: task_tls_destruct
+ *
+ * Description:
+ * Destruct all TLS data element associated with allocated key
+ *
+ * Input Parameters:
+ * None
+ *
+ * Returned Value:
+ * A set of allocated TLS index
+ *
+ ****************************************************************************/
+
+void task_tls_destruct(void)
+{
+ int candidate;
+ uintptr_t elem;
+ tls_dtor_t dtor;
+ FAR struct task_info_s *info = task_get_info();
+
+ for (candidate = 0; candidate < CONFIG_TLS_TASK_NELEM; candidate++)
+ {
+ int mask = 1 << candidate;
+ if (g_tlsset & mask)
+ {
+ elem = info->ta_telem[candidate];
+ dtor = g_tlsdtor[candidate];
+ if (dtor)
Review comment:
```suggestion
if (dtor != NULL)
```
##########
File path: include/nuttx/tls.h
##########
@@ -267,6 +270,13 @@ uintptr_t tls_get_value(int tlsindex);
int tls_set_value(int tlsindex, uintptr_t tlsvalue);
#endif
+#if CONFIG_TLS_TASK_NELEM > 0
+int task_tls_alloc(tls_dtor_t dtor);
+void task_tls_destruct(void);
+int task_tls_set_value(int tlsindex, uintptr_t tlsvalue);
+uintptr_t task_tls_get_value(int tlsindex);
Review comment:
Do we need to add comment with AP description? Similar to APIs above
##########
File path: sched/task/task_tls_alloc.c
##########
@@ -0,0 +1,113 @@
+/****************************************************************************
+ * sched/task/task_tls_alloc.c
+ *
+ * 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 <sys/types.h>
+#include <unistd.h>
+#include <sched.h>
+#include <errno.h>
+
+#include <nuttx/tls.h>
+#include <nuttx/semaphore.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#if CONFIG_TLS_TASK_NELEM > 0
+
+static int g_tlsset = 0;
+static sem_t g_tlssem = SEM_INITIALIZER(1);
+static tls_dtor_t g_tlsdtor[CONFIG_TLS_TASK_NELEM];
Review comment:
Why this is global and not located in `struct task_group_s`?
##########
File path: sched/task/task_tls_alloc.c
##########
@@ -0,0 +1,113 @@
+/****************************************************************************
+ * sched/task/task_tls_alloc.c
+ *
+ * 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 <sys/types.h>
+#include <unistd.h>
+#include <sched.h>
+#include <errno.h>
+
+#include <nuttx/tls.h>
+#include <nuttx/semaphore.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#if CONFIG_TLS_TASK_NELEM > 0
+
+static int g_tlsset = 0;
+static sem_t g_tlssem = SEM_INITIALIZER(1);
+static tls_dtor_t g_tlsdtor[CONFIG_TLS_TASK_NELEM];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int task_tls_alloc(tls_dtor_t dtor)
+{
+ int ret;
+ int candidate;
+
+ ret = nxsem_wait(&g_tlssem);
+
+ if (ret < 0)
+ {
+ return ret;
+ }
+
+ ret = -EAGAIN;
+
+ for (candidate = 0; candidate < CONFIG_TLS_TASK_NELEM; candidate++)
+ {
+ int mask = 1 << candidate;
+ if ((g_tlsset & mask) == 0)
+ {
+ g_tlsset |= mask;
+ g_tlsdtor[candidate] = dtor;
+ ret = candidate;
+ break;
+ }
+ }
+
+ nxsem_post(&g_tlssem);
+ return ret;
+}
+
+/****************************************************************************
+ * Name: task_tls_destruct
+ *
+ * Description:
+ * Destruct all TLS data element associated with allocated key
+ *
+ * Input Parameters:
+ * None
+ *
+ * Returned Value:
+ * A set of allocated TLS index
+ *
+ ****************************************************************************/
+
+void task_tls_destruct(void)
+{
+ int candidate;
+ uintptr_t elem;
+ tls_dtor_t dtor;
+ FAR struct task_info_s *info = task_get_info();
+
+ for (candidate = 0; candidate < CONFIG_TLS_TASK_NELEM; candidate++)
+ {
+ int mask = 1 << candidate;
+ if (g_tlsset & mask)
Review comment:
```suggestion
if ((g_tlsset & mask) != 0)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
