OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

note: optimize note performance and reduce lib_sprintf calls 

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2023-10-10 22:45:02 +08:00 committed by Xiang Xiao
parent 8ddaa3460d
commit 9c59ee7c58
3 changed files with 83 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/note/note_driver.c
View File

@ -1396,8 +1396,8 @@ void sched_note_string_ip(uint32_t tag, uintptr_t ip, FAR const char *buf)
} }
} }
void sched_note_dump_ip(uint32_t tag, uintptr_t ip, uint8_t event, 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)
{ {
FAR struct note_binary_s *note; FAR struct note_binary_s *note;
FAR struct note_driver_s **driver; FAR struct note_driver_s **driver;
@ -1435,9 +1435,8 @@ void sched_note_dump_ip(uint32_t tag, uintptr_t ip, uint8_t event,
length = sizeof(data); length = sizeof(data);
} }
note_common(tcb, &note->nbi_cmn, length, NOTE_DUMP_BINARY); note_common(tcb, &note->nbi_cmn, length, event);
sched_note_flatten(note->nbi_ip, &ip, sizeof(uintptr_t)); sched_note_flatten(note->nbi_ip, &ip, sizeof(uintptr_t));
note->nbi_event = event;
memcpy(note->nbi_data, buf, memcpy(note->nbi_data, buf,
length - sizeof(struct note_binary_s) + 1); length - sizeof(struct note_binary_s) + 1);
} }
@ -1712,7 +1711,6 @@ void sched_note_vbprintf_ip(uint32_t tag, uintptr_t ip, uint8_t event,
note_common(tcb, &note->nbi_cmn, length, NOTE_DUMP_BINARY); note_common(tcb, &note->nbi_cmn, length, NOTE_DUMP_BINARY);
sched_note_flatten(note->nbi_ip, &ip, sizeof(uintptr_t)); sched_note_flatten(note->nbi_ip, &ip, sizeof(uintptr_t));
note->nbi_event = event;
} }
/* Add the note to circular buffer */ /* Add the note to circular buffer */

43
drivers/note/noteram_driver.c
View File

@ -972,7 +972,44 @@ static int noteram_dump_one(FAR uint8_t *p, FAR struct lib_outstream_s *s,
} }
} }
break; break;
case NOTE_DUMP_BEGIN:
case NOTE_DUMP_END:
{
FAR struct note_binary_s *nbi = (FAR struct note_binary_s *)p;
char c = note->nc_type == NOTE_DUMP_BEGIN ? 'B' : 'E';
int len = note->nc_length - sizeof(struct note_binary_s);
ret += noteram_dump_header(s, &nbi->nbi_cmn, ctx);
if (len > 0)
{
ret += lib_sprintf(s, "tracing_mark_write: %c|%d|%.*s\n",
c, pid, len, (FAR const char *)nbi->nbi_data);
}
else
{
ret += lib_sprintf(s, "tracing_mark_write: %c|%d|%pS\n",
c, pid, (FAR void *)nbi->nbi_ip);
}
}
break;
case NOTE_DUMP_MARK:
{
int len = note->nc_length - sizeof(struct note_binary_s);
FAR struct note_binary_s *nbi = (FAR struct note_binary_s *)p;
ret += noteram_dump_header(s, &nbi->nbi_cmn, ctx);
ret += lib_sprintf(s, "tracing_mark_write: I|%d|%.*s\n",
pid, len, (FAR const char *)nbi->nbi_data);
}
break;
case NOTE_DUMP_COUNTER:
{
FAR struct note_binary_s *nbi = (FAR struct note_binary_s *)p;
FAR struct note_counter_s *counter;
counter = (FAR struct note_counter_s *)nbi->nbi_data;
ret += noteram_dump_header(s, &nbi->nbi_cmn, ctx);
ret += lib_sprintf(s, "tracing_mark_write: C|%d|%s|%ld\n",
pid, counter->name, counter->value);
}
break;
case NOTE_DUMP_BINARY: case NOTE_DUMP_BINARY:
{ {
FAR struct note_binary_s *nbi; FAR struct note_binary_s *nbi;
@ -986,8 +1023,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, "0x%" PRIdPTR ": event=%u count=%u", ip, ret += lib_sprintf(s, "tracing_mark_write: 0x%" PRIdPTR
nbi->nbi_event, count); ": count=%u", 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]);

56
include/nuttx/sched_note.h
View File

@ -127,8 +127,10 @@
#define sched_note_string(tag, buf) \ #define sched_note_string(tag, buf) \
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) \
sched_note_event_ip(tag, SCHED_NOTE_IP, event, buf, len)
#define sched_note_dump(tag, event, buf, len) \ #define sched_note_dump(tag, event, buf, len) \
sched_note_dump_ip(tag, SCHED_NOTE_IP, event, buf, len) sched_note_event(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, event, fmt, va) \
@ -137,19 +139,20 @@
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, event, fmt, ...) \
sched_note_bprintf_ip(tag, SCHED_NOTE_IP, event, \ sched_note_bprintf_ip(tag, SCHED_NOTE_IP, event, \
fmt, ##__VA_ARGS__) fmt, ##__VA_ARGS__)
#define sched_note_begin(tag) sched_note_string(tag, "B")
#define sched_note_end(tag) sched_note_string(tag, "E")
#define sched_note_beginex(tag, str) \
sched_note_printf(tag, "B|%d|%s", _SCHED_GETTID(), str)
#define sched_note_endex(tag, str) \
sched_note_printf(tag, "E|%d|%s", _SCHED_GETTID(), str)
#define sched_note_mark(tag, str) \
sched_note_printf(tag, "I|%d|%s", _SCHED_GETTID(), str)
#define sched_note_counter(tag, name, value) \ #define sched_note_counter(tag, name, value) \
sched_note_printf(tag, "C|%d|%s|%" PRId32, \ sched_note_counter_ip(tag, SCHED_NOTE_IP, name, value)
_SCHED_GETTID(), name, value)
#define sched_note_begin(tag) \
sched_note_event(tag, NOTE_DUMP_BEGIN, NULL, 0)
#define sched_note_end(tag) \
sched_note_event(tag, NOTE_DUMP_END, NULL, 0)
#define sched_note_beginex(tag, str) \
sched_note_event(tag, NOTE_DUMP_BEGIN, str, strlen(str))
#define sched_note_endex(tag, str) \
sched_note_event(tag, NOTE_DUMP_END, str, strlen(str))
#define sched_note_mark(tag, str) \
sched_note_event(tag, NOTE_DUMP_MARK, str, strlen(str))
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
@ -183,6 +186,11 @@ enum note_type_e
NOTE_IRQ_LEAVE = 21, NOTE_IRQ_LEAVE = 21,
NOTE_DUMP_STRING = 22, NOTE_DUMP_STRING = 22,
NOTE_DUMP_BINARY = 23, NOTE_DUMP_BINARY = 23,
NOTE_DUMP_BEGIN = 24,
NOTE_DUMP_END = 25,
NOTE_DUMP_MARK = 28,
NOTE_DUMP_COUNTER = 29,
NOTE_TYPE_LAST
}; };
enum note_tag_e enum note_tag_e
@ -381,13 +389,18 @@ struct note_binary_s
{ {
struct note_common_s nbi_cmn; /* Common note parameters */ struct note_common_s nbi_cmn; /* Common note parameters */
uint8_t nbi_ip[sizeof(uintptr_t)]; /* Instruction pointer called from */ uint8_t nbi_ip[sizeof(uintptr_t)]; /* Instruction pointer called from */
uint8_t nbi_event; /* Event number */
uint8_t nbi_data[1]; /* Binary data */ uint8_t nbi_data[1]; /* Binary data */
}; };
#define SIZEOF_NOTE_BINARY(n) (sizeof(struct note_binary_s) + \ #define SIZEOF_NOTE_BINARY(n) (sizeof(struct note_binary_s) + \
((n) - 1) * sizeof(uint8_t)) ((n) - 1) * sizeof(uint8_t))
struct note_counter_s
{
long int value;
char name[NAME_MAX];
};
/* This is the type of the argument passed to the NOTECTL_GETMODE and /* This is the type of the argument passed to the NOTECTL_GETMODE and
* NOTECTL_SETMODE ioctls * NOTECTL_SETMODE ioctls
*/ */
@ -526,7 +539,7 @@ void sched_note_irqhandler(int irq, FAR void *handler, bool enter);
#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP #ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
void sched_note_string_ip(uint32_t tag, uintptr_t ip, FAR const char *buf); void sched_note_string_ip(uint32_t tag, uintptr_t ip, FAR const char *buf);
void sched_note_dump_ip(uint32_t tag, uintptr_t ip, uint8_t event, 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);
@ -537,13 +550,24 @@ 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, uint8_t event,
FAR const char *fmt, ...) printf_like(4, 5); FAR const char *fmt, ...) printf_like(4, 5);
static inline void sched_note_counter_ip(uint32_t tag, uintptr_t ip,
FAR const char *name,
long int value)
{
struct note_counter_s counter;
counter.value = value;
strlcpy(counter.name, name, sizeof(counter.name));
sched_note_event_ip(tag, ip, NOTE_DUMP_COUNTER, &counter, sizeof(counter));
}
#else #else
# define sched_note_string_ip(t,ip,b) # define sched_note_string_ip(t,ip,b)
# define sched_note_dump_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,e,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,e,f,...)
# define sched_note_counter_ip(t,ip,n,v)
#endif /* CONFIG_SCHED_INSTRUMENTATION_DUMP */ #endif /* CONFIG_SCHED_INSTRUMENTATION_DUMP */
#if defined(__KERNEL__) || defined(CONFIG_BUILD_FLAT) #if defined(__KERNEL__) || defined(CONFIG_BUILD_FLAT)