diff options
31 files changed, 254 insertions, 234 deletions
diff --git a/src/usr/cxxtest/cxxtestexec.C b/src/usr/cxxtest/cxxtestexec.C index 7e0de1bbf..bf55c5e69 100644 --- a/src/usr/cxxtest/cxxtestexec.C +++ b/src/usr/cxxtest/cxxtestexec.C @@ -45,7 +45,7 @@ void cxxinit( errlHndl_t &io_taskRetErrl ); trace_desc_t *g_trac_cxxtest = NULL; -TRAC_INIT(&g_trac_cxxtest, CXXTEST_COMP_NAME, 1024 ); +TRAC_INIT(&g_trac_cxxtest, CXXTEST_COMP_NAME, KILOBYTE ); /** @@ -150,5 +150,5 @@ void cxxinit( errlHndl_t &io_taskRetErrl ) // @todo dump out an informational errorlog?? // should always return NULL - io_taskRetErrl = l_errl; + io_taskRetErrl = l_errl; } diff --git a/src/usr/cxxtest/cxxtestgen.pl b/src/usr/cxxtest/cxxtestgen.pl index e0fa45098..e8f828402 100755 --- a/src/usr/cxxtest/cxxtestgen.pl +++ b/src/usr/cxxtest/cxxtestgen.pl @@ -642,6 +642,7 @@ sub writeHostBootPreamble() { print "#include <sys/task.h>\n"; print "#include <sys/sync.h>\n"; print "#include <trace/interface.H>\n"; + print "#include <limits.h>\n"; ## $$TODO print "#include <taskargs/taskargs.H>\n"; print "#include <cxxtest/TestSuite.H>\n"; @@ -728,8 +729,7 @@ sub write_start() { print "\n"; print "trace_desc_t *g_trac_test = NULL;\n"; ## Use same trace buffer for all unit tests, i.e. "UNIT_TEST" -## print "TRAC_INIT(&g_trac_test, \"", suiteName(), "\", 4096);\n"; - print "TRAC_INIT(&g_trac_test, \"", "UNIT_TEST", "\", 4096);\n"; + print "TRAC_INIT(&g_trac_test, \"", "UNIT_TEST", "\", 4*KILOBYTE);\n"; print "\n\n"; diff --git a/src/usr/devicefw/associator.C b/src/usr/devicefw/associator.C index 87d3cfdb1..4fe742f2d 100644 --- a/src/usr/devicefw/associator.C +++ b/src/usr/devicefw/associator.C @@ -34,7 +34,7 @@ using namespace TARGETING; namespace DeviceFW { trace_desc_t* g_traceBuffer = NULL; - TRAC_INIT(&g_traceBuffer, "DevFW", 4096, TRACE::BUFFER_SLOW); + TRAC_INIT(&g_traceBuffer, "DevFW", KILOBYTE, TRACE::BUFFER_SLOW); Associator::Associator() : iv_mutex() { diff --git a/src/usr/diag/attn/attntrace.C b/src/usr/diag/attn/attntrace.C index c21c8d61c..c94394d37 100644 --- a/src/usr/diag/attn/attntrace.C +++ b/src/usr/diag/attn/attntrace.C @@ -28,12 +28,13 @@ */ #include "attntrace.H" +#include <limits.h> namespace ATTN { trace_desc_t * fastTd = 0, * slowTd = 0; -TRAC_INIT(&fastTd, "ATTN_FAST", 4096); -TRAC_INIT(&slowTd, "ATTN_SLOW", 4096); +TRAC_INIT(&fastTd, "ATTN_FAST", KILOBYTE); +TRAC_INIT(&slowTd, "ATTN_SLOW", KILOBYTE); } diff --git a/src/usr/diag/mdia/mdiatrace.C b/src/usr/diag/mdia/mdiatrace.C index 474b33e6d..26ffbfec2 100644 --- a/src/usr/diag/mdia/mdiatrace.C +++ b/src/usr/diag/mdia/mdiatrace.C @@ -1,37 +1,38 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/diag/mdia/mdiatrace.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 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 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/diag/mdia/mdiatrace.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 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 mdiatrace.C * @brief mdia trace descriptors */ #include "mdiatrace.H" +#include <limits.h> namespace MDIA { trace_desc_t * fastTd = 0, * slowTd = 0; -TRAC_INIT(&fastTd, "MDIA_FAST", 4096); -TRAC_INIT(&slowTd, "MDIA_SLOW", 4096); +TRAC_INIT(&fastTd, "MDIA_FAST", KILOBYTE); +TRAC_INIT(&slowTd, "MDIA_SLOW", KILOBYTE); } diff --git a/src/usr/diag/prdf/common/plat/prdfRepairHealth.C b/src/usr/diag/prdf/common/plat/prdfRepairHealth.C index 11d244701..508908cb7 100755 --- a/src/usr/diag/prdf/common/plat/prdfRepairHealth.C +++ b/src/usr/diag/prdf/common/plat/prdfRepairHealth.C @@ -24,11 +24,16 @@ #include <prdfRepairHealth.H> #include <svpdextstructs.H> #include <svpdextinterface.H> +#include <limits.h> //#include <prdfP7McRepairHealth.H> tracDesc_t g_asmTracDesc; +#ifdef __HOSTBOOT_MODULE +TRAC_INIT( &g_asmTracDesc, PRDF_COMP_NAME, KILOBYTE ); +#else TRAC_INIT( &g_asmTracDesc, PRDF_COMP_NAME, 4096 ); +#endif /* prdfGetRepairHealthStatus * Get repair objects for FRU. diff --git a/src/usr/diag/prdf/common/prdfTrace.C b/src/usr/diag/prdf/common/prdfTrace.C index a774972d3..e8b88e07a 100755 --- a/src/usr/diag/prdf/common/prdfTrace.C +++ b/src/usr/diag/prdf/common/prdfTrace.C @@ -27,10 +27,15 @@ */ #include "prdfTrace.H" +#include <limits.h> namespace PRDF { tracDesc_t traceDesc = 0; +#ifdef __HOSTBOOT_MODULE + TRAC_INIT( &traceDesc, PRDF_COMP_NAME, KILOBYTE ); +#else TRAC_INIT( &traceDesc, PRDF_COMP_NAME, 4096 ); +#endif } //End namespace PRDF diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C index 45259d8e3..374277df4 100644 --- a/src/usr/errl/errlentry.C +++ b/src/usr/errl/errlentry.C @@ -47,7 +47,7 @@ namespace ERRORLOG // Trace definition trace_desc_t* g_trac_errl = NULL; -TRAC_INIT(&g_trac_errl, "ERRL", 1024, TRACE::BUFFER_SLOW); +TRAC_INIT(&g_trac_errl, "ERRL", KILOBYTE, TRACE::BUFFER_SLOW); /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C index e7acb52d9..814556efd 100644 --- a/src/usr/fsi/fsidd.C +++ b/src/usr/fsi/fsidd.C @@ -36,7 +36,7 @@ #include <trace/interface.H> #include <errl/errlentry.H> #include <errl/errlmanager.H> -#include <initservice/taskargs.H> +#include <initservice/taskargs.H> #include <sys/time.h> #include <string.h> #include <algorithm> @@ -44,15 +44,15 @@ // FSI : General driver traces trace_desc_t* g_trac_fsi = NULL; -TRAC_INIT(&g_trac_fsi, "FSI", 4096); //4K +TRAC_INIT(&g_trac_fsi, "FSI", KILOBYTE); //1K // FSIR : Register reads and writes (should always use TRACS) trace_desc_t* g_trac_fsir = NULL; -TRAC_INIT(&g_trac_fsir, "FSIR", 4096); //4K +TRAC_INIT(&g_trac_fsir, "FSIR", KILOBYTE); //1K // Easy macro replace for unit testing //#define TRACUCOMP(args...) TRACFCOMP(args) -#define TRACUCOMP(args...) +#define TRACUCOMP(args...) namespace FSI @@ -74,7 +74,7 @@ namespace FSI * @param[in] i_accessType DeviceFW::AccessType enum (userif.H) * @param[in] i_args This is an argument list for DD framework. * In this function, there's only one argument, - * containing the FSI address + * containing the FSI address * @return errlHndl_t */ errlHndl_t ddOp(DeviceFW::OperationType i_opType, @@ -153,7 +153,7 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType, break; } - // do the read + // do the read if( DeviceFW::READ == i_opType ) { l_err = Singleton<FsiDD>::instance().read(i_target, @@ -165,7 +165,7 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType, } io_buflen = sizeof(uint32_t); } - // do the write + // do the write else if( DeviceFW::WRITE == i_opType ) { l_err = Singleton<FsiDD>::instance().write(i_target, @@ -205,21 +205,21 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType, // Register fsidd access functions to DD framework DEVICE_REGISTER_ROUTE(DeviceFW::READ, - DeviceFW::FSI, + DeviceFW::FSI, TARGETING::TYPE_PROC, ddOp); DEVICE_REGISTER_ROUTE(DeviceFW::READ, - DeviceFW::FSI, + DeviceFW::FSI, TARGETING::TYPE_MEMBUF, ddOp); // Register fsidd access functions to DD framework DEVICE_REGISTER_ROUTE(DeviceFW::WRITE, - DeviceFW::FSI, + DeviceFW::FSI, TARGETING::TYPE_PROC, ddOp); DEVICE_REGISTER_ROUTE(DeviceFW::WRITE, - DeviceFW::FSI, + DeviceFW::FSI, TARGETING::TYPE_MEMBUF, ddOp); @@ -483,7 +483,7 @@ errlHndl_t FsiDD::initializeHardware() if( l_err ) { //@todo - append the actual slave target to FFDC - // commit the log here so that we can move on to next port + // commit the log here so that we can move on to next port errlCommit(l_err,FSI_COMP_ID); //if this fails then some of the slaves below won't init, @@ -533,7 +533,7 @@ errlHndl_t FsiDD::initializeHardware() if( l_err ) { //@todo - append the actual slave target to FFDC - // commit the log here so that we can move on to next port + // commit the log here so that we can move on to next port errlCommit(l_err,FSI_COMP_ID); } } @@ -564,7 +564,7 @@ errlHndl_t FsiDD::initializeHardware() if( l_err ) { //@todo - append the actual slave target to FFDC - // commit the log here so that we can move on to next port + // commit the log here so that we can move on to next port errlCommit(l_err,FSI_COMP_ID); } } @@ -620,7 +620,7 @@ errlHndl_t FsiDD::read(uint64_t i_address, // generate a set of address info for this manual operation // note that relAddr==absAddr in this case - FsiAddrInfo_t addr_info( iv_master, i_address ); + FsiAddrInfo_t addr_info( iv_master, i_address ); addr_info.opbTarg = iv_master; addr_info.absAddr = i_address; @@ -642,7 +642,7 @@ errlHndl_t FsiDD::write(uint64_t i_address, // generate a set of address info for this manual operation // note that relAddr==absAddr in this case - FsiAddrInfo_t addr_info( iv_master, i_address ); + FsiAddrInfo_t addr_info( iv_master, i_address ); addr_info.opbTarg = iv_master; addr_info.absAddr = i_address; @@ -699,7 +699,7 @@ errlHndl_t FsiDD::read(const FsiAddrInfo_t& i_addrInfo, break; } - // poll for complete and get the data back + // poll for complete and get the data back l_err = pollForComplete( i_addrInfo, o_buffer ); if( l_err ) { @@ -790,7 +790,7 @@ errlHndl_t FsiDD::write(const FsiAddrInfo_t& i_addrInfo, mutex_unlock(l_mutex); } - TRACDCOMP(g_trac_fsi, "< FsiDD::write() " ); + TRACDCOMP(g_trac_fsi, "< FsiDD::write() " ); return l_err; } @@ -804,7 +804,7 @@ errlHndl_t FsiDD::handleOpbErrors(const FsiAddrInfo_t& i_addrInfo, { errlHndl_t l_err = NULL; - if( (i_opbStatReg & OPB_STAT_ERR_ANY) + if( (i_opbStatReg & OPB_STAT_ERR_ANY) || (i_opbStatReg & OPB_STAT_BUSY) ) { TRACFCOMP( g_trac_fsi, "FsiDD::handleOpbErrors> Error during FSI access : relAddr=0x%X, absAddr=0x%X, OPB Status=0x%.8X", i_addrInfo.relAddr, i_addrInfo.absAddr, i_opbStatReg ); @@ -882,7 +882,7 @@ errlHndl_t FsiDD::handleOpbErrors(const FsiAddrInfo_t& i_addrInfo, l_err->collectTrace("FSIR"); //@todo - figure out best data to log - //@todo - implement recovery and callout code (Story 35287) + //@todo - implement recovery and callout code (Story 35287) } @@ -957,7 +957,7 @@ errlHndl_t FsiDD::pollForComplete(const FsiAddrInfo_t& i_addrInfo, read_data[1]) ); l_err->collectTrace("FSI"); l_err->collectTrace("FSIR"); - break; + break; } // check if we got an error from the OPB @@ -971,7 +971,7 @@ errlHndl_t FsiDD::pollForComplete(const FsiAddrInfo_t& i_addrInfo, if( o_readData ) // only check if we're doing a read { if( !(read_data[0] & OPB_STAT_READ_VALID) ) - { + { TRACFCOMP( g_trac_fsi, "FsiDD::pollForComplete> Read valid never came on : absAddr=0x%X, OPB Status=0x%.8X", i_addrInfo.absAddr, read_data[0] ); /*@ * @errortype @@ -1034,12 +1034,12 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo) { //append the appropriate offset io_addrInfo.absAddr += getPortOffset(fsi_info.type,fsi_info.port); - } + } //verify this target has a valid FSI master else if( TARGETING::FSI_MASTER_TYPE_CMFSI != fsi_info.type ) - { + { TRACFCOMP( g_trac_fsi, "target=%.8X : Master Type is not supported = %d", TARGETING::get_huid(io_addrInfo.fsiTarg), fsi_info.type ); - /*@ + /*@ * @errortype * @moduleid FSI::MOD_FSIDD_GENFULLFSIADDR * @reasoncode FSI::RC_FSI_NOT_SUPPORTED @@ -1058,7 +1058,7 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo) l_err->collectTrace("FSI",1024); return l_err; } - //target is behind another proc + //target is behind another proc else { //append the CMFSI portion first @@ -1071,7 +1071,7 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo) if( mfsi_info.master != iv_master ) { TRACFCOMP( g_trac_fsi, "target=%.8X : master=%.8X : master's master=%.8X : Cannot chain 2 masters", TARGETING::get_huid(io_addrInfo.fsiTarg), TARGETING::get_huid(fsi_info.master), TARGETING::get_huid(mfsi_info.master), fsi_info.type ); - /*@ + /*@ * @errortype * @moduleid FSI::MOD_FSIDD_GENFULLFSIADDR * @reasoncode FSI::RC_INVALID_FSI_PATH_1 @@ -1104,7 +1104,7 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo) { TRACFCOMP( g_trac_fsi, "target=%.8X : master=%.8X, type=%d, port=%d", TARGETING::get_huid(io_addrInfo.fsiTarg), TARGETING::get_huid(fsi_info.master), fsi_info.type, fsi_info.port ); TRACFCOMP( g_trac_fsi, "Master: target=%.8X : master=%.8X, type=%d, port=%d", TARGETING::get_huid(fsi_info.master), TARGETING::get_huid(mfsi_info.master), mfsi_info.type, mfsi_info.port ); - /*@ + /*@ * @errortype * @moduleid FSI::MOD_FSIDD_GENFULLFSIADDR * @reasoncode FSI::RC_INVALID_FSI_PATH_2 @@ -1164,7 +1164,7 @@ uint64_t FsiDD::genOpbScomAddr(const FsiAddrInfo_t& i_addrInfo, return opbaddr; } -/** +/** * @brief Initializes the FSI link to allow slave access */ errlHndl_t FsiDD::initPort(FsiChipInfo_t i_fsiInfo, @@ -1189,7 +1189,7 @@ errlHndl_t FsiDD::initPort(FsiChipInfo_t i_fsiInfo, // append the master's port offset to the slave's master_offset = getPortOffset( TARGETING::FSI_MASTER_TYPE_MFSI, mfsi_info.port ); - } + } // control register is determined by the type of port uint64_t master_ctl_reg = getControlReg(i_fsiInfo.type); @@ -1288,12 +1288,12 @@ errlHndl_t FsiDD::initPort(FsiChipInfo_t i_fsiInfo, slave_offset |= MFSI_SLAVE_3; } - //Setup the FSI slave to enable HW recovery, lbus ratio + //Setup the FSI slave to enable HW recovery, lbus ratio // 2= Enable HW error recovery (bit 2) - // 6:7= Slave ID: 3 (default) - // 8:11= Echo delay: 0xF (default) + // 6:7= Slave ID: 3 (default) + // 8:11= Echo delay: 0xF (default) // 12:15= Send delay cycles: 0xF - // 20:23= Local bus ratio: 0x1 + // 20:23= Local bus ratio: 0x1 databuf = 0x23FF0100; l_err = write( slave_offset|FSI::SLAVE_MODE_00, &databuf ); if( l_err ) { break; } @@ -1301,7 +1301,7 @@ errlHndl_t FsiDD::initPort(FsiChipInfo_t i_fsiInfo, //Note - this is a separate write because we want to have HW recovery // enabled when we switch the window //Set FSI slave ID to 0 (move slave to 1st 2MB address window) - // 6:7= Slave ID: 0 + // 6:7= Slave ID: 0 databuf = 0x20FF0100; l_err = write( slave_offset|FSI::SLAVE_MODE_00, &databuf ); if( l_err ) { break; } @@ -1345,7 +1345,7 @@ errlHndl_t FsiDD::initMasterControl(TARGETING::Target* i_master, TRACFCOMP( g_trac_fsi, ENTER_MRK"FsiDD::initMasterControl> Initializing Master %.8X:%d", TARGETING::get_huid(i_master), i_type ); do { - // Do not initialize the masters because they are already + // Do not initialize the masters because they are already // working before we run bool fsp_master_init = false; TARGETING::Target * sys = NULL; @@ -1447,7 +1447,7 @@ errlHndl_t FsiDD::initMasterControl(TARGETING::Target* i_master, TRACFCOMP( g_trac_fsi, "%.8X: EC=%X", TARGETING::get_huid(i_master), ec_level ); if( ec_level == 0x10 ) { - // 25=clock/4 mode + // 25=clock/4 mode databuf |= 0x00000040; } } @@ -1458,7 +1458,7 @@ errlHndl_t FsiDD::initMasterControl(TARGETING::Target* i_master, //NOTE: Need to do slave detection even in non-init cases // because we cache this data up to use later - //Determine which links are present + //Determine which links are present l_err = read( ctl_reg|FSI_MLEVP0_018, &databuf ); if( l_err ) { break; } @@ -1471,7 +1471,7 @@ errlHndl_t FsiDD::initMasterControl(TARGETING::Target* i_master, //Only use slaves that we sense and FSP has enabled databuf = databuf & databuf2; - } + } // Only looking at the top bits uint64_t slave_index = getSlaveEnableIndex(i_master,i_type); diff --git a/src/usr/fsiscom/fsiscom.C b/src/usr/fsiscom/fsiscom.C index a61bfcce2..983e2d838 100644 --- a/src/usr/fsiscom/fsiscom.C +++ b/src/usr/fsiscom/fsiscom.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/fsiscom/fsiscom.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/fsiscom/fsiscom.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 */ /*****************************************************************************/ // I n c l u d e s /*****************************************************************************/ @@ -35,11 +35,11 @@ // Trace definition trace_desc_t* g_trac_fsiscom = NULL; -TRAC_INIT(&g_trac_fsiscom, "FSISCOM", 4096); //4K +TRAC_INIT(&g_trac_fsiscom, "FSISCOM", 2*KILOBYTE); //2K // Easy macro replace for unit testing //#define TRACUCOMP(args...) TRACFCOMP(args) -#define TRACUCOMP(args...) +#define TRACUCOMP(args...) namespace FSISCOM @@ -129,7 +129,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, { memcpy(&(scratchData.data64), io_buffer, 8); - TRACUCOMP( g_trac_fsiscom, "fsiScomPerformOp> Write(l_scomAddr=0x%X, l_data0=0x%X, l_data1=0x%X)", l_scomAddr, scratchData.data32_0, scratchData.data32_1); + TRACUCOMP( g_trac_fsiscom, "fsiScomPerformOp> Write(l_scomAddr=0x%X, l_data0=0x%X, l_data1=0x%X)", l_scomAddr, scratchData.data32_0, scratchData.data32_1); // atomic section >> @@ -139,7 +139,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //write bits 0-31 to data0 l_err = DeviceFW::deviceOp( DeviceFW::WRITE, - i_target, + i_target, &scratchData.data32_0, op_size, DEVICE_FSI_ADDRESS(DATA0_REG)); @@ -150,7 +150,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //write bits 32-63 to data1 l_err = DeviceFW::deviceOp( DeviceFW::WRITE, - i_target, + i_target, &scratchData.data32_1, op_size, DEVICE_FSI_ADDRESS(DATA1_REG)); @@ -163,7 +163,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //bit 0 high => write command l_command = 0x80000000 | l_command; l_err = DeviceFW::deviceOp( DeviceFW::WRITE, - i_target, + i_target, &l_command, op_size, DEVICE_FSI_ADDRESS(COMMAND_REG)); @@ -174,7 +174,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //check status reg to see result l_err = DeviceFW::deviceOp( DeviceFW::READ, - i_target, + i_target, &l_status, op_size, DEVICE_FSI_ADDRESS(STATUS_REG)); @@ -190,7 +190,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //bits 17-19 indicates PCB/PIB error if(l_status & 0x00007000) { - TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Write: PCB/PIB error received: l_status=0x%X)", l_status); + TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Write: PCB/PIB error received: l_status=0x%X)", l_status); /*@ * @errortype * @moduleid FSISCOM::MOD_FSISCOM_PERFORMOP @@ -212,12 +212,12 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, break; } - + } else if(i_opType == DeviceFW::READ) { - TRACUCOMP( g_trac_fsiscom, "fsiScomPerformOp: Read(l_scomAddr=0x%.8X)", l_scomAddr); + TRACUCOMP( g_trac_fsiscom, "fsiScomPerformOp: Read(l_scomAddr=0x%.8X)", l_scomAddr); // atomic section >> mutex_lock(l_mutex); @@ -227,7 +227,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //write to FSI2PIB command reg starts read operation // bit 0 low -> read command l_err = DeviceFW::deviceOp( DeviceFW::WRITE, - i_target, + i_target, &l_command, op_size, DEVICE_FSI_ADDRESS(COMMAND_REG)); @@ -238,7 +238,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //check ststus reg to see result l_err = DeviceFW::deviceOp( DeviceFW::READ, - i_target, + i_target, &l_status, op_size, DEVICE_FSI_ADDRESS(STATUS_REG)); @@ -250,8 +250,8 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //bits 17-19 indicates PCB/PIB error if((l_status & 0x00007000) != 0) { - TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Read: PCB/PIB error received: l_status=0x%.8X)", l_status); - + TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Read: PCB/PIB error received: l_status=0x%.8X)", l_status); + /*@ * @errortype * @moduleid FSISCOM::MOD_FSISCOM_PERFORMOP @@ -274,7 +274,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //read bits 0-31 to data0 l_err = DeviceFW::deviceOp( DeviceFW::READ, - i_target, + i_target, &scratchData.data32_0, op_size, DEVICE_FSI_ADDRESS(DATA0_REG)); @@ -285,7 +285,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, //read bits 32-63 to data1 l_err = DeviceFW::deviceOp( DeviceFW::READ, - i_target, + i_target, &scratchData.data32_1, op_size, DEVICE_FSI_ADDRESS(DATA1_REG)); @@ -298,13 +298,13 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType, need_unlock = false; mutex_unlock(l_mutex); - TRACUCOMP( g_trac_fsiscom, "fsiScomPerformOp: Read: l_scomAddr=0x%X, l_data0=0x%X, l_data1=0x%X", l_scomAddr, scratchData.data32_0, scratchData.data32_1); + TRACUCOMP( g_trac_fsiscom, "fsiScomPerformOp: Read: l_scomAddr=0x%X, l_data0=0x%X, l_data1=0x%X", l_scomAddr, scratchData.data32_0, scratchData.data32_1); memcpy(io_buffer, &(scratchData.data64), 8); } else { - TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Read: PCB/PIB error received: l_status=0x%.8X)", l_status); + TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Read: PCB/PIB error received: l_status=0x%.8X)", l_status); /*@ * @errortype diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C index 923a3a0c1..9736e3fa7 100644 --- a/src/usr/hwas/common/hwas.C +++ b/src/usr/hwas/common/hwas.C @@ -50,8 +50,13 @@ using namespace HWAS::COMMON; HWAS_TD_t g_trac_dbg_hwas = NULL; // debug - fast HWAS_TD_t g_trac_imp_hwas = NULL; // important - slow +#ifdef __HOSTBOOT_MODULE +TRAC_INIT(&g_trac_dbg_hwas, "HWAS", KILOBYTE ); +TRAC_INIT(&g_trac_imp_hwas, "HWAS_I", KILOBYTE ); +#else TRAC_INIT(&g_trac_dbg_hwas, "HWAS", 1024 ); TRAC_INIT(&g_trac_imp_hwas, "HWAS_I", 1024 ); +#endif /** * @brief simple helper fn to get and set hwas state to poweredOn, diff --git a/src/usr/hwpf/plat/fapiPlatUtil.C b/src/usr/hwpf/plat/fapiPlatUtil.C index 94bd2fc58..ae447881a 100644 --- a/src/usr/hwpf/plat/fapiPlatUtil.C +++ b/src/usr/hwpf/plat/fapiPlatUtil.C @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/hwpf/plat/fapiPlatUtil.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 other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/hwpf/plat/fapiPlatUtil.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 fapiPlatUtil.C * @@ -49,9 +48,9 @@ trace_desc_t* g_fapiScanTd; //****************************************************************************** // Global TracInit objects. Construction will initialize the trace buffer //****************************************************************************** -TRAC_INIT(&g_fapiTd, FAPI_TRACE_NAME, 4096); -TRAC_INIT(&g_fapiImpTd, FAPI_IMP_TRACE_NAME, 4096); -TRAC_INIT(&g_fapiScanTd, FAPI_SCAN_TRACE_NAME, 4096); +TRAC_INIT(&g_fapiTd, FAPI_TRACE_NAME, 2*KILOBYTE); +TRAC_INIT(&g_fapiImpTd, FAPI_IMP_TRACE_NAME, 2*KILOBYTE); +TRAC_INIT(&g_fapiScanTd, FAPI_SCAN_TRACE_NAME, 4*KILOBYTE); extern "C" { @@ -121,7 +120,7 @@ void fapiLogError(fapi::ReturnCode & io_rc) } //**************************************************************************** -// platform-level implementation +// platform-level implementation bool platIsScanTraceEnabled() { @@ -131,7 +130,7 @@ bool platIsScanTraceEnabled() } //**************************************************************************** -// platform-level implementation +// platform-level implementation void platSetScanTrace(bool i_enable) { @@ -184,7 +183,7 @@ fapi::ReturnCode fapiLoadInitFile(const fapi::Target & i_Target, //****************************************************************************** // fapiUnloadInitFile //****************************************************************************** -fapi::ReturnCode fapiUnloadInitFile(const char * i_file, const char *& io_addr, +fapi::ReturnCode fapiUnloadInitFile(const char * i_file, const char *& io_addr, size_t & io_size) { fapi::ReturnCode l_rc = fapi::FAPI_RC_SUCCESS; diff --git a/src/usr/i2c/eepromdd.C b/src/usr/i2c/eepromdd.C index 1102cb26b..c4a785c30 100755 --- a/src/usr/i2c/eepromdd.C +++ b/src/usr/i2c/eepromdd.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/i2c/eepromdd.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/i2c/eepromdd.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 eepromdd.C * @@ -52,10 +52,10 @@ mutex_t g_eepromMutex = MUTEX_INITIALIZER; // Trace definitions // ---------------------------------------------- trace_desc_t* g_trac_eeprom = NULL; -TRAC_INIT( & g_trac_eeprom, "EEPROM", 4096 ); +TRAC_INIT( & g_trac_eeprom, "EEPROM", KILOBYTE ); trace_desc_t* g_trac_eepromr = NULL; -TRAC_INIT( & g_trac_eepromr, "EEPROMR", 4096 ); +TRAC_INIT( & g_trac_eepromr, "EEPROMR", KILOBYTE ); // Easy macro replace for unit testing //#define TRACUCOMP(args...) TRACFCOMP(args) diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C index 0aee39199..2a80063a7 100755 --- a/src/usr/i2c/i2c.C +++ b/src/usr/i2c/i2c.C @@ -51,10 +51,10 @@ // Trace definitions // ---------------------------------------------- trace_desc_t* g_trac_i2c = NULL; -TRAC_INIT( & g_trac_i2c, "I2C", 4096 ); +TRAC_INIT( & g_trac_i2c, "I2C", KILOBYTE ); trace_desc_t* g_trac_i2cr = NULL; -TRAC_INIT( & g_trac_i2cr, "I2CR", 4096 ); +TRAC_INIT( & g_trac_i2cr, "I2CR", KILOBYTE ); // Easy macro replace for unit testing //#define TRACUCOMP(args...) TRACFCOMP(args) diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C index e7a260688..7267a5dd1 100644 --- a/src/usr/initservice/baseinitsvc/initservice.C +++ b/src/usr/initservice/baseinitsvc/initservice.C @@ -67,7 +67,7 @@ namespace INITSERVICE { trace_desc_t *g_trac_initsvc = NULL; -TRAC_INIT(&g_trac_initsvc, "INITSVC", 2048 ); +TRAC_INIT(&g_trac_initsvc, "INITSVC", 2*KILOBYTE ); /** * @brief start() task entry procedure diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index c73041280..9e491dbb6 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -148,7 +148,7 @@ void IStepDispatcher::init ( errlHndl_t &io_rtaskRetErrl ) // initialize (and declare) ISTEPS_TRACE here, the rest of the isteps will // use it. ISTEPS_TRACE::g_trac_isteps_trace = NULL; - TRAC_INIT(&ISTEPS_TRACE::g_trac_isteps_trace, "ISTEPS_TRACE", 2048 ); + TRAC_INIT(&ISTEPS_TRACE::g_trac_isteps_trace, "ISTEPS_TRACE", 2*KILOBYTE ); printk( "IstepDispatcher entry.\n" ); TRACFCOMP( g_trac_initsvc, diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C index d8d52dac6..989f47979 100644 --- a/src/usr/intr/intrrp.C +++ b/src/usr/intr/intrrp.C @@ -48,7 +48,7 @@ using namespace INTR; trace_desc_t * g_trac_intr = NULL; -TRAC_INIT(&g_trac_intr, INTR_TRACE_NAME, 2 * 1024, TRACE::BUFFER_SLOW); +TRAC_INIT(&g_trac_intr, INTR_TRACE_NAME, KILOBYTE, TRACE::BUFFER_SLOW); /** * setup _start and handle barrier diff --git a/src/usr/mbox/mailboxsp.C b/src/usr/mbox/mailboxsp.C index 48af0de02..90e479dea 100644 --- a/src/usr/mbox/mailboxsp.C +++ b/src/usr/mbox/mailboxsp.C @@ -47,7 +47,8 @@ extern trace_desc_t * g_trac_mboxmsg; const char HBMBOXMSG_TRACE_NAME[] = "MBOXMSG"; trace_desc_t* g_trac_mboxmsg = NULL; // g_trac_mbox; -TRAC_INIT(&g_trac_mboxmsg, HBMBOXMSG_TRACE_NAME, 2048, TRACE::BUFFER_SLOW); +TRAC_INIT(&g_trac_mboxmsg, HBMBOXMSG_TRACE_NAME, + 2*KILOBYTE, TRACE::BUFFER_SLOW); diff --git a/src/usr/mbox/mboxdd.C b/src/usr/mbox/mboxdd.C index 10f9b336d..e78b03c90 100644 --- a/src/usr/mbox/mboxdd.C +++ b/src/usr/mbox/mboxdd.C @@ -32,7 +32,7 @@ trace_desc_t* g_trac_mbox = NULL; -TRAC_INIT(&g_trac_mbox, "MBOX", 4096, TRACE::BUFFER_SLOW); //4K +TRAC_INIT(&g_trac_mbox, "MBOX", KILOBYTE, TRACE::BUFFER_SLOW); //4K namespace MBOX diff --git a/src/usr/mvpd/mvpd.C b/src/usr/mvpd/mvpd.C index 6fe4276ff..b8b6f7412 100755 --- a/src/usr/mvpd/mvpd.C +++ b/src/usr/mvpd/mvpd.C @@ -61,7 +61,7 @@ const bool g_readPNOR = true; // Trace definitions // ---------------------------------------------- trace_desc_t* g_trac_mvpd = NULL; -TRAC_INIT( & g_trac_mvpd, "MVPD", 4096 ); +TRAC_INIT( & g_trac_mvpd, "MVPD", KILOBYTE); // ------------------------ // Macros for unit testing diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C index 567df83c9..94e98ba99 100644 --- a/src/usr/pnor/pnorrp.C +++ b/src/usr/pnor/pnorrp.C @@ -39,7 +39,7 @@ // Trace definition trace_desc_t* g_trac_pnor = NULL; -TRAC_INIT(&g_trac_pnor, "PNOR", 4096, TRACE::BUFFER_SLOW); //4K +TRAC_INIT(&g_trac_pnor, "PNOR", 2*KILOBYTE, TRACE::BUFFER_SLOW); //2K // Easy macro replace for unit testing //#define TRACUCOMP(args...) TRACFCOMP(args) diff --git a/src/usr/pore/poreve/poreveutil.C b/src/usr/pore/poreve/poreveutil.C index 3d8059061..db25bc8c2 100644 --- a/src/usr/pore/poreve/poreveutil.C +++ b/src/usr/pore/poreve/poreveutil.C @@ -1,26 +1,27 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/pore/poreve/poreveutil.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/pore/poreve/poreveutil.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 */ #include <trace/interface.H> +#include <limits.h> //****************************************************************************** // Trace descriptors @@ -31,5 +32,5 @@ trace_desc_t* g_poreErrTd = NULL; //****************************************************************************** // Global TracInit objects. Construction will initialize the trace buffer //****************************************************************************** -TRAC_INIT(&g_poreDbgTd, "PORE_D", 4096); -TRAC_INIT(&g_poreErrTd, "PORE_E", 4096); +TRAC_INIT(&g_poreDbgTd, "PORE_D", KILOBYTE); +TRAC_INIT(&g_poreErrTd, "PORE_E", KILOBYTE); diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C index 873e22df9..2ef1a3c68 100644 --- a/src/usr/runtime/populate_attributes.C +++ b/src/usr/runtime/populate_attributes.C @@ -41,7 +41,7 @@ //#include <arch/ppc.H> //for MAGIC_INSTRUCTION trace_desc_t *g_trac_runtime = NULL; -TRAC_INIT(&g_trac_runtime, "RUNTIME", 4096); +TRAC_INIT(&g_trac_runtime, "RUNTIME", KILOBYTE); /** * @brief Read a FAPI attribute and stick it into mainstore diff --git a/src/usr/scan/scandd.C b/src/usr/scan/scandd.C index 9058a069d..a96ddfeda 100644 --- a/src/usr/scan/scandd.C +++ b/src/usr/scan/scandd.C @@ -50,10 +50,10 @@ // Trace definitions // ---------------------------------------------- trace_desc_t* g_trac_scandd = NULL; -TRAC_INIT( & g_trac_scandd, "SCANDD", 4096 ); +TRAC_INIT( & g_trac_scandd, "SCANDD", KILOBYTE ); trace_desc_t* g_trac_scanddr = NULL; -TRAC_INIT( & g_trac_scanddr, "SCANDDR", 4096 ); +TRAC_INIT( & g_trac_scanddr, "SCANDDR", KILOBYTE ); // ---------------------------------------------- @@ -319,7 +319,7 @@ errlHndl_t scanDoScan( DeviceFW::OperationType i_opType, } // If this is a centaur chip need to read the header - // data area first before the header Write. + // data area first before the header Write. if (l_isCentaur) { // Do a scom write to the scan type select register @@ -351,7 +351,7 @@ errlHndl_t scanDoScan( DeviceFW::OperationType i_opType, l_buffer, op_size, DEVICE_SCOM_ADDRESS(l_headerDataAddr)); - + TRACDCOMP( g_trac_scandd,"SCAN:Headr PUTSCOM %.8x = %.8x %.8x",l_headerDataAddr , l_buffer[0], l_buffer[1]); if(l_err) @@ -388,7 +388,7 @@ errlHndl_t scanDoScan( DeviceFW::OperationType i_opType, uint32_t *temp_buffer = (uint32_t *)io_buffer; // Need to increment the buffer by 1 to get past word0 which is the - // header that we wrote to already above. + // header that we wrote to already above. temp_buffer++; // decrement the number of words to read by 1 because read header above l_wordsInChain--; @@ -500,7 +500,7 @@ errlHndl_t scanDoScan( DeviceFW::OperationType i_opType, // If this is a scan Write if ( DeviceFW::WRITE == i_opType ) { - // If this is not a Centaur chip then do the setpulse here. + // If this is not a Centaur chip then do the setpulse here. if (!l_isCentaur) { // If this is the last iteration and set pulse is requested @@ -612,7 +612,7 @@ errlHndl_t scanDoScan( DeviceFW::OperationType i_opType, break; } - // If header check on.. then need to verify the data. + // If header check on.. then need to verify the data. if (!(i_flag & SCAN::NO_HEADER_CHECK)) { // If the header data did not match.. diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C index 3f3a895d0..7b5ecaf27 100644 --- a/src/usr/scom/scom.C +++ b/src/usr/scom/scom.C @@ -41,7 +41,7 @@ // Trace definition trace_desc_t* g_trac_scom = NULL; -TRAC_INIT(&g_trac_scom, "SCOM", 1024, TRACE::BUFFER_SLOW); //1K +TRAC_INIT(&g_trac_scom, "SCOM", KILOBYTE, TRACE::BUFFER_SLOW); //1K namespace SCOM diff --git a/src/usr/spd/spd.C b/src/usr/spd/spd.C index dc2fc3adc..e6403ef07 100755 --- a/src/usr/spd/spd.C +++ b/src/usr/spd/spd.C @@ -62,7 +62,7 @@ const bool g_usePNOR = true; // Trace definitions // ---------------------------------------------- trace_desc_t* g_trac_spd = NULL; -TRAC_INIT( & g_trac_spd, "SPD", 4096 ); +TRAC_INIT( & g_trac_spd, "SPD", KILOBYTE ); // ------------------------ // Macros for unit testing diff --git a/src/usr/targeting/common/targetservice.C b/src/usr/targeting/common/targetservice.C index 700c7fc35..e061b4174 100644 --- a/src/usr/targeting/common/targetservice.C +++ b/src/usr/targeting/common/targetservice.C @@ -75,7 +75,7 @@ TARGETING::TargetService& targetService() TARG_TD_t g_trac_targeting = {0}; #ifdef __HOSTBOOT_MODULE -TRAC_INIT(&g_trac_targeting, "TARG", 4096, TRACE::BUFFER_SLOW); +TRAC_INIT(&g_trac_targeting, "TARG", 2*KILOBYTE, TRACE::BUFFER_SLOW); #else TRAC_INIT(&g_trac_targeting, "TARG", 4096); #endif diff --git a/src/usr/trace/assert.C b/src/usr/trace/assert.C index 35510ea93..d1d909b02 100644 --- a/src/usr/trace/assert.C +++ b/src/usr/trace/assert.C @@ -29,12 +29,13 @@ */ #include <assert.h> #include <trace/interface.H> +#include <limits.h> namespace TRACE { /** Unique trace buffer for assert statements. */ trace_desc_t* g_assertTraceBuffer; - TRAC_INIT(&g_assertTraceBuffer, "ASSERT", 4096, TRACE::BUFFER_SLOW); + TRAC_INIT(&g_assertTraceBuffer, "ASSERT", KILOBYTE, TRACE::BUFFER_SLOW); /** @fn assertTrace * @brief Hook to perform a trace on an assert failure. diff --git a/src/usr/util/utilbase.C b/src/usr/util/utilbase.C index a510e4407..48c2c4595 100644 --- a/src/usr/util/utilbase.C +++ b/src/usr/util/utilbase.C @@ -1,29 +1,30 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/util/utilbase.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 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 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/util/utilbase.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 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 */ #include "utilbase.H" +#include <limits.h> namespace Util { trace_desc_t* g_util_trace; - TRAC_INIT(&g_util_trace, "UTIL", 4096); + TRAC_INIT(&g_util_trace, "UTIL", KILOBYTE); }; diff --git a/src/usr/vfs/vfsrp.C b/src/usr/vfs/vfsrp.C index 1d4d7985b..dd6f9617e 100644 --- a/src/usr/vfs/vfsrp.C +++ b/src/usr/vfs/vfsrp.C @@ -43,7 +43,7 @@ using namespace VFS; // Trace definitions trace_desc_t * g_trac_vfs = NULL; -TRAC_INIT(&g_trac_vfs, VFS_COMP_NAME, 1024, TRACE::BUFFER_SLOW); +TRAC_INIT(&g_trac_vfs, VFS_COMP_NAME, KILOBYTE, TRACE::BUFFER_SLOW); /** * setup _start and handle barrier diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C index f97639dd0..59c65ad20 100644 --- a/src/usr/xscom/xscom.C +++ b/src/usr/xscom/xscom.C @@ -46,7 +46,7 @@ // Trace definition trace_desc_t* g_trac_xscom = NULL; -TRAC_INIT(&g_trac_xscom, "XSCOM", 4096, TRACE::BUFFER_SLOW); +TRAC_INIT(&g_trac_xscom, "XSCOM", 2*KILOBYTE, TRACE::BUFFER_SLOW); namespace XSCOM { |
