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

note: remove remaining event code

Browse Source 
Some event-related codes were missed in the previous modification and have not been deleted.

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2023-10-16 11:05:17 +08:00 committed by Xiang Xiao
parent 882afc885e
commit 58c6b60df5
4 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/note/note_driver.c
View File

@ -89,13 +89,12 @@
((drv)->ops->irqhandler(drv, irq, handler, enter), true)) ((drv)->ops->irqhandler(drv, irq, handler, enter), true))
#define note_string(drv, ip, buf) \ #define note_string(drv, ip, buf) \
((drv)->ops->string && ((drv)->ops->string(drv, ip, buf), true)) ((drv)->ops->string && ((drv)->ops->string(drv, ip, buf), true))
#define note_dump(drv, ip, buf, len) \ #define note_event(drv, ip, event, buf, len) \
((drv)->ops->dump && ((drv)->ops->dump(drv, ip, event, buf, len), true)) ((drv)->ops->event && ((drv)->ops->event(drv, ip, event, buf, len), true))
#define note_vprintf(drv, ip, fmt, va) \ #define note_vprintf(drv, ip, fmt, va) \
((drv)->ops->vprintf && ((drv)->ops->vprintf(drv, ip, fmt, va), true)) ((drv)->ops->vprintf && ((drv)->ops->vprintf(drv, ip, fmt, va), true))
#define note_vbprintf(drv, ip, event, fmt, va) \ #define note_vbprintf(drv, ip, fmt, va) \
((drv)->ops->vbprintf && \ ((drv)->ops->vbprintf && ((drv)->ops->vbprintf(drv, ip, fmt, va), true))
((drv)->ops->vbprintf(drv, ip, event, fmt, va), true))
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -1413,7 +1412,7 @@ void sched_note_event_ip(uint32_t tag, uintptr_t ip, uint8_t event,
for (driver = g_note_drivers; *driver; driver++) for (driver = g_note_drivers; *driver; driver++)
{ {
if (note_dump(*driver, ip, buf, len)) if (note_event(*driver, ip, event, buf, len))
{ {
continue; continue;
} }
@ -1501,7 +1500,7 @@ void sched_note_vprintf_ip(uint32_t tag, uintptr_t ip,
} }
} }
void sched_note_vbprintf_ip(uint32_t tag, uintptr_t ip, uint8_t event, void sched_note_vbprintf_ip(uint32_t tag, uintptr_t ip,
FAR const char *fmt, va_list va) FAR const char *fmt, va_list va)
{ {
FAR struct note_binary_s *note; FAR struct note_binary_s *note;
@ -1546,7 +1545,7 @@ void sched_note_vbprintf_ip(uint32_t tag, uintptr_t ip, uint8_t event,
for (driver = g_note_drivers; *driver; driver++) for (driver = g_note_drivers; *driver; driver++)
{ {
if (note_vbprintf(*driver, ip, event, fmt, va)) if (note_vbprintf(*driver, ip, fmt, va))
{ {
continue; continue;
} }
@ -1728,12 +1727,12 @@ void sched_note_printf_ip(uint32_t tag, uintptr_t ip,
va_end(va); va_end(va);
} }
void sched_note_bprintf_ip(uint32_t tag, uintptr_t ip, uint8_t event, void sched_note_bprintf_ip(uint32_t tag, uintptr_t ip,
FAR const char *fmt, ...) FAR const char *fmt, ...)
{ {
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
sched_note_vbprintf_ip(tag, ip, event, fmt, va); sched_note_vbprintf_ip(tag, ip, fmt, va);
va_end(va); va_end(va);
} }
#endif /* CONFIG_SCHED_INSTRUMENTATION_DUMP */ #endif /* CONFIG_SCHED_INSTRUMENTATION_DUMP */

9
drivers/note/noteram_driver.c
View File

@ -978,6 +978,9 @@ static int noteram_dump_one(FAR uint8_t *p, FAR struct lib_outstream_s *s,
FAR struct note_binary_s *nbi = (FAR struct note_binary_s *)p; FAR struct note_binary_s *nbi = (FAR struct note_binary_s *)p;
char c = note->nc_type == NOTE_DUMP_BEGIN ? 'B' : 'E'; char c = note->nc_type == NOTE_DUMP_BEGIN ? 'B' : 'E';
int len = note->nc_length - sizeof(struct note_binary_s); int len = note->nc_length - sizeof(struct note_binary_s);
uintptr_t ip;
noteram_dump_unflatten(&ip, nbi->nbi_ip, sizeof(ip));
ret += noteram_dump_header(s, &nbi->nbi_cmn, ctx); ret += noteram_dump_header(s, &nbi->nbi_cmn, ctx);
if (len > 0) if (len > 0)
{ {
@ -987,7 +990,7 @@ static int noteram_dump_one(FAR uint8_t *p, FAR struct lib_outstream_s *s,
else else
{ {
ret += lib_sprintf(s, "tracing_mark_write: %c|%d|%pS\n", ret += lib_sprintf(s, "tracing_mark_write: %c|%d|%pS\n",
c, pid, (FAR void *)nbi->nbi_ip); c, pid, (FAR void *)ip);
} }
} }
break; break;
@ -1023,8 +1026,8 @@ static int noteram_dump_one(FAR uint8_t *p, FAR struct lib_outstream_s *s,
noteram_dump_unflatten(&ip, nbi->nbi_ip, sizeof(ip)); noteram_dump_unflatten(&ip, nbi->nbi_ip, sizeof(ip));
ret += lib_sprintf(s, "tracing_mark_write: 0x%" PRIdPTR ret += lib_sprintf(s, "tracing_mark_write: %pS: count=%u",
": count=%u", ip, count); (FAR void *)ip, count);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
ret += lib_sprintf(s, " 0x%x", nbi->nbi_data[i]); ret += lib_sprintf(s, " 0x%x", nbi->nbi_data[i]);

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

@ -92,13 +92,12 @@ struct note_driver_ops_s
#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP #ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
CODE void (*string)(FAR struct note_driver_s *drv, uintptr_t ip, CODE void (*string)(FAR struct note_driver_s *drv, uintptr_t ip,
FAR const char *buf); FAR const char *buf);
CODE void (*dump)(FAR struct note_driver_s *drv, uintptr_t ip, CODE void (*event)(FAR struct note_driver_s *drv, uintptr_t ip,
uint8_t event, FAR const void *buf, size_t len); uint8_t event, FAR const void *buf, size_t len);
CODE void (*vprintf)(FAR struct note_driver_s *drv, uintptr_t ip, CODE void (*vprintf)(FAR struct note_driver_s *drv, uintptr_t ip,
FAR const char *fmt, va_list va) printf_like(3, 0); FAR const char *fmt, va_list va) printf_like(3, 0);
CODE void (*vbprintf)(FAR struct note_driver_s *drv, uintptr_t ip, CODE void (*vbprintf)(FAR struct note_driver_s *drv, uintptr_t ip,
uint8_t event, FAR const char *fmt, FAR const char *fmt, va_list va) printf_like(3, 0);
va_list va) printf_like(4, 0);
#endif #endif
}; };

26
include/nuttx/sched_note.h
View File

@ -129,17 +129,16 @@
sched_note_string_ip(tag, SCHED_NOTE_IP, buf) sched_note_string_ip(tag, SCHED_NOTE_IP, buf)
#define sched_note_event(tag, event, buf, len) \ #define sched_note_event(tag, event, buf, len) \
sched_note_event_ip(tag, SCHED_NOTE_IP, event, buf, len) sched_note_event_ip(tag, SCHED_NOTE_IP, event, buf, len)
#define sched_note_dump(tag, event, buf, len) \ #define sched_note_dump(tag, buf, len) \
sched_note_event(tag, SCHED_NOTE_IP, NOTE_DUMP_BINARY, buf, len) sched_note_event_ip(tag, SCHED_NOTE_IP, NOTE_DUMP_BINARY, buf, len)
#define sched_note_vprintf(tag, fmt, va) \ #define sched_note_vprintf(tag, fmt, va) \
sched_note_vprintf_ip(tag, SCHED_NOTE_IP, fmt, va) sched_note_vprintf_ip(tag, SCHED_NOTE_IP, fmt, va)
#define sched_note_vbprintf(tag, event, fmt, va) \ #define sched_note_vbprintf(tag, fmt, va) \
sched_note_vbprintf_ip(tag, SCHED_NOTE_IP, event, fmt, va) sched_note_vbprintf_ip(tag, SCHED_NOTE_IP, fmt, va)
#define sched_note_printf(tag, fmt, ...) \ #define sched_note_printf(tag, fmt, ...) \
sched_note_printf_ip(tag, SCHED_NOTE_IP, fmt, ##__VA_ARGS__) sched_note_printf_ip(tag, SCHED_NOTE_IP, fmt, ##__VA_ARGS__)
#define sched_note_bprintf(tag, event, fmt, ...) \ #define sched_note_bprintf(tag, fmt, ...) \
sched_note_bprintf_ip(tag, SCHED_NOTE_IP, event, \ sched_note_bprintf_ip(tag, SCHED_NOTE_IP, fmt, ##__VA_ARGS__)
fmt, ##__VA_ARGS__)
#define sched_note_counter(tag, name, value) \ #define sched_note_counter(tag, name, value) \
sched_note_counter_ip(tag, SCHED_NOTE_IP, name, value) sched_note_counter_ip(tag, SCHED_NOTE_IP, name, value)
@ -543,13 +542,12 @@ void sched_note_event_ip(uint32_t tag, uintptr_t ip, uint8_t event,
FAR const void *buf, size_t len); FAR const void *buf, size_t len);
void sched_note_vprintf_ip(uint32_t tag, uintptr_t ip, FAR const char *fmt, void sched_note_vprintf_ip(uint32_t tag, uintptr_t ip, FAR const char *fmt,
va_list va) printf_like(3, 0); va_list va) printf_like(3, 0);
void sched_note_vbprintf_ip(uint32_t tag, uintptr_t ip, uint8_t event, void sched_note_vbprintf_ip(uint32_t tag, uintptr_t ip, FAR const char *fmt,
FAR const char *fmt, va_list va) printf_like(3, 0);
va_list va) printf_like(4, 0);
void sched_note_printf_ip(uint32_t tag, uintptr_t ip, void sched_note_printf_ip(uint32_t tag, uintptr_t ip,
FAR const char *fmt, ...) printf_like(3, 4); FAR const char *fmt, ...) printf_like(3, 4);
void sched_note_bprintf_ip(uint32_t tag, uintptr_t ip, uint8_t event, void sched_note_bprintf_ip(uint32_t tag, uintptr_t ip,
FAR const char *fmt, ...) printf_like(4, 5); FAR const char *fmt, ...) printf_like(3, 4);
static inline void sched_note_counter_ip(uint32_t tag, uintptr_t ip, static inline void sched_note_counter_ip(uint32_t tag, uintptr_t ip,
FAR const char *name, FAR const char *name,
@ -564,9 +562,9 @@ static inline void sched_note_counter_ip(uint32_t tag, uintptr_t ip,
# define sched_note_string_ip(t,ip,b) # define sched_note_string_ip(t,ip,b)
# define sched_note_event_ip(t,ip,e,b,l) # define sched_note_event_ip(t,ip,e,b,l)
# define sched_note_vprintf_ip(t,ip,f,v) # define sched_note_vprintf_ip(t,ip,f,v)
# define sched_note_vbprintf_ip(t,ip,e,f,v) # define sched_note_vbprintf_ip(t,ip,f,v)
# define sched_note_printf_ip(t,ip,f,...) # define sched_note_printf_ip(t,ip,f,...)
# define sched_note_bprintf_ip(t,ip,e,f,...) # define sched_note_bprintf_ip(t,ip,f,...)
# define sched_note_counter_ip(t,ip,n,v) # define sched_note_counter_ip(t,ip,n,v)
#endif /* CONFIG_SCHED_INSTRUMENTATION_DUMP */ #endif /* CONFIG_SCHED_INSTRUMENTATION_DUMP */