diff options
Diffstat (limited to 'src/usr/trace')
| -rw-r--r-- | src/usr/trace/compdesc.C | 5 | ||||
| -rw-r--r-- | src/usr/trace/entry.H | 4 | ||||
| -rw-r--r-- | src/usr/trace/runtime/rt_service.C | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/usr/trace/compdesc.C b/src/usr/trace/compdesc.C index 35f4de0c5..3d8de4ac4 100644 --- a/src/usr/trace/compdesc.C +++ b/src/usr/trace/compdesc.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -95,7 +95,8 @@ namespace TRACE #ifndef __HOSTBOOT_RUNTIME // TODO: RTC 79408 // Check for special SCAN component to force enable debug trace on. - if (0 == memcmp(l_compName, "SCAN", 5)) + if (l_rc && !l_rc->iv_debugEnabled && + (0 == memcmp(l_compName, "SCAN", 5))) { TARGETING::Target* sys = NULL; TARGETING::targetService().getTopLevelTarget(sys); diff --git a/src/usr/trace/entry.H b/src/usr/trace/entry.H index 1bd47ce18..8f98468ac 100644 --- a/src/usr/trace/entry.H +++ b/src/usr/trace/entry.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -56,7 +56,7 @@ namespace TRACE ComponentDesc* comp; //< Component Descriptor for this Entry. Entry* next; //< Linked-list 'next' ptr. Entry* prev; //< Linked-list 'prev' ptr. - uint16_t committed; //< Committed status. + volatile uint16_t committed; //< Committed status. uint16_t size; //< Size of data portion. char data[0]; //< Start of 'fsp-trace' style structure. }; diff --git a/src/usr/trace/runtime/rt_service.C b/src/usr/trace/runtime/rt_service.C index e7eda7280..f5e5da27e 100644 --- a/src/usr/trace/runtime/rt_service.C +++ b/src/usr/trace/runtime/rt_service.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ +/* COPYRIGHT International Business Machines Corp. 2013,2014 */ /* */ /* p1 */ /* */ @@ -139,7 +139,7 @@ namespace TRACE memcpy(bin_output, i_td->iv_compName, compName_len); size_t output_pos = compName_len + sprintf(&bin_output[compName_len], - ":~[0x%04hx]", (int) pos); + ":~[0x%04hx]", (uint16_t) pos); for (int i = 0; i < 16; ++i) { |
