diff options
Diffstat (limited to 'src/usr/errl')
| -rw-r--r-- | src/usr/errl/errlprvt.C | 50 | ||||
| -rw-r--r-- | src/usr/errl/parser/errlparser.C | 52 |
2 files changed, 50 insertions, 52 deletions
diff --git a/src/usr/errl/errlprvt.C b/src/usr/errl/errlprvt.C index 064d842b8..6b8a85ce2 100644 --- a/src/usr/errl/errlprvt.C +++ b/src/usr/errl/errlprvt.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/errl/errlprvt.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/errl/errlprvt.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file errlprvt.C * @@ -63,7 +63,7 @@ ErrlPrvt::ErrlPrvt( compId_t i_CreatorCompId ) : iv_sctns( 0 ) { // Ask the errl manager for the next ID to assign. - iv_plid = ERRORLOG::theErrlManager::instance().getUniqueErrId(); + iv_plid = iv_eid = ERRORLOG::theErrlManager::instance().getUniqueErrId(); // Set the time of creation. // TODO The field iv_created and iv_committed expect an 8-byte @@ -118,9 +118,7 @@ uint64_t ErrlPrvt::flatten( void * o_pBuffer, const uint64_t i_cbBuffer ) p->creatorId = iv_cid; p->sectionCount = iv_sctns; p->plid = iv_plid; - - // TODO In the future, eid may be different than PLID - p->eid = iv_plid; + p->eid = iv_eid; // return amount of bytes flattened l_rc = iv_header.iv_slen; diff --git a/src/usr/errl/parser/errlparser.C b/src/usr/errl/parser/errlparser.C index 20fcac589..801da1635 100644 --- a/src/usr/errl/parser/errlparser.C +++ b/src/usr/errl/parser/errlparser.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/errl/parser/errlparser.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/errl/parser/errlparser.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** @@ -895,13 +895,13 @@ int main( int argc, char *argv[] ) } printf( "%-16s %8d\n", FindComp(pPrivateHdr->sectionheader.compId), - pPrivateHdr->plid ); + pPrivateHdr->eid ); } - else if(( fDetail ) && (( pPrivateHdr->plid == ulLogId ) || (fAll))) + else if(( fDetail ) && (( pPrivateHdr->eid == ulLogId ) || (fAll))) { // Write the native PEL to a temporary file // for x86 errl tool to display. - sprintf( szTmpFilename, "/tmp/pel%d.bin", pPrivateHdr->plid ); + sprintf( szTmpFilename, "/tmp/pel%d.bin", pPrivateHdr->eid ); int fd = open( szTmpFilename, O_RDWR | O_CREAT , 0664 ); if( -1 == fd ) @@ -974,7 +974,7 @@ int main( int argc, char *argv[] ) if( fExtractPEL ) { // Write the native PEL to a temporary file for debug later. - sprintf( szTmpFilename, "%s/pel%d.bin", pszOutputDir, pPrivateHdr->plid ); + sprintf( szTmpFilename, "%s/pel%d.bin", pszOutputDir, pPrivateHdr->eid ); int fd = open( szTmpFilename, O_RDWR | O_CREAT , 0664 ); if( -1 == fd ) |
