From 7869d9fdcb24a39763358ac20cada55c5ea2ae5b Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 24 May 2011 14:00:53 -0500 Subject: Hide trace singleton within trace module. Change-Id: I3d415ddf103f93833d8f2c5c4a0de2ef3efcd4e2 Reviewed-on: http://gfwr801.rchland.ibm.com:8080/gerrit/97 Reviewed-by: Andrew J. Geissler Reviewed-by: A. Patrick Williams III Tested-by: Jenkins Server --- src/include/usr/trace/interface.H | 10 +++++----- src/include/usr/trace/trace.H | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/include') diff --git a/src/include/usr/trace/interface.H b/src/include/usr/trace/interface.H index c8be8c3b5..6222f3cfa 100644 --- a/src/include/usr/trace/interface.H +++ b/src/include/usr/trace/interface.H @@ -99,7 +99,7 @@ const uint32_t TRACE_FIELD = 0; //Indicates trace is field /* a macro w/o the param number suffix. number is calculated from printf string */ #define TRACDCOMP(des,printf_string,args...) \ - TRACE::theTrace::instance().trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_DEBUG, ##args) + TRACE::Trace::getTheInstance().trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_DEBUG, ##args) /** * @fn void TRACDBIN(des,descString,address,length) @@ -117,7 +117,7 @@ const uint32_t TRACE_FIELD = 0; //Indicates trace is field */ #define TRACDBIN(des,printf_string,address,len) \ - TRACE::theTrace::instance().trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ + TRACE::Trace::getTheInstance().trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ __LINE__, \ address, \ len, \ @@ -141,7 +141,7 @@ const uint32_t TRACE_FIELD = 0; //Indicates trace is field /* a macro w/o the param number suffix. number is calculated from printf string */ #define TRACFCOMP(des,printf_string,args...) \ - TRACE::theTrace::instance().trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_FIELD, ##args) + TRACE::Trace::getTheInstance().trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_FIELD, ##args) /** @@ -159,7 +159,7 @@ const uint32_t TRACE_FIELD = 0; //Indicates trace is field * @return void */ #define TRACFBIN(des,printf_string,address,len) \ - TRACE::theTrace::instance().trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ + TRACE::Trace::getTheInstance().trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ __LINE__, \ address, \ len, \ @@ -182,7 +182,7 @@ const uint32_t TRACE_FIELD = 0; //Indicates trace is field * @return void */ #define TRAC_INIT_BUFFER(des,comp_name, bufferSize) \ - TRACE::theTrace::instance().initBuffer((des), (comp_name), (bufferSize)) + TRACE::Trace::getTheInstance().initBuffer((des), (comp_name), (bufferSize)) /******************************************************************************* TRAC_INIT: Class for creating trace descriptor object. diff --git a/src/include/usr/trace/trace.H b/src/include/usr/trace/trace.H index 4ccaa80ff..722d31929 100644 --- a/src/include/usr/trace/trace.H +++ b/src/include/usr/trace/trace.H @@ -115,6 +115,10 @@ class Trace { public: + /** + * @brief Get singleton instance of this class. + */ + static Trace& getTheInstance(); /** * @brief Initialize a trace buffer -- cgit v1.2.3