diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2014-05-19 21:44:46 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-06-30 19:31:30 -0500 |
| commit | 3b65dfb45938d0e864749fe97f044c275f56f3db (patch) | |
| tree | 2de41582ee15f85276a0e83002e1ae5bba622bad /src/include/usr/targeting/common | |
| parent | 682fbef52aa03bf5920ecc422b9bdb4546f31143 (diff) | |
| download | blackbird-hostboot-3b65dfb45938d0e864749fe97f044c275f56f3db.tar.gz blackbird-hostboot-3b65dfb45938d0e864749fe97f044c275f56f3db.zip | |
Merge HWAS commits from Stradale
These changes are to reduce the amount of trace entries, disable garding,
and to print the model type.
Change-Id: Iff1cd4995367c7bfad621f41a36e0080007ec6ef
RTC: 97496
Origin: Google Shared Technology
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11172
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/include/usr/targeting/common')
| -rw-r--r-- | src/include/usr/targeting/common/trace.H | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/include/usr/targeting/common/trace.H b/src/include/usr/targeting/common/trace.H index b30e80085..bf42dd625 100644 --- a/src/include/usr/targeting/common/trace.H +++ b/src/include/usr/targeting/common/trace.H @@ -5,7 +5,10 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] Google Inc. */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -37,21 +40,35 @@ // Other includes #include <targeting/adapters/traceadapter.H> +#ifdef __HOSTBOOT_MODULE +#include <config.h> +#endif #define TARG_LOC TARG_NAMESPACE TARG_CLASS TARG_FN ": " #define TARG_ERR_LOC ERR_MRK " " TARG_LOC #define TARG_TAG "[TARG]" + +#ifdef CONFIG_TARG_TRACE_AS_DEBUG +#define TARG_ENTER(args...) \ + TRACDCOMP(TARGETING::g_trac_targeting,TARG_TAG " " \ + ENTER_MRK " " TARG_NAMESPACE \ + TARG_CLASS TARG_FN " " args) +#define TARG_EXIT(args...) \ + TRACDCOMP(TARGETING::g_trac_targeting,TARG_TAG " " \ + EXIT_MRK " " TARG_NAMESPACE \ + TARG_CLASS TARG_FN " " args) +#else #define TARG_ENTER(args...) \ TRACFCOMP(TARGETING::g_trac_targeting,TARG_TAG " " \ ENTER_MRK " " TARG_NAMESPACE \ TARG_CLASS TARG_FN " " args) - #define TARG_EXIT(args...) \ TRACFCOMP(TARGETING::g_trac_targeting,TARG_TAG " " \ EXIT_MRK " " TARG_NAMESPACE \ TARG_CLASS TARG_FN " " args) +#endif #define TARG_ERR(args...) \ TRACFCOMP(TARGETING::g_trac_targeting,TARG_TAG " " ERR_MRK " " args) |
