diff options
Diffstat (limited to 'src/include/usr/trace')
-rw-r--r-- | src/include/usr/trace/interface.H | 8 | ||||
-rw-r--r-- | src/include/usr/trace/trace.H | 44 |
2 files changed, 46 insertions, 6 deletions
diff --git a/src/include/usr/trace/interface.H b/src/include/usr/trace/interface.H index 5679f7420..0f7fdc9b2 100644 --- a/src/include/usr/trace/interface.H +++ b/src/include/usr/trace/interface.H @@ -105,7 +105,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::Trace::getTheInstance().trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_DEBUG, ##args) + TRACE::Trace::trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_DEBUG, ##args) /** @@ -124,7 +124,7 @@ const uint32_t TRACE_FIELD = 0; //Indicates trace is field */ #define TRACDBIN(des,printf_string,address,len) \ - TRACE::Trace::getTheInstance().trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ + TRACE::Trace::trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ __LINE__, \ address, \ len, \ @@ -148,7 +148,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::Trace::getTheInstance().trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_FIELD, ##args) + TRACE::Trace::trace_adal_write_all((des),__ALL_HASH(printf_string,-1),__LINE__,TRACE_FIELD, ##args) /** @@ -166,7 +166,7 @@ const uint32_t TRACE_FIELD = 0; //Indicates trace is field * @return void */ #define TRACFBIN(des,printf_string,address,len) \ - TRACE::Trace::getTheInstance().trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ + TRACE::Trace::trace_adal_write_bin(des,__ALL_HASH(printf_string,0), \ __LINE__, \ address, \ len, \ diff --git a/src/include/usr/trace/trace.H b/src/include/usr/trace/trace.H index f30f2c0a3..817e1c02f 100644 --- a/src/include/usr/trace/trace.H +++ b/src/include/usr/trace/trace.H @@ -16,6 +16,7 @@ #include <trace/interface.H> #include <util/singleton.H> #include <sys/sync.h> +#include <stdarg.h> /******************************************************************************/ // Globals/Constants @@ -148,12 +149,13 @@ public: * * @return void */ - void trace_adal_write_all(trace_desc_t *io_td, + static void trace_adal_write_all(trace_desc_t *io_td, const trace_hash_val i_hash, const char * i_fmt, const uint32_t i_line, const int32_t i_type, ...); + /** * @brief Write binary data out to trace buffer * @@ -169,7 +171,7 @@ public: * * @return void */ - void trace_adal_write_bin(trace_desc_t * io_td, + static void trace_adal_write_bin(trace_desc_t * io_td, const trace_hash_val i_hash, const uint32_t i_line, const void *i_ptr, @@ -292,6 +294,44 @@ private: Trace(const Trace & right); Trace & operator=(const Trace & right); + /** + * @brief Write component trace out to input buffer + * + * @param [in,out] io_td Trace descriptor of buffer to write to. + * @param [in] i_hash Descriptive string hash value + * @param [in] i_fmt Formatting string + * @param [in] i_line Line number trace was done at + * @param [in] i_type Type of trace (TRACE_DEBUG, TRACE_FIELD) + * @param [in] i_args Variable argument list + * + * @return void + */ + void _trace_adal_write_all(trace_desc_t *io_td, + const trace_hash_val i_hash, + const char * i_fmt, + const uint32_t i_line, + const int32_t i_type, va_list i_args); + + /** + * @brief Write binary data out to trace buffer + * + * @param [in,out] io_td Trace descriptor of buffer to write to. + * @param [in] i_hash Descriptive string hash value + * @param [in] i_line Line number trace was done at + * @param [in] i_ptr Pointer to binary data + * @param [in] i_size Size of binary data + * @param [in] i_type Type of trace (TRACE_DEBUG, TRACE_FIELD) + * + * @return void + */ + void _trace_adal_write_bin(trace_desc_t * io_td, + const trace_hash_val i_hash, + const uint32_t i_line, + const void *i_ptr, + const uint32_t i_size, + const int32_t i_type); + + // Global Mutex mutex_t iv_trac_mutex; |