diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2016-09-11 20:49:30 -0500 |
|---|---|---|
| committer | Matthew A. Ploetz <maploetz@us.ibm.com> | 2016-09-14 10:45:46 -0400 |
| commit | c9284c4c8811430bab31c7fe381c8c9dc3958231 (patch) | |
| tree | d7d35caddea5294b08e0e99e613b240c14cc9552 /src/build/debug | |
| parent | 434dd272a8c30944bb19965dfb8a0291a423f29d (diff) | |
| download | talos-hostboot-c9284c4c8811430bab31c7fe381c8c9dc3958231.tar.gz talos-hostboot-c9284c4c8811430bab31c7fe381c8c9dc3958231.zip | |
Sort traces in debug tools
Change-Id: I836cc42746c8b5369b469534cce713b44885e93c
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29468
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Diffstat (limited to 'src/build/debug')
| -rwxr-xr-x | src/build/debug/Hostboot/Trace.pm | 7 | ||||
| -rwxr-xr-x | src/build/debug/simics-debug-framework.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/build/debug/Hostboot/Trace.pm b/src/build/debug/Hostboot/Trace.pm index 7b1d02927..23286b48c 100755 --- a/src/build/debug/Hostboot/Trace.pm +++ b/src/build/debug/Hostboot/Trace.pm @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2015 +# Contributors Listed Below - COPYRIGHT 2011,2016 # [+] International Business Machines Corp. # # @@ -163,8 +163,11 @@ sub main if ($foundBuffer) { + # Note: 'sort -s -k 1,1' restricts the sort to only act on the first + # column (i.e. the timestamp) to avoid reordering traces that have + # identical timestamps open TRACE, ($args->{"fsp-trace"}." $tmpdir -s ". - ::getImgPath()."hbotStringFile $fsptrace_options |"); + ::getImgPath()."hbotStringFile $fsptrace_options | sort -s -k 1,1 |"); while (my $line = <TRACE>) { ::userDisplay $line; diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py index cae13c134..20985a794 100755 --- a/src/build/debug/simics-debug-framework.py +++ b/src/build/debug/simics-debug-framework.py @@ -613,7 +613,7 @@ def magic_instruction_callback(user_arg, cpu, arg): hb_tracBinaryBufferSz) - cmd2 = "(shell \"(fsp-trace ./%s -s %s/hbotStringFile >> %s 2>/dev/null) || true\")"\ + cmd2 = "(shell \"(fsp-trace ./%s -s %s/hbotStringFile | sort -s -k 1,1 >> %s 2>/dev/null) || true\")"\ %(tracbin[node_num],\ os.environ['HB_TOOLPATH'],\ tracmerg[node_num]) |
