libs/libc/queue: inline queue list to improve performance

add a config CONFIG_LIBC_INLINE_QUEUE to inline the queue list test: We can use qemu for testing. compiling make distclean -j20; ./tools/configure.sh -l qemu-armv8a:nsh_smp ;make -j20 running qemu-system-aarch64 -cpu cortex-a53 -smp 4 -nographic -machine virt,virtualization=on,gic-version=3 -net none -chardev stdio,id=con,mux=on -serial chardev:con -mon chardev=con,mode=readline -kernel ./nuttx Signed-off-by: hujun5 <[email protected]>
hujun260 · Jul 19, 2024 · 1faeee3 · 1faeee3
1 parent b706891
commit 1faeee3
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 12 deletions.
diff --git a/include/nuttx/queue.h b/include/nuttx/queue.h
@@ -341,6 +341,7 @@ extern "C"
 #define EXTERN extern
 #endif
 
+#ifndef CONFIG_LIBC_INLINE_QUEUE
 /* Add nodes to queues */
 
 void sq_addafter(FAR sq_entry_t *prev, FAR sq_entry_t *node,
@@ -361,6 +362,22 @@ FAR dq_entry_t *dq_remfirst(FAR dq_queue_t *queue);
 
 size_t sq_count(FAR sq_queue_t *queue);
 size_t dq_count(FAR dq_queue_t *queue);
+#else
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#  include "../libs/libc/queue/dq_addafter.c"
+#  include "../libs/libc/queue/dq_count.c"
+#  include "../libs/libc/queue/dq_remafter.c"
+#  include "../libs/libc/queue/dq_remfirst.c"
+#  include "../libs/libc/queue/dq_remlast.c"
+#  include "../libs/libc/queue/sq_addafter.c"
+#  include "../libs/libc/queue/sq_count.c"
+#  include "../libs/libc/queue/sq_remafter.c"
+#  include "../libs/libc/queue/sq_remfirst.c"
+#  include "../libs/libc/queue/sq_remlast.c"
+#endif
 
 #undef EXTERN
 #ifdef __cplusplus

diff --git a/libs/libc/Kconfig b/libs/libc/Kconfig
@@ -33,3 +33,4 @@ source "libs/libc/stream/Kconfig"
 source "libs/libc/regex/Kconfig"
 source "libs/libc/gpsutils/Kconfig"
 source "libs/libc/fdt/Kconfig"
+source "libs/libc/queue/Kconfig"
diff --git a/libs/libc/queue/CMakeLists.txt b/libs/libc/queue/CMakeLists.txt
@@ -18,15 +18,17 @@
 #
 # ##############################################################################
 
-target_sources(
-  c
-  PRIVATE sq_addafter.c
-          sq_remlast.c
-          sq_remfirst.c
-          sq_remafter.c
-          sq_count.c
-          dq_addafter.c
-          dq_remlast.c
-          dq_remfirst.c
-          dq_remafter.c
-          dq_count.c)
+if(NOT CONFIG_LIBC_INLINE_QUEUE)
+  target_sources(
+    c
+    PRIVATE sq_addafter.c
+            sq_remlast.c
+            sq_remfirst.c
+            sq_remafter.c
+            sq_count.c
+            dq_addafter.c
+            dq_remlast.c
+            dq_remfirst.c
+            dq_remafter.c
+            dq_count.c)
+endif()
diff --git a/libs/libc/queue/Kconfig b/libs/libc/queue/Kconfig
@@ -0,0 +1,10 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config LIBC_INLINE_QUEUE
+	bool "Inline queue list to improve the performance"
+	default n
+	---help---
+		Inline queue list to improve the performance
diff --git a/libs/libc/queue/Make.defs b/libs/libc/queue/Make.defs
@@ -18,6 +18,8 @@
 #
 ############################################################################
 
+ifneq ($(CONFIG_LIBC_INLINE_QUEUE),y)
+
 # Add the queue C files to the build
 
 CSRCS += sq_addafter.c sq_remlast.c sq_remfirst.c sq_remafter.c sq_count.c
@@ -27,3 +29,5 @@ CSRCS += dq_addafter.c dq_remlast.c dq_remfirst.c dq_remafter.c dq_count.c
 
 DEPPATH += --dep-path queue
 VPATH += :queue
+
+endif
diff --git a/libs/libc/queue/dq_addafter.c b/libs/libc/queue/dq_addafter.c
@@ -36,6 +36,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 void dq_addafter(FAR dq_entry_t *prev, FAR dq_entry_t *node,
                  dq_queue_t *queue)
 {

diff --git a/libs/libc/queue/dq_count.c b/libs/libc/queue/dq_count.c
@@ -39,6 +39,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 size_t dq_count(FAR dq_queue_t *queue)
 {
   FAR dq_entry_t *node;

diff --git a/libs/libc/queue/dq_remafter.c b/libs/libc/queue/dq_remafter.c
@@ -37,6 +37,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 FAR dq_entry_t *dq_remafter(FAR dq_entry_t *node, FAR dq_queue_t *queue)
 {
   FAR dq_entry_t *ret = node->flink;

diff --git a/libs/libc/queue/dq_remfirst.c b/libs/libc/queue/dq_remfirst.c
@@ -36,6 +36,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 FAR dq_entry_t *dq_remfirst(dq_queue_t *queue)
 {
   FAR dq_entry_t *ret = queue->head;

diff --git a/libs/libc/queue/dq_remlast.c b/libs/libc/queue/dq_remlast.c
@@ -36,6 +36,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 FAR dq_entry_t *dq_remlast(dq_queue_t *queue)
 {
   FAR dq_entry_t *ret = queue->tail;

diff --git a/libs/libc/queue/sq_addafter.c b/libs/libc/queue/sq_addafter.c
@@ -36,6 +36,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 void sq_addafter(FAR sq_entry_t *prev, FAR sq_entry_t *node,
                  sq_queue_t *queue)
 {

diff --git a/libs/libc/queue/sq_count.c b/libs/libc/queue/sq_count.c
@@ -39,6 +39,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 size_t sq_count(FAR sq_queue_t *queue)
 {
   FAR sq_entry_t *node;

diff --git a/libs/libc/queue/sq_remafter.c b/libs/libc/queue/sq_remafter.c
@@ -37,6 +37,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 FAR sq_entry_t *sq_remafter(FAR sq_entry_t *node, sq_queue_t *queue)
 {
   FAR sq_entry_t *ret = node->flink;

diff --git a/libs/libc/queue/sq_remfirst.c b/libs/libc/queue/sq_remfirst.c
@@ -36,6 +36,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 FAR sq_entry_t *sq_remfirst(sq_queue_t *queue)
 {
   FAR sq_entry_t *ret = queue->head;

diff --git a/libs/libc/queue/sq_remlast.c b/libs/libc/queue/sq_remlast.c
@@ -36,6 +36,9 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_LIBC_INLINE_QUEUE
+static inline_function
+#endif
 FAR sq_entry_t *sq_remlast(sq_queue_t *queue)
 {
   FAR sq_entry_t *ret = queue->tail;