--- a/kernel/eka/debug/securityServer/inc/rm_debug_logging.h Mon Mar 15 12:45:50 2010 +0200
+++ b/kernel/eka/debug/securityServer/inc/rm_debug_logging.h Wed Mar 31 23:38:45 2010 +0300
@@ -34,30 +34,48 @@
#include <kernel/kernel.h>
#include <nkern/nk_trace.h>
- #define LOG_MSG( a ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a ))
- #define LOG_MSG2( a, b ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b ))
- #define LOG_MSG3( a, b, c ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c ))
- #define LOG_MSG4( a, b, c, d ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c, d ))
- #define LOG_MSG5( a, b, c, d, e ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c, d, e ))
+ #define LOG_MSG(args...) __KTRACE_OPT(KDEBUGGER, Kern::Printf(args))
+ #define LOG_ENTRY() __KTRACE_OPT(KDEBUGGER, Kern::Printf("+%s", __PRETTY_FUNCTION__))
+ #define LOG_EXIT() __KTRACE_OPT(KDEBUGGER, Kern::Printf("-%s", __PRETTY_FUNCTION__))
+ #define LOG_ARGS(fmt, args...) __KTRACE_OPT(KDEBUGGER, Kern::Printf("+%s " fmt, __PRETTY_FUNCTION__, args))
+ #define LOG_RETURN(x) __KTRACE_OPT(KDEBUGGER, Kern::Printf("Returning %d from [%s]", x, __PRETTY_FUNCTION__)
+
+ // These kept for compatability
+ #define LOG_MSG2( a, b ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b ))
+ #define LOG_MSG3( a, b, c ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c ))
+ #define LOG_MSG4( a, b, c, d ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c, d ))
+ #define LOG_MSG5( a, b, c, d, e ) __KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c, d, e ))
#else
#include <e32debug.h>
- #define LOG_MSG( a ) RDebug::Printf( a )
- #define LOG_MSG2( a, b ) RDebug::Printf( a, b )
- #define LOG_MSG3( a, b, c ) RDebug::Printf( a, b, c )
- #define LOG_MSG4( a, b, c, d ) RDebug::Printf( a, b, c, d )
- #define LOG_MSG5( a, b, c, d, e ) RDebug::Printf( a, b, c, d, e )
+ #define LOG_MSG(args...) RDebug::Printf(args)
+ #define LOG_DES(args...) RDebug::Print(args) // For wide descriptors
+ #define LOG_ENTRY() RDebug::Printf("+%s", __PRETTY_FUNCTION__)
+ #define LOG_EXIT() RDebug::Printf("-%s", __PRETTY_FUNCTION__)
+ #define LOG_ARGS(fmt, args...) RDebug::Printf("+%s " fmt, __PRETTY_FUNCTION__, args)
+ #define LOG_RETURN(x) RDebug::Printf("Returning %d from [%s]", x, __PRETTY_FUNCTION__)
+
+ #define LOG_MSG2( a, b ) RDebug::Printf( a, b )
+ #define LOG_MSG3( a, b, c ) RDebug::Printf( a, b, c )
+ #define LOG_MSG4( a, b, c, d ) RDebug::Printf( a, b, c, d )
+ #define LOG_MSG5( a, b, c, d, e ) RDebug::Printf( a, b, c, d, e )
#endif
#else
- #define LOG_MSG( a )
- #define LOG_MSG2( a, b )
- #define LOG_MSG3( a, b, c )
- #define LOG_MSG4( a, b, c, d )
- #define LOG_MSG5( a, b, c, d, e )
+ #define LOG_MSG(args...)
+ #define LOG_DES(args...)
+ #define LOG_ENTRY()
+ #define LOG_EXIT()
+ #define LOG_ARGS(fmt, args...)
+ #define LOG_RETURN(x)
+
+ #define LOG_MSG2( a, b )
+ #define LOG_MSG3( a, b, c )
+ #define LOG_MSG4( a, b, c, d )
+ #define LOG_MSG5( a, b, c, d, e )
#endif