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

GUIDINGLI pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 0fa4b8bbe780772f3e3b1c0ea40e9bc6167a1786
Author: yinshengkai <[email protected]>
AuthorDate: Thu Nov 21 12:29:59 2024 +0800

    note: each channel supports setting filter separately
    
    Allow each note backend (RTT, SysView, etc.) to independently control
    which events it receives by adding per-channel filter support.
    
    Signed-off-by: yinshengkai <[email protected]>
---
 drivers/note/Kconfig             | 71 ++++++++++++++++++++++++++++++++++++++++
 drivers/note/notelog_driver.c    |  4 +--
 drivers/note/noterpmsg_driver.c  |  4 +--
 drivers/note/notesnap_driver.c   |  4 +--
 drivers/note/notestream_driver.c |  8 ++---
 drivers/segger/Kconfig           | 28 ++++++++++++++++
 drivers/segger/note_rtt.c        |  4 +--
 drivers/segger/note_sysview.c    |  4 +--
 8 files changed, 113 insertions(+), 14 deletions(-)

diff --git a/drivers/note/Kconfig b/drivers/note/Kconfig
index 69173588205..9e79b425405 100644
--- a/drivers/note/Kconfig
+++ b/drivers/note/Kconfig
@@ -103,11 +103,39 @@ config DRIVERS_NOTELOWEROUT
        ---help---
                Note uses lower output.
 
+config DRIVERS_NOTELOWEROUT_FILTER_DEFAULT_MODE
+       hex "Note lower output filter mode"
+       depends on DRIVERS_NOTELOWEROUT && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE
+       ---help---
+               Filter mode for notelowerout
+
+config DRIVERS_NOTELOWEROUT_CPUSET
+       hex "Note lower output CPU set"
+       depends on DRIVERS_NOTELOWEROUT && SMP && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_CPUSET
+       ---help---
+               CPU set for notelowerout
+
 config DRIVERS_NOTEFILE
        bool "Note file driver"
        ---help---
                The Note driver output to file.
 
+config DRIVERS_NOTEFILE_FILTER_DEFAULT_MODE
+       hex "Note file driver filter mode"
+       depends on DRIVERS_NOTEFILE && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE
+       ---help---
+               Filter mode for notefile
+
+config DRIVERS_NOTEFILE_CPUSET
+       hex "Note file driver CPU set"
+       depends on DRIVERS_NOTEFILE && SMP && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_CPUSET
+       ---help---
+               CPU set for notefile
+
 config DRIVERS_NOTEFILE_PATH
        string "Note file path"
        depends on DRIVERS_NOTEFILE
@@ -120,6 +148,20 @@ config DRIVERS_NOTELOG
        ---help---
                The Note driver output to syslog.
 
+config DRIVERS_NOTELOG_FILTER_DEFAULT_MODE
+       hex "Note syslog driver filter mode"
+       depends on DRIVERS_NOTELOG && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE
+       ---help---
+               Filter mode for notelog
+
+config DRIVERS_NOTELOG_CPUSET
+       hex "Note syslog driver CPU set"
+       depends on DRIVERS_NOTELOG && SMP && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_CPUSET
+       ---help---
+               CPU set for notelog
+
 config DRIVERS_NOTESNAP
        bool "Last scheduling information"
        default n
@@ -127,6 +169,21 @@ config DRIVERS_NOTESNAP
                Record the last scheduling information.
 
 if DRIVERS_NOTESNAP
+
+config DRIVERS_NOTESNAP_FILTER_DEFAULT_MODE
+       hex "Note snap driver filter mode"
+       depends on SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE
+       ---help---
+               Filter mode for notesnap
+
+config DRIVERS_NOTESNAP_CPUSET
+       hex "Note snap driver CPU set"
+       depends on SMP && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_CPUSET
+       ---help---
+               CPU set for notesnap
+
 config DRIVERS_NOTESNAP_NBUFFERS
        int "Number of last scheduling information buffers"
        default 128
@@ -151,6 +208,20 @@ config DRIVERS_NOTERPMSG
 
 if DRIVERS_NOTERPMSG
 
+config DRIVERS_NOTERPMSG_FILTER_DEFAULT_MODE
+       hex "Note RPMSG client filter mode"
+       depends on SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE
+       ---help---
+               Filter mode for noterpmsg
+
+config DRIVERS_NOTERPMSG_CPUSET
+       hex "Note RPMSG client CPU set"
+       depends on SMP && SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_CPUSET
+       ---help---
+               CPU set for noterpmsg
+
 config DRIVERS_NOTERPMSG_BUFSIZE
        int "Note RPMSG client buffer size"
        default 1024
diff --git a/drivers/note/notelog_driver.c b/drivers/note/notelog_driver.c
index f0839f0f229..b8be1501449 100644
--- a/drivers/note/notelog_driver.c
+++ b/drivers/note/notelog_driver.c
@@ -130,9 +130,9 @@ struct note_driver_s g_notelog_driver =
     "log",
     {
       {
-        CONFIG_SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE,
+        CONFIG_DRIVERS_NOTELOG_FILTER_DEFAULT_MODE,
 #  ifdef CONFIG_SMP
-        CONFIG_SCHED_INSTRUMENTATION_CPUSET
+        CONFIG_DRIVERS_NOTELOG_CPUSET
 #  endif
       },
     },
diff --git a/drivers/note/noterpmsg_driver.c b/drivers/note/noterpmsg_driver.c
index df141fbc2b1..414ebfa3e5d 100644
--- a/drivers/note/noterpmsg_driver.c
+++ b/drivers/note/noterpmsg_driver.c
@@ -76,9 +76,9 @@ struct noterpmsg_driver_s g_noterpmsg_driver =
     "rpmsg",
     {
       {
-        CONFIG_SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE,
+        CONFIG_DRIVERS_NOTERPMSG_FILTER_DEFAULT_MODE,
 #  ifdef CONFIG_SMP
-        CONFIG_SCHED_INSTRUMENTATION_CPUSET
+        CONFIG_DRIVERS_NOTERPMSG_CPUSET
 #  endif
       },
     },
diff --git a/drivers/note/notesnap_driver.c b/drivers/note/notesnap_driver.c
index d4888384022..2c69b52f6f3 100644
--- a/drivers/note/notesnap_driver.c
+++ b/drivers/note/notesnap_driver.c
@@ -157,9 +157,9 @@ static struct notesnap_s g_notesnap =
     "snap",
     {
       {
-        CONFIG_SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE,
+        CONFIG_DRIVERS_NOTESNAP_FILTER_DEFAULT_MODE,
 #  ifdef CONFIG_SMP
-        CONFIG_SCHED_INSTRUMENTATION_CPUSET
+        CONFIG_DRIVERS_NOTESNAP_CPUSET
 #  endif
       },
     },
diff --git a/drivers/note/notestream_driver.c b/drivers/note/notestream_driver.c
index e5286cc9418..947cc70390c 100644
--- a/drivers/note/notestream_driver.c
+++ b/drivers/note/notestream_driver.c
@@ -70,9 +70,9 @@ struct notestream_driver_s g_notestream_lowerout =
     "lowerout",
     {
       {
-        CONFIG_SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE,
+        CONFIG_DRIVERS_NOTELOWEROUT_FILTER_DEFAULT_MODE,
 #  ifdef CONFIG_SMP
-        CONFIG_SCHED_INSTRUMENTATION_CPUSET
+        CONFIG_DRIVERS_NOTELOWEROUT_CPUSET
 #  endif
       },
     },
@@ -121,11 +121,11 @@ int notefile_register(FAR const char *filename)
   memcpy(notefile + 1, filename, len);
   notefile->driver.driver.name  = (FAR const char *)(notefile + 1);
   notefile->driver.driver.filter.mode.flag =
-                      CONFIG_SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE;
+                      CONFIG_DRIVERS_NOTEFILE_FILTER_DEFAULT_MODE;
 
 #  ifdef CONFIG_SMP
   notefile->driver.driver.filter.mode.cpuset =
-                      CONFIG_SCHED_INSTRUMENTATION_CPUSET;
+                      CONFIG_DRIVERS_NOTEFILE_CPUSET;
 #  endif
 
 #endif
diff --git a/drivers/segger/Kconfig b/drivers/segger/Kconfig
index 0e4323fe4b6..8427bad75c7 100644
--- a/drivers/segger/Kconfig
+++ b/drivers/segger/Kconfig
@@ -214,6 +214,20 @@ config NOTE_RTT
 
 if NOTE_RTT
 
+config NOTE_RTT_FILTER_DEFAULT_MODE
+       hex "Note RTT driver, Segger J-Link stream filter mode"
+       depends on SCHED_INSTRUMENTATION_FILTER
+       default SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE
+       ---help---
+               Filter mode for notertt jlink stream
+
+config SEGGER_SYSVIEW_CPUSET
+       hex "Segger System View CPU set"
+       depends on SCHED_INSTRUMENTATION_FILTER && SMP
+       default SCHED_INSTRUMENTATION_CPUSET
+       ---help---
+               CPU set for sysview
+
 config NOTE_RTT_CHANNEL
        int "Note RTT driver, Segger J-Link stream channel"
        default 0
@@ -241,6 +255,20 @@ config SEGGER_SYSVIEW
 
 if SEGGER_SYSVIEW
 
+config SEGGER_SYSVIEW_FILTER_DEFAULT_MODE
+       hex "Segger System View filter mode"
+       default SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE
+       depends on SCHED_INSTRUMENTATION_FILTER
+       ---help---
+               Filter mode for sysview
+
+config SEGGER_SYSVIEW_CPUSET
+       hex "Segger System View CPU set"
+       default SCHED_INSTRUMENTATION_CPUSET
+       depends on SCHED_INSTRUMENTATION_FILTER && SMP
+       ---help---
+               CPU set for sysview
+
 config SEGGER_SYSVIEW_RTT_CHANNEL
        int "Segger System View RTT channel"
        default 0
diff --git a/drivers/segger/note_rtt.c b/drivers/segger/note_rtt.c
index 0a1813f48a0..74287d33acb 100644
--- a/drivers/segger/note_rtt.c
+++ b/drivers/segger/note_rtt.c
@@ -61,9 +61,9 @@ struct notertt_s g_notertt =
     "rtt",
     {
       {
-        CONFIG_SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE,
+        CONFIG_NOTE_RTT_FILTER_DEFAULT_MODE,
 #  ifdef CONFIG_SMP
-        CONFIG_SCHED_INSTRUMENTATION_CPUSET
+        CONFIG_NOTE_RTT_CPUSET
 #  endif
       },
     },
diff --git a/drivers/segger/note_sysview.c b/drivers/segger/note_sysview.c
index dd80adf5d64..b088d0c3383 100644
--- a/drivers/segger/note_sysview.c
+++ b/drivers/segger/note_sysview.c
@@ -147,9 +147,9 @@ static struct note_sysview_driver_s g_note_sysview_driver =
     "sysview",
     {
       {
-        CONFIG_SCHED_INSTRUMENTATION_FILTER_DEFAULT_MODE,
+        CONFIG_SEGGER_SYSVIEW_FILTER_DEFAULT_MODE,
 #  ifdef CONFIG_SMP
-        CONFIG_SCHED_INSTRUMENTATION_CPUSET
+        CONFIG_SEGGER_SYSVIEW_CPUSET
 #  endif
       },
     },

Reply via email to