You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/12/14 17:17:00 UTC
[incubator-nuttx-apps] branch master updated (cc8dd03 -> 1e28c3b)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from cc8dd03 trace dump: add string and binary
new a2c8fa1 trace dump: build error because add CONFIG_SCHED_INSTRUMENTATION_SWITCH in note driver
new a63aef8 warning: trace_dump_sched_switch unused because add SCHED_INSTRUMENTATION_SWITCH
new 1e28c3b trace dump: the note dump module of out keep string output
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
system/sched_note/note_main.c | 4 ++++
system/trace/trace_dump.c | 11 +++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
[incubator-nuttx-apps] 01/03: trace dump: build error because add CONFIG_SCHED_INSTRUMENTATION_SWITCH in note driver
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit a2c8fa182aee88c4c1eb676319b6c48d3d75acb5
Author: zhanghu6 <zh...@xiaomi.com>
AuthorDate: Fri Dec 3 12:46:18 2021 +0800
trace dump: build error because add CONFIG_SCHED_INSTRUMENTATION_SWITCH in note driver
https://github.com/apache/incubator-nuttx/pull/4998
note dump: add CONFIG_SCHED_INSTRUMENTATION_SWITCH #4998
---
system/sched_note/note_main.c | 4 ++++
system/trace/trace_dump.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/system/sched_note/note_main.c b/system/sched_note/note_main.c
index 49f2108..948925c 100644
--- a/system/sched_note/note_main.c
+++ b/system/sched_note/note_main.c
@@ -188,6 +188,7 @@ static void dump_notes(size_t nread)
}
break;
+#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
case NOTE_SUSPEND:
{
FAR struct note_suspend_s *note_suspend =
@@ -250,6 +251,7 @@ static void dump_notes(size_t nread)
#endif
}
break;
+#endif
#ifdef CONFIG_SMP
case NOTE_CPU_START:
@@ -292,6 +294,7 @@ static void dump_notes(size_t nread)
}
break;
+#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
case NOTE_CPU_PAUSE:
{
FAR struct note_cpu_pause_s *note_pause =
@@ -372,6 +375,7 @@ static void dump_notes(size_t nread)
}
break;
#endif
+#endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_PREEMPTION
case NOTE_PREEMPT_LOCK:
diff --git a/system/trace/trace_dump.c b/system/trace/trace_dump.c
index 9e18c80..3f0731a 100644
--- a/system/trace/trace_dump.c
+++ b/system/trace/trace_dump.c
@@ -398,6 +398,7 @@ static int trace_dump_one(FAR FILE *out,
}
break;
+#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
case NOTE_SUSPEND:
{
FAR struct note_suspend_s *nsu = (FAR struct note_suspend_s *)p;
@@ -441,6 +442,7 @@ static int trace_dump_one(FAR FILE *out,
}
}
break;
+#endif
#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
case NOTE_SYSCALL_ENTER:
[incubator-nuttx-apps] 03/03: trace dump: the note dump module of out keep string output
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 1e28c3b9eac654b4577ce8c408b5f56a5a6f0d2b
Author: zhanghu6 <zh...@xiaomi.com>
AuthorDate: Tue Dec 7 14:11:58 2021 +0800
trace dump: the note dump module of out keep string output
---
system/trace/trace_dump.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/system/trace/trace_dump.c b/system/trace/trace_dump.c
index b7ac847..8863858 100644
--- a/system/trace/trace_dump.c
+++ b/system/trace/trace_dump.c
@@ -634,8 +634,10 @@ static int trace_dump_one(FAR FILE *out,
nbi = (FAR struct note_binary_s *)p;
trace_dump_header(out, note, ctx);
count = note->nc_length - sizeof(struct note_binary_s) + 1;
- fprintf(out, "dump_binary: module=%u event=%u count=%u",
- nbi->nbi_module, nbi->nbi_event, count);
+ fprintf(out, "dump_binary: module=%c%c%c%c event=%u count=%u",
+ nbi->nbi_module[0], nbi->nbi_module[1],
+ nbi->nbi_module[2], nbi->nbi_module[3],
+ nbi->nbi_event, count);
for (i = 0; i < count; i++)
{
fprintf(out, " 0x%x", nbi->nbi_data[i]);
[incubator-nuttx-apps] 02/03: warning: trace_dump_sched_switch unused because add SCHED_INSTRUMENTATION_SWITCH
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit a63aef8f021a60cb87eca622de5f109a159c7bdd
Author: zhanghu6 <zh...@xiaomi.com>
AuthorDate: Mon Dec 6 12:05:41 2021 +0800
warning: trace_dump_sched_switch unused because add SCHED_INSTRUMENTATION_SWITCH
https://github.com/apache/incubator-nuttx/pull/4998
note dump: add CONFIG_SCHED_INSTRUMENTATION_SWITCH #4998
---
system/trace/trace_dump.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/system/trace/trace_dump.c b/system/trace/trace_dump.c
index 3f0731a..b7ac847 100644
--- a/system/trace/trace_dump.c
+++ b/system/trace/trace_dump.c
@@ -308,6 +308,8 @@ static void trace_dump_header(FAR FILE *out,
);
}
+ #if (defined CONFIG_SCHED_INSTRUMENTATION_SWITCH) || \
+ (defined CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER)
/****************************************************************************
* Name: trace_dump_sched_switch
****************************************************************************/
@@ -339,6 +341,7 @@ static void trace_dump_sched_switch(FAR FILE *out,
cctx->current_pid = cctx->next_pid;
cctx->pendingswitch = false;
}
+#endif
/****************************************************************************
* Name: trace_dump_one