diff options
author | CamVan Nguyen <ctnguyen@us.ibm.com> | 2011-08-29 10:18:55 -0500 |
---|---|---|
committer | CAMVAN T. NGUYEN <ctnguyen@us.ibm.com> | 2011-08-30 12:37:02 -0500 |
commit | e4b2a0f558f49f24bf31f763c13027ebcabc5efa (patch) | |
tree | 936250ee2006a9b8f91f2d25c5d97c479b04f6ff /src/usr | |
parent | 868fd75d64f91d2afbb31d442451857d02a830ce (diff) | |
download | talos-hostboot-e4b2a0f558f49f24bf31f763c13027ebcabc5efa.tar.gz talos-hostboot-e4b2a0f558f49f24bf31f763c13027ebcabc5efa.zip |
Added %c and precision formatting support to trace.
Added TRACSCOMP macros.
Change-Id: If697b4d988a238b5cd06229853dded20bd0af3c1
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/286
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/trace/test/tracetest.H | 26 | ||||
-rw-r--r-- | src/usr/trace/trace.C | 23 |
2 files changed, 46 insertions, 3 deletions
diff --git a/src/usr/trace/test/tracetest.H b/src/usr/trace/test/tracetest.H index a68b6ccae..e574f55c5 100644 --- a/src/usr/trace/test/tracetest.H +++ b/src/usr/trace/test/tracetest.H @@ -71,7 +71,19 @@ public: // Do a debug trace TRACDCOMP(g_trac_test,"This is a debug trace"); - // Need to run a formatting test, but I know it will fail. + // Do an strace + TRACSCOMP(g_trac_test, "STRACE: Testing all number types (c,u,X,d,s): %c %u 0x%X %d %s", + 'b',i,i+1,i+2,"Hostboot"); + + // Test formatting + TRACFCOMP(g_trac_test, "Test width.precision formatting (u,x,X,d): %8u 0x%.06x 0x%16X %01.01d", + 0xABCD,0x1234,0x123456789ABCDEF0,0x12345678); + + TRACFCOMP(g_trac_test, "Test width.precision.length formatting (u,x,X,d): %8hu 0x%.06lx 0x%16LX %01.01lld", + 0xABCD,0x1234,0x123456789ABCDEF0,0x12345678); + + TRACFCOMP(g_trac_test, "Test width.precision.length formatting (u,x,X,i): %8hu 0x%.06lx 0x%16LX %01.01lli", + 0xABCD,0x1234,0x123456789ABCDEF0,0x12345678AB); } // Be sure a NULL trace descriptor does not cause a failure @@ -86,7 +98,7 @@ public: void testTracBinary(void) { trace_desc_t *g_trac_test = NULL; - TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLE", 4096); + TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLEBIN", 4096); if(g_trac_test == NULL) { @@ -119,7 +131,7 @@ public: void testTracMix(void) { trace_desc_t *g_trac_test = NULL; - TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLE", 4096); + TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLEMIX", 4096); if(g_trac_test == NULL) { @@ -201,6 +213,14 @@ public: DTRAC_ERR("Testing Debug Error Mark"); DTRAC_EXIT("testTracMacros - Debug Trace"); DTRAC_EXIT_(" - Debug Trace"); + + STRAC_ENTER("testTracMacros - Strace"); + STRAC_ENTER_(" - Strace"); + STRAC_INF("Testing Strace Info Mark"); + STRAC_ERR("Testing Strace Error Mark"); + STRAC_EXIT("testTracMacros - Strace"); + STRAC_EXIT_(" - Strace"); + } #undef __COMP_FN__ diff --git a/src/usr/trace/trace.C b/src/usr/trace/trace.C index 0f79c93cf..b37940300 100644 --- a/src/usr/trace/trace.C +++ b/src/usr/trace/trace.C @@ -328,6 +328,7 @@ void Trace::_trace_adal_write_all(trace_desc_t *io_td, //trace_entire_entry_t l_entry; trace_bin_entry_t l_entry; uint64_t l_str_map = 0; + uint64_t l_char_map = 0; /*------------------------------------------------------------------------*/ @@ -374,6 +375,21 @@ void Trace::_trace_adal_write_all(trace_desc_t *io_td, // num_args, l_data_size); //printk("Trace: l_str_map 0x%16llX\n", static_cast<long long>(l_str_map)); } + else if ('c' == _fmt[i]) + { + // Set flag to indicate argument is a char + l_char_map = l_char_map | (1 << num_args); + + // Increment arg counts + num_args++; + num_4byte_args++; + + // Retrieve the argument to increment to next one + uint32_t l_tmpData = va_arg(i_args, uint32_t); + + // Add to total size; data is word aligned + l_data_size += sizeof(l_tmpData); + } else { // Numbers count as two 4-byte arg @@ -447,6 +463,13 @@ void Trace::_trace_adal_write_all(trace_desc_t *io_td, //printk("Trace::trace_adal_write_all - num_args %d l_data_size %d l_entry_size %d\n", // num_args, l_data_size, l_entry_size); } + else if (l_char_map & (1 << i)) + { + // Save char to buffer & increment pointer (no need to align) + *(reinterpret_cast<uint32_t *>(l_ptr)) = va_arg(l_args, uint32_t); + l_ptr += sizeof(uint32_t); + + } else { // Save number to buffer & increment pointer (no need to align) |