sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/note: add note_syscall_enter parameter list

Browse Source 
Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2022-12-29 14:43:20 +08:00 committed by Alan Carvalho de Assis
parent 96a45e2c75
commit bc7c520eca
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/note/note_driver.c
View File

@ -71,10 +71,12 @@
#define note_spinlock(drv, tcb, spinlock, type) \ #define note_spinlock(drv, tcb, spinlock, type) \
((drv)->ops->spinlock && \ ((drv)->ops->spinlock && \
((drv)->ops->spinlock(drv, tcb, spinlock, type), true)) ((drv)->ops->spinlock(drv, tcb, spinlock, type), true))
#define note_syscall_enter(drv, nr) \ #define note_syscall_enter(drv, nr, argc, ap) \
((drv)->ops->syscall_enter && ((drv)->ops->syscall_enter(drv, nr), true)) ((drv)->ops->syscall_enter && \
#define note_syscall_leave(drv, nr) \ ((drv)->ops->syscall_enter(drv, nr, argc, ap), true))
((drv)->ops->syscall_leave && ((drv)->ops->syscall_leave(drv, nr), true)) #define note_syscall_leave(drv, nr, result) \
((drv)->ops->syscall_leave && \
((drv)->ops->syscall_leave(drv, nr, result), true))
#define note_irqhandler(drv, irq, handler, enter) \ #define note_irqhandler(drv, irq, handler, enter) \
((drv)->ops->irqhandler && \ ((drv)->ops->irqhandler && \
((drv)->ops->irqhandler(drv, irq, handler, enter), true)) ((drv)->ops->irqhandler(drv, irq, handler, enter), true))
@ -1184,13 +1186,18 @@ void sched_note_syscall_enter(int nr, int argc, ...)
} }
#endif #endif
va_start(ap, argc);
for (driver = g_note_drivers; *driver; driver++) for (driver = g_note_drivers; *driver; driver++)
{ {
if (note_syscall_enter(*driver, nr)) va_list copy;
va_copy(copy, ap);
if (note_syscall_enter(*driver, nr, argc, &copy))
{ {
va_end(copy);
continue; continue;
} }
va_end(copy);
if ((*driver)->ops->add == NULL) if ((*driver)->ops->add == NULL)
{ {
continue; continue;
@ -1210,23 +1217,21 @@ void sched_note_syscall_enter(int nr, int argc, ...)
/* If needed, retrieve the given syscall arguments */ /* If needed, retrieve the given syscall arguments */
va_start(ap, argc);
args = note.nsc_args; args = note.nsc_args;
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
{ {
arg = (uintptr_t)va_arg(ap, uintptr_t); arg = (uintptr_t)va_arg(copy, uintptr_t);
sched_note_flatten(args, &arg, sizeof(arg)); sched_note_flatten(args, &arg, sizeof(arg));
args += sizeof(uintptr_t); args += sizeof(uintptr_t);
} }
va_end(ap);
} }
/* Add the note to circular buffer */ /* Add the note to circular buffer */
note_add(*driver, &note, length); note_add(*driver, &note, length);
} }
va_end(ap);
} }
void sched_note_syscall_leave(int nr, uintptr_t result) void sched_note_syscall_leave(int nr, uintptr_t result)
@ -1243,7 +1248,7 @@ void sched_note_syscall_leave(int nr, uintptr_t result)
for (driver = g_note_drivers; *driver; driver++) for (driver = g_note_drivers; *driver; driver++)
{ {
if (note_syscall_leave(*driver, nr)) if (note_syscall_leave(*driver, nr, result))
{ {
continue; continue;
} }

6
include/nuttx/note/note_driver.h
View File

@ -78,8 +78,10 @@ struct note_driver_ops_s
FAR volatile void *spinlock, int type); FAR volatile void *spinlock, int type);
#endif #endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL #ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
CODE void (*syscall_enter)(FAR struct note_driver_s *drv, int nr); CODE void (*syscall_enter)(FAR struct note_driver_s *drv,
CODE void (*syscall_leave)(FAR struct note_driver_s *drv, int nr); int nr, int argc, va_list *ap);
CODE void (*syscall_leave)(FAR struct note_driver_s *drv,
int nr, uintptr_t result);
#endif #endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER #ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
CODE void (*irqhandler)(FAR struct note_driver_s *drv, int irq, CODE void (*irqhandler)(FAR struct note_driver_s *drv, int irq,