VirtualBox

Changeset 36830 in vbox


Ignore:
Timestamp:
Apr 24, 2011 1:45:43 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
71389
Message:

iprt/log.h: Check the RTLOGFLAGS_DISABLED in a few places.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/iprt/log.h

    r36408 r36830  
    532532#ifdef LOG_ENABLED
    533533# if defined(LOG_USE_C99)
    534 #  define _LogRemoveParentheseis(...)                   __VA_ARGS__
    535 #  define _LogIt(pvInst, fFlags, iGroup, ...)           RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
    536 #  define LogIt(pvInst, fFlags, iGroup, fmtargs)        _LogIt(pvInst, fFlags, iGroup, _LogRemoveParentheseis fmtargs)
    537 #  define _LogItAlways(pvInst, fFlags, iGroup, ...)     RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, ~0U, __VA_ARGS__)
    538 #  define LogItAlways(pvInst, fFlags, iGroup, fmtargs)  _LogItAlways(pvInst, fFlags, iGroup, _LogRemoveParentheseis fmtargs)
     534#  define _LogRemoveParentheseis(...)                           __VA_ARGS__
     535#  define _LogIt(a_pvInst, a_fFlags, a_iGroup, ...)             RTLogLoggerEx((PRTLOGGER)a_pvInst, a_fFlags, a_iGroup, __VA_ARGS__)
     536#  define LogIt(a_pvInst, a_fFlags, a_iGroup, fmtargs)          _LogIt(a_pvInst, a_fFlags, a_iGroup, _LogRemoveParentheseis fmtargs)
     537#  define _LogItAlways(a_pvInst, a_fFlags, a_iGroup, ...)       RTLogLoggerEx((PRTLOGGER)a_pvInst, a_fFlags, ~0U, __VA_ARGS__)
     538#  define LogItAlways(a_pvInst, a_fFlags, a_iGroup, fmtargs)    _LogItAlways(a_pvInst, a_fFlags, a_iGroup, _LogRemoveParentheseis fmtargs)
    539539        /** @todo invent a flag or something for skipping the group check so we can pass iGroup. LogItAlways. */
    540540# else
    541 #  define LogIt(pvInst, fFlags, iGroup, fmtargs) \
     541#  define LogIt(a_pvInst, a_fFlags, a_iGroup, fmtargs) \
    542542    do \
    543543    { \
    544         register PRTLOGGER LogIt_pLogger = (PRTLOGGER)(pvInst) ? (PRTLOGGER)(pvInst) : RTLogDefaultInstance(); \
    545         if (LogIt_pLogger) \
     544        register PRTLOGGER LogIt_pLogger = (PRTLOGGER)(a_pvInst) ? (PRTLOGGER)(a_pvInst) : RTLogDefaultInstance(); \
     545        if (    LogIt_pLogger \
     546            && !(LogIt_pLogger->fFlags & RTLOGFLAGS_DISABLED)) \
    546547        { \
    547             register unsigned LogIt_fFlags = LogIt_pLogger->afGroups[(unsigned)(iGroup) < LogIt_pLogger->cGroups ? (unsigned)(iGroup) : 0]; \
    548             if ((LogIt_fFlags & ((fFlags) | RTLOGGRPFLAGS_ENABLED)) == ((fFlags) | RTLOGGRPFLAGS_ENABLED)) \
     548            register unsigned LogIt_fFlags = LogIt_pLogger->afGroups[(unsigned)(a_iGroup) < LogIt_pLogger->cGroups ? (unsigned)(a_iGroup) : 0]; \
     549            if ((LogIt_fFlags & ((a_fFlags) | RTLOGGRPFLAGS_ENABLED)) == ((a_fFlags) | RTLOGGRPFLAGS_ENABLED)) \
    549550                LogIt_pLogger->pfnLogger fmtargs; \
    550551        } \
    551552    } while (0)
    552 #  define LogItAlways(pvInst, fFlags, iGroup, fmtargs) \
     553#  define LogItAlways(a_pvInst, a_fFlags, a_iGroup, fmtargs) \
    553554    do \
    554555    { \
    555         register PRTLOGGER LogIt_pLogger = (PRTLOGGER)(pvInst) ? (PRTLOGGER)(pvInst) : RTLogDefaultInstance(); \
    556         if (LogIt_pLogger) \
     556        register PRTLOGGER LogIt_pLogger = (PRTLOGGER)(a_pvInst) ? (PRTLOGGER)(a_pvInst) : RTLogDefaultInstance(); \
     557        if (   LogIt_pLogger \
     558            && !(LogIt_pLogger->fFlags & RTLOGFLAGS_DISABLED)) \
    557559            LogIt_pLogger->pfnLogger fmtargs; \
    558560    } while (0)
    559561# endif
    560562#else
    561 # define LogIt(pvInst, fFlags, iGroup, fmtargs)         do { } while (0)
    562 # define LogItAlways(pvInst, fFlags, iGroup, fmtargs)  do { } while (0)
     563# define LogIt(a_pvInst, a_fFlags, a_iGroup, fmtargs)       do { } while (0)
     564# define LogItAlways(a_pvInst, a_fFlags, a_iGroup, fmtargs) do { } while (0)
    563565# if defined(LOG_USE_C99)
    564 #  define _LogRemoveParentheseis(...)                   __VA_ARGS__
    565 #  define _LogIt(pvInst, fFlags, iGroup, ...)           do { } while (0)
    566 #  define _LogItAlways(pvInst, fFlags, iGroup, ...)     do { } while (0)
     566#  define _LogRemoveParentheseis(...)                       __VA_ARGS__
     567#  define _LogIt(a_pvInst, a_fFlags, a_iGroup, ...)         do { } while (0)
     568#  define _LogItAlways(a_pvInst, a_fFlags, a_iGroup, ...)   do { } while (0)
    567569# endif
    568570#endif
    … …  
    826828 */
    827829#ifdef LOG_ENABLED
    828 # define LogIsItEnabled(pvInst, fFlags, iGroup) \
    829     LogIsItEnabledInternal((pvInst), (unsigned)(iGroup), (unsigned)(fFlags))
    830 #else
    831 # define LogIsItEnabled(pvInst, fFlags, iGroup) (false)
     830# define LogIsItEnabled(a_pvInst, a_fFlags, a_iGroup) \
     831    LogIsItEnabledInternal((a_pvInst), (unsigned)(a_iGroup), (unsigned)(a_fFlags))
     832#else
     833# define LogIsItEnabled(a_pvInst, a_fFlags, a_iGroup) (false)
    832834#endif
    833835
    … …  
    940942#ifdef RTLOG_REL_ENABLED
    941943# if defined(LOG_USE_C99)
    942 #  define _LogRelRemoveParentheseis(...)                __VA_ARGS__
    943 #  define _LogRelIt(pvInst, fFlags, iGroup, ...) \
     944#  define _LogRelRemoveParentheseis(...)                    __VA_ARGS__
     945#  define _LogRelIt(a_pvInst, a_fFlags, a_iGroup, ...) \
    944946    do \
    945947    { \
    946         PRTLOGGER LogRelIt_pLogger = (PRTLOGGER)(pvInst) ? (PRTLOGGER)(pvInst) : RTLogRelDefaultInstance(); \
    947         if (LogRelIt_pLogger) \
    948             RTLogLoggerEx(LogRelIt_pLogger, fFlags, iGroup, __VA_ARGS__); \
    949         _LogIt(LOG_INSTANCE, fFlags, iGroup, __VA_ARGS__); \
     948        PRTLOGGER LogRelIt_pLogger = (PRTLOGGER)(a_pvInst) ? (PRTLOGGER)(a_pvInst) : RTLogRelDefaultInstance(); \
     949        if (   LogRelIt_pLogger \
     950            && !(LogRelIt_pLogger->fFlags & RTLOGFLAGS_DISABLED)) \
     951            RTLogLoggerEx(LogRelIt_pLogger, a_fFlags, a_iGroup, __VA_ARGS__); \
     952        _LogIt(LOG_INSTANCE, a_fFlags, a_iGroup, __VA_ARGS__); \
    950953    } while (0)
    951 #  define LogRelIt(pvInst, fFlags, iGroup, fmtargs)     _LogRelIt(pvInst, fFlags, iGroup, _LogRelRemoveParentheseis fmtargs)
     954#  define LogRelIt(a_pvInst, a_fFlags, a_iGroup, fmtargs)   _LogRelIt(a_pvInst, a_fFlags, a_iGroup, _LogRelRemoveParentheseis fmtargs)
    952955# else
    953 #  define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
     956#  define LogRelIt(a_pvInst, a_fFlags, a_iGroup, fmtargs) \
    954957   do \
    955958   { \
    956        PRTLOGGER LogRelIt_pLogger = (PRTLOGGER)(pvInst) ? (PRTLOGGER)(pvInst) : RTLogRelDefaultInstance(); \
    957        if (LogRelIt_pLogger) \
     959       PRTLOGGER LogRelIt_pLogger = (PRTLOGGER)(a_pvInst) ? (PRTLOGGER)(a_pvInst) : RTLogRelDefaultInstance(); \
     960       if (   LogRelIt_pLogger \
     961           && !(LogRelIt_pLogger->fFlags & RTLOGFLAGS_DISABLED)) \
    958962       { \
    959            unsigned LogIt_fFlags = LogRelIt_pLogger->afGroups[(unsigned)(iGroup) < LogRelIt_pLogger->cGroups ? (unsigned)(iGroup) : 0]; \
    960            if ((LogIt_fFlags & ((fFlags) | RTLOGGRPFLAGS_ENABLED)) == ((fFlags) | RTLOGGRPFLAGS_ENABLED)) \
     963           unsigned LogIt_fFlags = LogRelIt_pLogger->afGroups[(unsigned)(a_iGroup) < LogRelIt_pLogger->cGroups ? (unsigned)(a_iGroup) : 0]; \
     964           if ((LogIt_fFlags & ((a_fFlags) | RTLOGGRPFLAGS_ENABLED)) == ((a_fFlags) | RTLOGGRPFLAGS_ENABLED)) \
    961965               LogRelIt_pLogger->pfnLogger fmtargs; \
    962966       } \
    963        LogIt(LOG_INSTANCE, fFlags, iGroup, fmtargs); \
     967       LogIt(LOG_INSTANCE, a_fFlags, a_iGroup, fmtargs); \
    964968  } while (0)
    965969# endif
    966970#else   /* !RTLOG_REL_ENABLED */
    967 # define LogRelIt(pvInst, fFlags, iGroup, fmtargs)      do { } while (0)
     971# define LogRelIt(a_pvInst, a_fFlags, a_iGroup, fmtargs)    do { } while (0)
    968972# if defined(LOG_USE_C99)
    969 #  define _LogRelRemoveParentheseis(...)                __VA_ARGS__
    970 #  define _LogRelIt(pvInst, fFlags, iGroup, ...)        do { } while (0)
     973#  define _LogRelRemoveParentheseis(...)                    __VA_ARGS__
     974#  define _LogRelIt(a_pvInst, a_fFlags, a_iGroup, ...)      do { } while (0)
    971975# endif
    972976#endif  /* !RTLOG_REL_ENABLED */
    … …  
    11041108 * Checks whether the specified logging group is enabled or not.
    11051109 */
    1106 #define LogRelIsItEnabled(pvInst, fFlags, iGroup) \
    1107     LogRelIsItEnabledInternal((pvInst), (unsigned)(iGroup), (unsigned)(fFlags))
     1110#define LogRelIsItEnabled(a_pvInst, a_fFlags, a_iGroup) \
     1111    LogRelIsItEnabledInternal((a_pvInst), (unsigned)(a_iGroup), (unsigned)(a_fFlags))
    11081112
    11091113/** @def LogRelIsEnabled
    … …  
    11671171{
    11681172    register PRTLOGGER pLogger = (PRTLOGGER)pvInst ? (PRTLOGGER)pvInst : RTLogRelDefaultInstance();
    1169     if (pLogger)
     1173    if (   pLogger
     1174        && !(pLogger->fFlags & RTLOGFLAGS_DISABLED))
    11701175    {
    11711176        register unsigned fGrpFlags = pLogger->afGroups[(unsigned)iGroup < pLogger->cGroups ? (unsigned)iGroup : 0];
    … …  
    13411346# if defined(LOG_USE_C99)
    13421347#  undef _LogIt
    1343 #  define _LogIt(pvInst, fFlags, iGroup, ...)  LogBackdoor((__VA_ARGS__))
     1348#  define _LogIt(a_pvInst, a_fFlags, a_iGroup, ...)  LogBackdoor((__VA_ARGS__))
    13441349# endif
    13451350#endif
    … …  
    13971402{
    13981403    register PRTLOGGER pLogger = (PRTLOGGER)pvInst ? (PRTLOGGER)pvInst : RTLogDefaultInstance();
    1399     if (pLogger)
     1404    if (   pLogger
     1405        && !(pLogger->fFlags & RTLOGFLAGS_DISABLED))
    14001406    {
    14011407        register unsigned fGrpFlags = pLogger->afGroups[(unsigned)iGroup < pLogger->cGroups ? (unsigned)iGroup : 0];
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette