xiaoxiang781216 commented on code in PR #10840:
URL: https://github.com/apache/nuttx/pull/10840#discussion_r1352883648
##########
include/nuttx/sched_note.h:
##########
@@ -64,100 +62,94 @@
/* Note filter mode flag definitions */
#define NOTE_FILTER_MODE_FLAG_ENABLE (1 << 0) /* Enable instrumentation
*/
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
#define NOTE_FILTER_MODE_FLAG_SWITCH (1 << 1) /* Enable syscall
instrumentation */
-#endif
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
#define NOTE_FILTER_MODE_FLAG_SYSCALL (1 << 2) /* Enable syscall
instrumentation */
-#endif
-#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
#define NOTE_FILTER_MODE_FLAG_IRQ (1 << 3) /* Enable IRQ
instrumentaiton */
-#endif
-#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
#define NOTE_FILTER_MODE_FLAG_DUMP (1 << 4) /* Enable dump
instrumentaiton */
-#endif
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
#define NOTE_FILTER_MODE_FLAG_SYSCALL_ARGS (1 << 5) /* Enable collecting
syscall arguments */
-#endif
/* Helper macros for syscall instrumentation filter */
#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
-#define NOTE_FILTER_SYSCALLMASK_SET(nr, s) \
- ((s)->syscall_mask[(nr) / 8] |= (1 << ((nr) % 8)))
-#define NOTE_FILTER_SYSCALLMASK_CLR(nr, s) \
- ((s)->syscall_mask[(nr) / 8] &= ~(1 << ((nr) % 8)))
-#define NOTE_FILTER_SYSCALLMASK_ISSET(nr, s) \
- ((s)->syscall_mask[(nr) / 8] & (1 << ((nr) % 8)))
-#define NOTE_FILTER_SYSCALLMASK_ZERO(s) \
- memset((s), 0, sizeof(struct note_filter_syscall_s))
+# define NOTE_FILTER_SYSCALLMASK_SET(nr, s) \
+ ((s)->syscall_mask[(nr) / 8] |= (1 << ((nr) % 8)))
+# define NOTE_FILTER_SYSCALLMASK_CLR(nr, s) \
+ ((s)->syscall_mask[(nr) / 8] &= ~(1 << ((nr) % 8)))
+# define NOTE_FILTER_SYSCALLMASK_ISSET(nr, s) \
+ ((s)->syscall_mask[(nr) / 8] & (1 << ((nr) % 8)))
+# define NOTE_FILTER_SYSCALLMASK_ZERO(s) \
+ memset((s), 0, sizeof(struct note_filter_syscall_s))
+#else
+# define NOTE_FILTER_SYSCALLMASK_SET(nr, s)
+# define NOTE_FILTER_SYSCALLMASK_CLR(nr, s)
+# define NOTE_FILTER_SYSCALLMASK_ISSET(nr, s) (0)
+# define NOTE_FILTER_SYSCALLMASK_ZERO(s)
#endif
/* Helper macros for IRQ instrumentation filter */
#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
-#define NOTE_FILTER_IRQMASK_SET(nr, s) \
- ((s)->irq_mask[(nr) / 8] |= (1 << ((nr) % 8)))
-#define NOTE_FILTER_IRQMASK_CLR(nr, s) \
- ((s)->irq_mask[(nr) / 8] &= ~(1 << ((nr) % 8)))
-#define NOTE_FILTER_IRQMASK_ISSET(nr, s) \
- ((s)->irq_mask[(nr) / 8] & (1 << ((nr) % 8)))
-#define NOTE_FILTER_IRQMASK_ZERO(s) \
- memset((s), 0, sizeof(struct note_filter_irq_s))
+# define NOTE_FILTER_IRQMASK_SET(nr, s) \
+ ((s)->irq_mask[(nr) / 8] |= (1 << ((nr) % 8)))
+# define NOTE_FILTER_IRQMASK_CLR(nr, s) \
+ ((s)->irq_mask[(nr) / 8] &= ~(1 << ((nr) % 8)))
+# define NOTE_FILTER_IRQMASK_ISSET(nr, s) \
+ ((s)->irq_mask[(nr) / 8] & (1 << ((nr) % 8)))
+# define NOTE_FILTER_IRQMASK_ZERO(s) \
+ memset((s), 0, sizeof(struct note_filter_irq_s))
+#else
+# define NOTE_FILTER_IRQMASK_SET(nr, s)
+# define NOTE_FILTER_IRQMASK_CLR(nr, s)
+# define NOTE_FILTER_IRQMASK_ISSET(nr, s) (0)
+# define NOTE_FILTER_IRQMASK_ZERO(s)
#endif
/* Helper macros for dump instrumentation filter */
#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
# define NOTE_FILTER_TAGMASK_SET(tag, s) \
- ((s)->tag_mask[(tag) / 8] |= (1 << ((tag) % 8)))
+ ((s)->tag_mask[(tag) / 8] |= (1 << ((tag) % 8)))
# define NOTE_FILTER_TAGMASK_CLR(tag, s) \
- ((s)->tag_mask[(tag) / 8] &= ~(1 << ((tag) % 8)))
+ ((s)->tag_mask[(tag) / 8] &= ~(1 << ((tag) % 8)))
# define NOTE_FILTER_TAGMASK_ISSET(tag, s) \
- ((s)->tag_mask[(tag) / 8] & (1 << ((tag) % 8)))
+ ((s)->tag_mask[(tag) / 8] & (1 << ((tag) % 8)))
# define NOTE_FILTER_TAGMASK_ZERO(s) \
- memset((s), 0, sizeof(struct note_filter_tag_s));
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
-# define SCHED_NOTE_IP \
- ({ __label__ __here; __here: (unsigned long)&&__here; })
-# define sched_note_string(tag, buf) \
- sched_note_string_ip(tag, SCHED_NOTE_IP, buf)
-# define sched_note_dump(tag, event, buf, len) \
- sched_note_dump_ip(tag, SCHED_NOTE_IP, event, buf, len)
-# define sched_note_vprintf(tag, fmt, va) \
- sched_note_vprintf_ip(tag, SCHED_NOTE_IP, fmt, va)
-# define sched_note_vbprintf(tag, event, fmt, va) \
- sched_note_vbprintf_ip(tag, SCHED_NOTE_IP, event, fmt, va)
-# define sched_note_printf(tag, fmt, ...) \
- sched_note_printf_ip(tag, SCHED_NOTE_IP, fmt, ##__VA_ARGS__)
-# define sched_note_bprintf(tag, event, fmt, ...) \
+ memset((s), 0, sizeof(struct note_filter_tag_s));
+#else
+# define NOTE_FILTER_TAGMASK_SET(tag, s)
+# define NOTE_FILTER_TAGMASK_CLR(tag, s)
+# define NOTE_FILTER_TAGMASK_ISSET(tag, s) (0)
+# define NOTE_FILTER_TAGMASK_ZERO(s)
+#endif
+
+#define SCHED_NOTE_IP \
+ ({ __label__ __here; __here: (unsigned long)&&__here; })
+
+#define sched_note_string(tag, buf) \
+ sched_note_string_ip(tag, SCHED_NOTE_IP, buf)
+#define sched_note_dump(tag, event, buf, len) \
+ sched_note_dump_ip(tag, SCHED_NOTE_IP, event, buf, len)
+#define sched_note_vprintf(tag, fmt, va) \
+ sched_note_vprintf_ip(tag, SCHED_NOTE_IP, fmt, va)
+#define sched_note_vbprintf(tag, event, fmt, va) \
+ sched_note_vbprintf_ip(tag, SCHED_NOTE_IP, event, fmt, va)
+#define sched_note_printf(tag, fmt, ...) \
+ sched_note_printf_ip(tag, SCHED_NOTE_IP, fmt, ##__VA_ARGS__)
+#define sched_note_bprintf(tag, event, fmt, ...) \
sched_note_bprintf_ip(tag, SCHED_NOTE_IP, event, \
Review Comment:
align
--
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
