You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/07/19 11:27:04 UTC

[incubator-nuttx] branch master updated (e5dafc8 -> ad2f859)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.


    from e5dafc8  fs: mount: Change the format for df
     new 95cb33d  sched: Remove unused TLS member from task_group_s
     new ad2f859  sched: Move tls_ndxset_t & tls_dtor_t to tls.h

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 include/nuttx/sched.h | 27 ---------------------------
 include/nuttx/tls.h   | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 27 deletions(-)

[incubator-nuttx] 02/02: sched: Move tls_ndxset_t & tls_dtor_t to tls.h

Posted by xi...@apache.org.
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/incubator-nuttx.git

commit ad2f859170e49067a1903776cc970947e0f90271
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Sun Jul 18 21:01:24 2021 +0800

    sched: Move tls_ndxset_t & tls_dtor_t to tls.h
    
    Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
 include/nuttx/sched.h | 21 ---------------------
 include/nuttx/tls.h   | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index 8b12a13..36c7eba 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -348,27 +348,6 @@ struct pthread_cleanup_s
 };
 #endif
 
-/* type tls_ndxset_t & tls_dtor_t *******************************************/
-
-/* Smallest addressable type that can hold the entire configured number of
- * TLS data indexes.
- */
-
-#if CONFIG_TLS_NELEM > 0
-#  if CONFIG_TLS_NELEM > 32
-#    error Too many TLS elements
-#  elif CONFIG_TLS_NELEM > 16
-     typedef uint32_t tls_ndxset_t;
-#  elif CONFIG_TLS_NELEM > 8
-     typedef uint16_t tls_ndxset_t;
-#  else
-     typedef uint8_t tls_ndxset_t;
-#  endif
-
-typedef CODE void (*tls_dtor_t)(FAR void *);
-
-#endif
-
 /* struct dspace_s **********************************************************/
 
 /* This structure describes a reference counted D-Space region.
diff --git a/include/nuttx/tls.h b/include/nuttx/tls.h
index d893059..5e655f7 100644
--- a/include/nuttx/tls.h
+++ b/include/nuttx/tls.h
@@ -61,6 +61,27 @@
  * Public Types
  ****************************************************************************/
 
+/* type tls_ndxset_t & tls_dtor_t *******************************************/
+
+/* Smallest addressable type that can hold the entire configured number of
+ * TLS data indexes.
+ */
+
+#if CONFIG_TLS_NELEM > 0
+#  if CONFIG_TLS_NELEM > 32
+#    error Too many TLS elements
+#  elif CONFIG_TLS_NELEM > 16
+     typedef uint32_t tls_ndxset_t;
+#  elif CONFIG_TLS_NELEM > 8
+     typedef uint16_t tls_ndxset_t;
+#  else
+     typedef uint8_t tls_ndxset_t;
+#  endif
+
+typedef CODE void (*tls_dtor_t)(FAR void *);
+
+#endif
+
 struct task_info_s
 {
   sem_t           ta_sem;

[incubator-nuttx] 01/02: sched: Remove unused TLS member from task_group_s

Posted by xi...@apache.org.
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/incubator-nuttx.git

commit 95cb33dbf5d0ed0e5e6f85eb623b22388e458033
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Sun Jul 18 19:42:06 2021 +0800

    sched: Remove unused TLS member from task_group_s
    
    Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
 include/nuttx/sched.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index 2167119..8b12a13 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -537,12 +537,6 @@ struct task_group_s
 
   FAR struct task_info_s *tg_info;
 
-#if CONFIG_TLS_NELEM > 0
-  tls_ndxset_t tg_tlsset;                   /* Set of TLS indexes allocated */
-
-  tls_dtor_t  tg_tlsdestr[CONFIG_TLS_NELEM];  /* List of TLS destructors    */
-#endif
-
   /* POSIX Signal Control Fields ********************************************/
 
   sq_queue_t tg_sigactionq;         /* List of actions for signals              */