VirtualBox

Changeset 55988 in vbox for trunk/src


Ignore:
Timestamp:
May 20, 2015 11:24:44 PM (10 years ago)
Author:
vboxsync
Message:

iprt/log.h,SUPDrv: Replaced the 'personal' logging groups with 6 more generic logging levels (7 thru 12) and a 'Warn' level. The 'Warn' level is enabled by 'group.e' together with level 1 logging. Modified the new RTLog[Rel][Get]DefaultInstanceEx functions to only take one 32-bit parameter to minimize call setup time and size. Major support driver version bump. LogAleksey=Log7, LogBird=Log8, LogSunlover=Log9, none of the other personal macros was used. Log*Warning got renamed to Log1*Warning so as to not confuse it with the LogWarn/LogRelWarn macros.

Location:
trunk/src
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c

    r55980 r55988  
    331331    return g_VBoxGuest->_RTLogDefaultInstance();
    332332}
    333 RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
    334 {
    335     return g_VBoxGuest->_RTLogDefaultInstanceEx(fFlags, iGroup);
     333RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlagsAndGroup)
     334{
     335    return g_VBoxGuest->_RTLogDefaultInstanceEx(fFlagsAndGroup);
    336336}
    337337RTDECL(PRTLOGGER) RTLogRelGetDefaultInstance(void)

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h

    r55980 r55988  
    180180    void (*_RTMemTmpFree)(void *pv);
    181181    PRTLOGGER(*_RTLogDefaultInstance)(void);
    182     PRTLOGGER(*_RTLogDefaultInstanceEx)(uint32_t fFlags, uint32_t iGroup);
     182    PRTLOGGER(*_RTLogDefaultInstanceEx)(uint32_t fFlagsAndGroup);
    183183    PRTLOGGER(*_RTLogRelGetDefaultInstance)(void);
    184     PRTLOGGER(*_RTLogRelGetDefaultInstanceEx)(uint32_t fFlags, uint32_t iGroup);
     184    PRTLOGGER(*_RTLogRelGetDefaultInstanceEx)(uint32_t fFlagsAndGroup);
    185185    int (*_RTErrConvertToErrno)(int iErr);
    186186    int (*_VbgdCommonIoCtl)(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp

    r55981 r55988  
    6565}
    6666
    67 RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
     67RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlagsAndGroup)
    6868{
    69     NOREF(fFlags); NOREF(iGroup);
     69    NOREF(fFlagsAndGroup);
    7070    return NULL;
    7171}
    … …  
    7676}
    7777
    78 RTDECL(PRTLOGGER) RTLogRelGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
     78RTDECL(PRTLOGGER) RTLogRelGetDefaultInstanceEx(uint32_t fFlagsAndGroup)
    7979{
    80     NOREF(fFlags); NOREF(iGroup);
     80    NOREF(fFlagsAndGroup);
    8181    return NULL;
    8282}

  • trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

    r55977 r55988  
    23432343                    default:
    23442344                    {
    2345                         LogBird(("VBoxSDL: Unknown SDL event %d (pre)\n", event.type));
     2345                        Log8(("VBoxSDL: Unknown SDL event %d (pre)\n", event.type));
    23462346                        break;
    23472347                    }
    … …  
    29052905            default:
    29062906            {
    2907                 LogBird(("unknown SDL event %d\n", event.type));
     2907                Log8(("unknown SDL event %d\n", event.type));
    29082908                break;
    29092909            }

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r55915 r55988  
    32203220            if (!ok)
    32213221            {
    3222                 LogWarningFunc (("Couldn't switch to desktop=%08X\n",
    3223                                  desktop));
     3222                Log1WarningFunc(("Couldn't switch to desktop=%08X\n", desktop));
    32243223                result = false;
    32253224            }
    … …  
    32283227        else
    32293228        {
    3230             LogWarningFunc (("Couldn't find a desktop ID for aWId=%08X\n",
    3231                              aWId));
     3229            Log1WarningFunc(("Couldn't find a desktop ID for aWId=%08X\n", aWId));
    32323230            result = false;
    32333231        }
    … …  
    32493247
    32503248    if (!result)
    3251         LogWarningFunc (("Couldn't activate aWId=%08X\n", aWId));
     3249        Log1WarningFunc(("Couldn't activate aWId=%08X\n", aWId));
    32523250
    32533251    return result;

  • trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

    r55980 r55988  
    233233    { "RTLogLoggerExV",                         (void *)RTLogLoggerExV },
    234234    { "RTLogPrintfV",                           (void *)RTLogPrintfV },
    235     { "RTLogRelDefaultInstance",                (void *)RTLogRelGetDefaultInstance },
    236235    { "RTLogRelGetDefaultInstance",             (void *)RTLogRelGetDefaultInstance },
    237236    { "RTLogRelGetDefaultInstanceEx",           (void *)RTLogRelGetDefaultInstanceEx },

  • trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

    r55980 r55988  
    213213 *
    214214 * @todo Pending work on next major version change:
    215  *          - Remove RTLogRelDefaultInstance export from SUPDrv.cpp.
    216  */
    217 #define SUPDRV_IOC_VERSION                              0x00220001
     215 *          - nothing.
     216 */
     217#define SUPDRV_IOC_VERSION                              0x00230000
    218218
    219219/** SUP_IOCTL_COOKIE. */

  • trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

    r55980 r55988  
    279279        strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
    280280        CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
    281         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00200000
    282                                    ? 0x00200001
     281        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00230000
     282                                   ? 0x00230000
    283283                                   : SUPDRV_IOC_VERSION & 0xffff0000;
    284284        CookieReq.u.In.u32MinVersion = uMinVersion;

  • trunk/src/VBox/Main/src-all/SharedFolderImpl.cpp

    r55401 r55988  
    364364                                       vrc);
    365365
    366     LogWarningThisFunc(("m.lastAccessError=\"%s\"\n", m->strLastAccessError.c_str()));
     366    Log1WarningThisFunc(("m.lastAccessError=\"%s\"\n", m->strLastAccessError.c_str()));
    367367
    368368    *aAccessible = FALSE;

  • trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

    r55958 r55988  
    324324             *  set the exception (nobody will be able to read it).
    325325             */
    326             LogWarningFunc(("Will not set an exception because nsIExceptionService is not available "
    327                             "(NS_ERROR_UNEXPECTED). XPCOM is being shutdown?\n"));
     326            Log1WarningFunc(("Will not set an exception because nsIExceptionService is not available (NS_ERROR_UNEXPECTED). XPCOM is being shutdown?\n"));
    328327            rc = NS_OK;
    329328        }
    … …  
    491490             *  set the exception (nobody will be able to read it).
    492491             */
    493             LogWarningFunc(("Will not set an exception because nsIExceptionService is not available "
    494                             "(NS_ERROR_UNEXPECTED). XPCOM is being shutdown?\n"));
     492            Log1WarningFunc(("Will not set an exception because nsIExceptionService is not available (NS_ERROR_UNEXPECTED). XPCOM is being shutdown?\n"));
    495493            rc = NS_OK;
    496494        }

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r55941 r55988  
    86578657    else
    86588658    {
    8659         LogWarningThisFunc(("Failed to create proxy device for '%s' {%RTuuid} (%Rrc)\n",
    8660                             Address.c_str(), uuid.raw(), vrc));
     8659        Log1WarningThisFunc(("Failed to create proxy device for '%s' {%RTuuid} (%Rrc)\n", Address.c_str(), uuid.raw(), vrc));
    86618660
    86628661        switch (vrc)
    … …  
    93309329        if (cbDevList < e->oNext)
    93319330        {
    9332             LogWarningThisFunc(("cbDevList %d > oNext %d\n",
    9333                                  cbDevList, e->oNext));
     9331            Log1WarningThisFunc(("cbDevList %d > oNext %d\n", cbDevList, e->oNext));
    93349332            break;
    93359333        }

  • trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

    r54828 r55988  
    364364                                                  ComSafeArrayIn(BYTE,inShape))
    365365{
    366     LogSunlover(("VRDPConsoleListener::OnMousePointerShapeChange: %d, %d, %lux%lu, @%lu,%lu\n",
    367                  visible, alpha, width, height, xHot, yHot));
     366    Log9(("VRDPConsoleListener::OnMousePointerShapeChange: %d, %d, %lux%lu, @%lu,%lu\n",
     367          visible, alpha, width, height, xHot, yHot));
    368368
    369369    com::SafeArray <BYTE> aShape(ComSafeArrayInArg(inShape));

  • trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp

    r52769 r55988  
    5555    DISPLAYFBINFO *pInfo = pInfos;
    5656    unsigned uScreenId;
    57     LogSunlover(("mapCoordsToScreen: %d,%d %dx%d\n", *px, *py, *pw, *ph));
     57    Log9(("mapCoordsToScreen: %d,%d %dx%d\n", *px, *py, *pw, *ph));
    5858    for (uScreenId = 0; uScreenId < cInfos; uScreenId++, pInfo++)
    5959    {
    60         LogSunlover(("    [%d] %d,%d %dx%d\n", uScreenId, pInfo->xOrigin, pInfo->yOrigin, pInfo->w, pInfo->h));
     60        Log9(("    [%d] %d,%d %dx%d\n", uScreenId, pInfo->xOrigin, pInfo->yOrigin, pInfo->w, pInfo->h));
    6161        if (   (pInfo->xOrigin <= *px && *px < pInfo->xOrigin + (int)pInfo->w)
    6262            && (pInfo->yOrigin <= *py && *py < pInfo->yOrigin + (int)pInfo->h))
    … …  
    6565            *px -= pInfo->xOrigin;
    6666            *py -= pInfo->yOrigin;
    67             LogSunlover(("    -> %d,%d", *px, *py));
     67            Log9(("    -> %d,%d", *px, *py));
    6868            break;
    6969        }
    … …  
    7474        uScreenId = 0;
    7575    }
    76     LogSunlover((" scr %d\n", uScreenId));
     76    Log9((" scr %d\n", uScreenId));
    7777    return uScreenId;
    7878}
    … …  
    105105static void vbvaRgnDirtyRect(VBVADIRTYREGION *prgn, unsigned uScreenId, VBVACMDHDR *phdr)
    106106{
    107     LogSunlover(("x = %d, y = %d, w = %d, h = %d\n",
    108                  phdr->x, phdr->y, phdr->w, phdr->h));
     107    Log9(("x = %d, y = %d, w = %d, h = %d\n", phdr->x, phdr->y, phdr->w, phdr->h));
    109108
    110109    /*
    111110     * Here update rectangles are accumulated to form an update area.
    112      * @todo
     111     */
     112    /** @todo
    113113     * Now the simplest method is used which builds one rectangle that
    114114     * includes all update areas. A bit more advanced method can be

  • trunk/src/VBox/Main/src-client/HGCM.cpp

    r55401 r55988  
    13321332    if (!pClient)
    13331333    {
    1334         LogWarningFunc(("Could not allocate HGCMClient!!!\n"));
     1334        Log1WarningFunc(("Could not allocate HGCMClient!!!\n"));
    13351335        return VERR_NO_MEMORY;
    13361336    }

  • trunk/src/VBox/Main/src-client/SessionImpl.cpp

    r55800 r55988  
    547547    else
    548548    {
    549         LogWarningThisFunc(("UNEXPECTED uninitialization!\n"));
     549        Log1WarningThisFunc(("UNEXPECTED uninitialization!\n"));
    550550        rc = autoCaller.rc();
    551551    }

  • trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

    r54023 r55988  
    372372    if (display)
    373373    {
    374         LogSunlover(("MAIN::VMMDevInterface::iface_VideoAccelEnable: %d, %p\n", fEnable, pVbvaMemory));
     374        Log9(("MAIN::VMMDevInterface::iface_VideoAccelEnable: %d, %p\n", fEnable, pVbvaMemory));
    375375        return display->VideoAccelEnableVMMDev(fEnable, pVbvaMemory);
    376376    }
    … …  
    387387    if (display)
    388388    {
    389         LogSunlover(("MAIN::VMMDevInterface::iface_VideoAccelFlush\n"));
     389        Log9(("MAIN::VMMDevInterface::iface_VideoAccelFlush\n"));
    390390        display->VideoAccelFlushVMMDev();
    391391    }
    … …  
    606606                                           uint32_t *pu32ClientID)
    607607{
    608     LogSunlover(("Enter\n"));
     608    Log9(("Enter\n"));
    609609
    610610    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, HGCMConnector);
    … …  
    625625static DECLCALLBACK(int) iface_hgcmDisconnect(PPDMIHGCMCONNECTOR pInterface, PVBOXHGCMCMD pCmd, uint32_t u32ClientID)
    626626{
    627     LogSunlover(("Enter\n"));
     627    Log9(("Enter\n"));
    628628
    629629    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, HGCMConnector);
    … …  
    638638                                        uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms)
    639639{
    640     LogSunlover(("Enter\n"));
     640    Log9(("Enter\n"));
    641641
    642642    PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, HGCMConnector);
    … …  
    657657static DECLCALLBACK(int) iface_hgcmSave(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM)
    658658{
    659     LogSunlover(("Enter\n"));
     659    Log9(("Enter\n"));
    660660    return HGCMHostSaveState(pSSM);
    661661}

  • trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

    r54985 r55988  
    31833183                    {
    31843184                        /* possible case if a disk image belongs to other virtual system (OVF package with multiple VMs inside) */
    3185                         LogWarning(("OVA/OVF import: Disk image %s was missed during import of VM %s\n",
    3186                                     oit->first.c_str(), vmNameEntry->strOvf.c_str()));
     3185                        Log1Warning(("OVA/OVF import: Disk image %s was missed during import of VM %s\n",
     3186                                     oit->first.c_str(), vmNameEntry->strOvf.c_str()));
    31873187                        NOREF(vmNameEntry);
    31883188                        ++oit;
    … …  
    34053405            if(cImportedDisks < avsdeHDs.size())
    34063406            {
    3407                 LogWarning(("Not all disk images were imported for VM %s. Check OVF description file.",
    3408                             vmNameEntry->strOvf.c_str()));
     3407                Log1Warning(("Not all disk images were imported for VM %s. Check OVF description file.",
     3408                             vmNameEntry->strOvf.c_str()));
    34093409            }
    34103410
    … …  
    36893689            {
    36903690                /* possible case if a disk image belongs to other virtual system (OVF package with multiple VMs inside) */
    3691                 LogWarning(("OVA/OVF import: Disk image %s was missed during import of VM %s\n",
    3692                             oit->first.c_str(), vmNameEntry->strOvf.c_str()));
     3691                Log1Warning(("OVA/OVF import: Disk image %s was missed during import of VM %s\n",
     3692                             oit->first.c_str(), vmNameEntry->strOvf.c_str()));
    36933693                NOREF(vmNameEntry);
    36943694                ++oit;
    … …  
    39343934    if(cImportedDisks < avsdeHDs.size())
    39353935    {
    3936         LogWarning(("Not all disk images were imported for VM %s. Check OVF description file.",
    3937                     vmNameEntry->strOvf.c_str()));
     3936        Log1Warning(("Not all disk images were imported for VM %s. Check OVF description file.",
     3937                     vmNameEntry->strOvf.c_str()));
    39383938    }
    39393939

  • trunk/src/VBox/Main/src-server/MachineImpl.cpp

    r55854 r55988  
    761761        /* fetch the current error info */
    762762        mData->mAccessError = com::ErrorInfo();
    763         LogWarning(("Machine {%RTuuid} is inaccessible! [%ls]\n",
    764                     mData->mUuid.raw(),
    765                     mData->mAccessError.getText().raw()));
     763        Log1Warning(("Machine {%RTuuid} is inaccessible! [%ls]\n", mData->mUuid.raw(), mData->mAccessError.getText().raw()));
    766764
    767765        /* rollback all changes */
    … …  
    838836         * still valid). We'll call it ourselves below.
    839837         */
    840         LogWarningThisFunc(("Session machine is not NULL (%p), the direct session is still open!\n",
    841                             (SessionMachine*)mData->mSession.mMachine));
     838        Log1WarningThisFunc(("Session machine is not NULL (%p), the direct session is still open!\n",
     839                             (SessionMachine*)mData->mSession.mMachine));
    842840
    843841        if (Global::IsOnlineOrTransient(mData->mMachineState))
    844842        {
    845             LogWarningThisFunc(("Setting state to Aborted!\n"));
     843            Log1WarningThisFunc(("Setting state to Aborted!\n"));
    846844            /* set machine state using SessionMachine reimplementation */
    847845            static_cast<Machine*>(mData->mSession.mMachine)->i_setMachineState(MachineState_Aborted);
    … …  
    874872    if (mData->flModifications)
    875873    {
    876         LogWarningThisFunc(("Discarding unsaved settings changes!\n"));
     874        Log1WarningThisFunc(("Discarding unsaved settings changes!\n"));
    877875        i_rollback(false /* aNotify */);
    878876    }
    … …  
    49744972            const char *sep = error.isEmpty() ? "" : ": ";
    49754973            CBSTR err = error.raw();
    4976             LogWarningFunc(("Someone vetoed! Change refused%s%ls\n",
    4977                             sep, err));
     4974            Log1WarningFunc(("Someone vetoed! Change refused%s%ls\n", sep, err));
    49784975            return setError(E_ACCESSDENIED,
    49794976                            tr("Could not set extra data because someone refused the requested change of '%s' to '%s'%s%ls"),
    … …  
    1219412191    mCollectorGuest = new pm::CollectorGuest(aMachine, pid);
    1219512192    aCollector->registerGuest(mCollectorGuest);
    12196     LogAleksey(("{%p} " LOG_FN_FMT ": mCollectorGuest=%p\n",
    12197                 this, __PRETTY_FUNCTION__, mCollectorGuest));
     12193    Log7(("{%p} " LOG_FN_FMT ": mCollectorGuest=%p\n", this, __PRETTY_FUNCTION__, mCollectorGuest));
    1219812194
    1219912195    /* Create sub metrics */
    … …  
    1254612542    i_unregisterMetrics(mParent->i_performanceCollector(), mPeer);
    1254712543    /* The guest must be unregistered after its metrics (@bugref{5949}). */
    12548     LogAleksey(("{%p} " LOG_FN_FMT ": mCollectorGuest=%p\n",
    12549                 this, __PRETTY_FUNCTION__, mCollectorGuest));
     12544    Log7(("{%p} " LOG_FN_FMT ": mCollectorGuest=%p\n", this, __PRETTY_FUNCTION__, mCollectorGuest));
    1255012545    if (mCollectorGuest)
    1255112546    {
    … …  
    1255812553    if (aReason == Uninit::Abnormal)
    1255912554    {
    12560         LogWarningThisFunc(("ABNORMAL client termination! (wasBusy=%d)\n",
    12561                              Global::IsOnlineOrTransient(lastState)));
     12555        Log1WarningThisFunc(("ABNORMAL client termination! (wasBusy=%d)\n", Global::IsOnlineOrTransient(lastState)));
    1256212556
    1256312557        /* reset the state to Aborted */
    … …  
    1256912563    if (mData->flModifications)
    1257012564    {
    12571         LogWarningThisFunc(("Discarding unsaved settings changes!\n"));
     12565        Log1WarningThisFunc(("Discarding unsaved settings changes!\n"));
    1257212566        i_rollback(false /* aNotify */);
    1257312567    }
    … …  
    1259712591            LogFlowThisFunc(("  remoteControl->Uninitialize() returned %08X\n", rc));
    1259812592            if (FAILED(rc))
    12599                 LogWarningThisFunc(("Forgot to close the remote session?\n"));
     12593                Log1WarningThisFunc(("Forgot to close the remote session?\n"));
    1260012594            ++it;
    1260112595        }
    … …  
    1264312637
    1264412638    if ((aReason == Uninit::Unexpected))
    12645         LogWarningThisFunc(("Unexpected SessionMachine uninitialization!\n"));
     12639        Log1WarningThisFunc(("Unexpected SessionMachine uninitialization!\n"));
    1264612640
    1264712641    if (aReason != Uninit::Normal)

  • trunk/src/VBox/Main/src-server/MediumImpl.cpp

    r55872 r55988  
    64446444    {
    64456445        m->strLastAccessError = lastAccessError;
    6446         LogWarningFunc(("'%s' is not accessible (error='%s', rc=%Rhrc, vrc=%Rrc)\n",
    6447                         location.c_str(), m->strLastAccessError.c_str(),
    6448                         rc, vrc));
     6446        Log1WarningFunc(("'%s' is not accessible (error='%s', rc=%Rhrc, vrc=%Rrc)\n",
     6447                         location.c_str(), m->strLastAccessError.c_str(), rc, vrc));
    64496448    }
    64506449

  • trunk/src/VBox/Main/src-server/Performance.cpp

    r55769 r55988  
    115115    for (RTCPUID iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++)
    116116    {
    117         LogAleksey(("{%p} " LOG_FN_FMT ": Checking if CPU %d is member of online set...\n",
    118                     this, __PRETTY_FUNCTION__, (int)iCpu));
     117        Log7(("{%p} " LOG_FN_FMT ": Checking if CPU %d is member of online set...\n", this, __PRETTY_FUNCTION__, (int)iCpu));
    119118        if (RTCpuSetIsMemberByIndex(&OnlineSet, iCpu))
    120119        {
    121             LogAleksey(("{%p} " LOG_FN_FMT ": Getting frequency for CPU %d...\n",
    122                         this, __PRETTY_FUNCTION__, (int)iCpu));
     120            Log7(("{%p} " LOG_FN_FMT ": Getting frequency for CPU %d...\n", this, __PRETTY_FUNCTION__, (int)iCpu));
    123121            uint32_t uMHz = RTMpGetCurFrequency(RTMpCpuIdFromSetIndex(iCpu));
    124122            if (uMHz != 0)
    125123            {
    126                 LogAleksey(("{%p} " LOG_FN_FMT ": CPU %d %u MHz\n",
    127                             this, __PRETTY_FUNCTION__, (int)iCpu, uMHz));
     124                Log7(("{%p} " LOG_FN_FMT ": CPU %d %u MHz\n", this, __PRETTY_FUNCTION__, (int)iCpu, uMHz));
    128125                u64TotalMHz += uMHz;
    129126                cCpus++;
    … …  
    197194    NOREF(aFunction);
    198195    NOREF(aText);
    199     LogAleksey(("{%p} " LOG_FN_FMT ": CGRQEnable(mask=0x%x) %s\n",
    200                 aObject, aFunction, mMask, aText));
     196    Log7(("{%p} " LOG_FN_FMT ": CGRQEnable(mask=0x%x) %s\n", aObject, aFunction, mMask, aText));
    201197}
    202198
    … …  
    212208    NOREF(aFunction);
    213209    NOREF(aText);
    214     LogAleksey(("{%p} " LOG_FN_FMT ": CGRQDisable(mask=0x%x) %s\n",
    215                 aObject, aFunction, mMask, aText));
     210    Log7(("{%p} " LOG_FN_FMT ": CGRQDisable(mask=0x%x) %s\n", aObject, aFunction, mMask, aText));
    216211}
    217212
    … …  
    226221    NOREF(aFunction);
    227222    NOREF(aText);
    228     LogAleksey(("{%p} " LOG_FN_FMT ": CGRQAbort %s\n",
    229                 aObject, aFunction, aText));
     223    Log7(("{%p} " LOG_FN_FMT ": CGRQAbort %s\n", aObject, aFunction, aText));
    230224}
    231225
    … …  
    266260        /* enable statistics collection; this is a remote call (!) */
    267261        ret = directControl->EnableVMMStatistics(mCollectVMMStats);
    268         LogAleksey(("{%p} " LOG_FN_FMT ": %sable VMM stats (%s)\n",
    269                     this, __PRETTY_FUNCTION__, mCollectVMMStats?"En":"Dis",
    270                     SUCCEEDED(ret)?"success":"failed"));
     262        Log7(("{%p} " LOG_FN_FMT ": %sable VMM stats (%s)\n",
     263              this, __PRETTY_FUNCTION__, mCollectVMMStats ? "En" : "Dis", SUCCEEDED(ret) ? "success" : "failed"));
    271264    }
    272265
    … …  
    319312        {
    320313            ret = mGuest->COMSETTER(StatisticsUpdateInterval)(1 /* 1 sec */);
    321             LogAleksey(("{%p} " LOG_FN_FMT ": Set guest statistics update interval to 1 sec (%s)\n",
    322                         this, __PRETTY_FUNCTION__, SUCCEEDED(ret)?"success":"failed"));
     314            Log7(("{%p} " LOG_FN_FMT ": Set guest statistics update interval to 1 sec (%s)\n",
     315                  this, __PRETTY_FUNCTION__, SUCCEEDED(ret) ? "success" : "failed"));
    323316        }
    324317    }
    … …  
    343336        HRESULT ret = mGuest->COMSETTER(StatisticsUpdateInterval)(0 /* off */);
    344337        NOREF(ret);
    345         LogAleksey(("{%p} " LOG_FN_FMT ": Set guest statistics update interval to 0 sec (%s)\n",
    346                     this, __PRETTY_FUNCTION__, SUCCEEDED(ret)?"success":"failed"));
     338        Log7(("{%p} " LOG_FN_FMT ": Set guest statistics update interval to 0 sec (%s)\n",
     339              this, __PRETTY_FUNCTION__, SUCCEEDED(ret) ? "success" : "failed"));
    347340        invalidate(VMSTATS_ALL);
    348341    }
    … …  
    359352    }
    360353
    361     LogAleksey(("{%p} " LOG_FN_FMT ": Attempted enqueue guest request when mManager is null\n",
    362                 this, __PRETTY_FUNCTION__));
     354    Log7(("{%p} " LOG_FN_FMT ": Attempted enqueue guest request when mManager is null\n", this, __PRETTY_FUNCTION__));
    363355    return E_POINTER;
    364356}
    … …  
    410402                            "CGMgr");
    411403    NOREF(rc);
    412     LogAleksey(("{%p} " LOG_FN_FMT ": RTThreadCreate returned %u (mThread=%p)\n",
    413                 this, __PRETTY_FUNCTION__, rc));
     404    Log7(("{%p} " LOG_FN_FMT ": RTThreadCreate returned %u (mThread=%p)\n", this, __PRETTY_FUNCTION__, rc));
    414405}
    415406
    … …  
    422413    {
    423414        /* We wait only if we were able to put the abort request to a queue */
    424         LogAleksey(("{%p} " LOG_FN_FMT ": Waiting for CGM request processing thread to stop...\n",
    425                     this, __PRETTY_FUNCTION__));
     415        Log7(("{%p} " LOG_FN_FMT ": Waiting for CGM request processing thread to stop...\n", this, __PRETTY_FUNCTION__));
    426416        rc = RTThreadWait(mThread, 1000 /* 1 sec */, &rcThread);
    427         LogAleksey(("{%p} " LOG_FN_FMT ": RTThreadWait returned %u (thread exit code: %u)\n",
    428                     this, __PRETTY_FUNCTION__, rc, rcThread));
     417        Log7(("{%p} " LOG_FN_FMT ": RTThreadWait returned %u (thread exit code: %u)\n", this, __PRETTY_FUNCTION__, rc, rcThread));
    429418    }
    430419}
    … …  
    440429    if (!mVMMStatsProvider)
    441430        mVMMStatsProvider = pGuest;
    442     LogAleksey(("{%p} " LOG_FN_FMT ": Registered guest=%p provider=%p\n",
    443                 this, __PRETTY_FUNCTION__, pGuest, mVMMStatsProvider));
     431    Log7(("{%p} " LOG_FN_FMT ": Registered guest=%p provider=%p\n", this, __PRETTY_FUNCTION__, pGuest, mVMMStatsProvider));
    444432}
    445433
    … …  
    448436    int rc = S_OK;
    449437
    450     LogAleksey(("{%p} " LOG_FN_FMT ": About to unregister guest=%p provider=%p\n",
    451                 this, __PRETTY_FUNCTION__, pGuest, mVMMStatsProvider));
     438    Log7(("{%p} " LOG_FN_FMT ": About to unregister guest=%p provider=%p\n", this, __PRETTY_FUNCTION__, pGuest, mVMMStatsProvider));
    452439    //mGuests.remove(pGuest); => destroyUnregistered()
    453440    pGuest->unregister();
    … …  
    498485        }
    499486    }
    500     LogAleksey(("{%p} " LOG_FN_FMT ": LEAVE new provider=%p\n",
    501                 this, __PRETTY_FUNCTION__, mVMMStatsProvider));
     487    Log7(("{%p} " LOG_FN_FMT ": LEAVE new provider=%p\n", this, __PRETTY_FUNCTION__, mVMMStatsProvider));
    502488}
    503489
    … …  
    511497            delete *it;
    512498            it = mGuests.erase(it);
    513             LogAleksey(("{%p} " LOG_FN_FMT ": Number of guests after erasing unregistered is %d\n",
    514                         this, __PRETTY_FUNCTION__, mGuests.size()));
     499            Log7(("{%p} " LOG_FN_FMT ": Number of guests after erasing unregistered is %d\n",
     500                  this, __PRETTY_FUNCTION__, mGuests.size()));
    515501        }
    516502        else
    … …  
    537523         * and is barely noticable by humans.
    538524         */
    539         LogAleksey(("{%p} " LOG_FN_FMT ": Suspecting %s is stalled. Waiting for .5 sec...\n",
    540                     this, __PRETTY_FUNCTION__,
    541                     aRequest->getGuest()->getVMName().c_str()));
     525        Log7(("{%p} " LOG_FN_FMT ": Suspecting %s is stalled. Waiting for .5 sec...\n",
     526              this, __PRETTY_FUNCTION__, aRequest->getGuest()->getVMName().c_str()));
    542527        RTThreadSleep(500 /* ms */);
    543528        if (aRequest->getGuest() == mGuestBeingCalled) {
    544             LogAleksey(("{%p} " LOG_FN_FMT ": Request processing stalled for %s\n",
    545                         this, __PRETTY_FUNCTION__,
    546                         aRequest->getGuest()->getVMName().c_str()));
     529            Log7(("{%p} " LOG_FN_FMT ": Request processing stalled for %s\n",
     530                  this, __PRETTY_FUNCTION__, aRequest->getGuest()->getVMName().c_str()));
    547531            /* Request execution got stalled for this guest -- report an error */
    548532            return E_FAIL;
    … …  
    561545    HRESULT rc = S_OK;
    562546
    563     LogAleksey(("{%p} " LOG_FN_FMT ": Starting request processing loop...\n",
    564                 mgr, __PRETTY_FUNCTION__));
     547    Log7(("{%p} " LOG_FN_FMT ": Starting request processing loop...\n", mgr, __PRETTY_FUNCTION__));
    565548    while ((pReq = mgr->mQueue.pop()) != NULL)
    566549    {
    … …  
    575558            break;
    576559        if (FAILED(rc))
    577             LogAleksey(("{%p} " LOG_FN_FMT ": request::execute returned %u\n",
    578                         mgr, __PRETTY_FUNCTION__, rc));
    579     }
    580     LogAleksey(("{%p} " LOG_FN_FMT ": Exiting request processing loop... rc=%u\n",
    581                         mgr, __PRETTY_FUNCTION__, rc));
     560            Log7(("{%p} " LOG_FN_FMT ": request::execute returned %u\n", mgr, __PRETTY_FUNCTION__, rc));
     561    }
     562    Log7(("{%p} " LOG_FN_FMT ": Exiting request processing loop... rc=%u\n", mgr, __PRETTY_FUNCTION__, rc));
    582563
    583564    return VINF_SUCCESS;
    … …  
    968949    if (provider)
    969950    {
    970         LogAleksey(("{%p} " LOG_FN_FMT ": provider=%p enabled=%s valid=%s...\n",
    971                     this, __PRETTY_FUNCTION__, provider, provider->isEnabled()?"y":"n",
    972                     provider->isValid(VMSTATS_VMM_RAM)?"y":"n"));
     951        Log7(("{%p} " LOG_FN_FMT ": provider=%p enabled=%RTbool valid=%RTbool...\n",
     952              this, __PRETTY_FUNCTION__, provider, provider->isEnabled(), provider->isValid(VMSTATS_VMM_RAM) ));
    973953        if (provider->isValid(VMSTATS_VMM_RAM))
    974954        {
    … …  
    993973        mSharedCurrent    = 0;
    994974    }
    995     LogAleksey(("{%p} " LOG_FN_FMT ": mAllocCurrent=%u mFreeCurrent=%u mBalloonedCurrent=%u mSharedCurrent=%u\n",
    996                 this, __PRETTY_FUNCTION__,
    997                 mAllocCurrent, mFreeCurrent, mBalloonedCurrent, mSharedCurrent));
     975    Log7(("{%p} " LOG_FN_FMT ": mAllocCurrent=%u mFreeCurrent=%u mBalloonedCurrent=%u mSharedCurrent=%u\n",
     976          this, __PRETTY_FUNCTION__, mAllocCurrent, mFreeCurrent, mBalloonedCurrent, mSharedCurrent));
    998977    mAllocVMM->put(mAllocCurrent);
    999978    mFreeVMM->put(mFreeCurrent);
    … …  
    15321511    ElementList::const_iterator it;
    15331512
    1534     //LogAleksey(("Filter::match(%p, %s)\n", static_cast<const IUnknown*> (object), name.c_str()));
     1513    //Log7(("Filter::match(%p, %s)\n", static_cast<const IUnknown*> (object), name.c_str()));
    15351514    for (it = mElements.begin(); it != mElements.end(); ++it)
    15361515    {
    1537         //LogAleksey(("...matching against(%p, %s)\n", static_cast<const IUnknown*> ((*it).first), (*it).second.c_str()));
     1516        //Log7(("...matching against(%p, %s)\n", static_cast<const IUnknown*> ((*it).first), (*it).second.c_str()));
    15381517        if ((*it).first.isNull() || (*it).first == object)
    15391518        {
    … …  
    15461525        }
    15471526    }
    1548     //LogAleksey(("...no matches!\n"));
     1527    //Log7(("...no matches!\n"));
    15491528    return false;
    15501529}

  • trunk/src/VBox/Main/src-server/PerformanceImpl.cpp

    r55769 r55988  
    582582
    583583    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    584     LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__,
    585                 (void *)baseMetric->getObject(), baseMetric->getName()));
     584    Log7(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__,
     585          (void *)baseMetric->getObject(), baseMetric->getName()));
    586586    m.baseMetrics.push_back (baseMetric);
    587587    //LogFlowThisFuncLeave();
    … …  
    595595
    596596    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    597     LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__,
    598                 (void *)metric->getObject(), metric->getName()));
     597    Log7(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__, (void *)metric->getObject(), metric->getName()));
    599598    m.metrics.push_back (metric);
    600599    //LogFlowThisFuncLeave();
    … …  
    618617            ++n;
    619618        }
    620     LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p, name=%s, marked %d metrics\n",
    621                 this, __PRETTY_FUNCTION__, (void *)aObject, name.c_str(), n));
     619    Log7(("{%p} " LOG_FN_FMT ": obj=%p, name=%s, marked %d metrics\n",
     620          this, __PRETTY_FUNCTION__, (void *)aObject, name.c_str(), n));
    622621    //LogFlowThisFuncLeave();
    623622}
    … …  
    632631
    633632    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
    634     LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p, name=%s\n", this,
    635                 __PRETTY_FUNCTION__, (void *)aObject, name.c_str()));
     633    Log7(("{%p} " LOG_FN_FMT ": obj=%p, name=%s\n", this, __PRETTY_FUNCTION__, (void *)aObject, name.c_str()));
    636634    MetricList::iterator it;
    637635    for (it = m.metrics.begin(); it != m.metrics.end();)
    … …  
    756754     * Those should be destroyed now.
    757755     */
    758     LogAleksey(("{%p} " LOG_FN_FMT ": before remove_if: toBeCollected.size()=%d\n", this, __PRETTY_FUNCTION__,
    759                 toBeCollected.size()));
     756    Log7(("{%p} " LOG_FN_FMT ": before remove_if: toBeCollected.size()=%d\n", this, __PRETTY_FUNCTION__, toBeCollected.size()));
    760757    toBeCollected.remove_if(std::mem_fun(&pm::BaseMetric::isUnregistered));
    761     LogAleksey(("{%p} " LOG_FN_FMT ": after remove_if: toBeCollected.size()=%d\n", this, __PRETTY_FUNCTION__,
    762                 toBeCollected.size()));
    763     LogAleksey(("{%p} " LOG_FN_FMT ": before remove_if: m.baseMetrics.size()=%d\n", this, __PRETTY_FUNCTION__,
    764                 m.baseMetrics.size()));
     758    Log7(("{%p} " LOG_FN_FMT ": after remove_if: toBeCollected.size()=%d\n", this, __PRETTY_FUNCTION__, toBeCollected.size()));
     759    Log7(("{%p} " LOG_FN_FMT ": before remove_if: m.baseMetrics.size()=%d\n", this, __PRETTY_FUNCTION__, m.baseMetrics.size()));
    765760    for (it = m.baseMetrics.begin(); it != m.baseMetrics.end();)
    766761        if ((*it)->isUnregistered())
    … …  
    771766        else
    772767            ++it;
    773     LogAleksey(("{%p} " LOG_FN_FMT ": after remove_if: m.baseMetrics.size()=%d\n", this, __PRETTY_FUNCTION__,
    774                 m.baseMetrics.size()));
     768    Log7(("{%p} " LOG_FN_FMT ": after remove_if: m.baseMetrics.size()=%d\n", this, __PRETTY_FUNCTION__, m.baseMetrics.size()));
    775769    /*
    776770     * Now when we have destroyed all base metrics that could

  • trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

    r55839 r55988  
    803803            int vrc = RTThreadWait(m->threadAsyncEvent, 60000, NULL);
    804804            if (RT_FAILURE(vrc))
    805                 LogWarningFunc(("RTThreadWait(%RTthrd) -> %Rrc\n",
    806                                 m->threadAsyncEvent, vrc));
     805                Log1WarningFunc(("RTThreadWait(%RTthrd) -> %Rrc\n", m->threadAsyncEvent, vrc));
    807806        }
    808807        else
    … …  
    20062005            const char *sep = error.isEmpty() ? "" : ": ";
    20072006            CBSTR err = error.raw();
    2008             LogWarningFunc(("Someone vetoed! Change refused%s%ls\n",
    2009                             sep, err));
     2007            Log1WarningFunc(("Someone vetoed! Change refused%s%ls\n", sep, err));
    20102008            return setError(E_ACCESSDENIED,
    20112009                            tr("Could not set extra data because someone refused the requested change of '%s' to '%s'%s%ls"),
    … …  
    23042302    {
    23052303        if (getObjectState().getState() != ObjectState::Ready)
    2306             LogWarningFunc(("VirtualBox has been uninitialized (state=%d), the event is discarded!\n",
    2307                             getObjectState().getState()));
     2304            Log1WarningFunc(("VirtualBox has been uninitialized (state=%d), the event is discarded!\n",
     2305                             getObjectState().getState()));
    23082306            // return S_OK
    23092307        else if (    (m->pAsyncEventQ)
    … …  
    48204818    if (!autoCaller.isOk())
    48214819    {
    4822         LogWarningFunc(("VirtualBox has been uninitialized (state=%d), the callback event is discarded!\n",
    4823                         mVirtualBox->getObjectState().getState()));
     4820        Log1WarningFunc(("VirtualBox has been uninitialized (state=%d), the callback event is discarded!\n",
     4821                         mVirtualBox->getObjectState().getState()));
    48244822        /* We don't need mVirtualBox any more, so release it */
    48254823        mVirtualBox = NULL;

  • trunk/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp

    r46328 r55988  
    130130static int getProcessInfo(RTPROCESS process, struct proc_taskinfo *tinfo)
    131131{
    132     LogAleksey(("getProcessInfo() getting info for %d", process));
     132    Log7(("getProcessInfo() getting info for %d", process));
    133133    int nb = proc_pidinfo(process, PROC_PIDTASKINFO, 0,  tinfo, sizeof(*tinfo));
    134134    if (nb <= 0)

  • trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

    r55365 r55988  
    473473                rc = RTThreadWait(m->m_hThrRecv, 60000, NULL);
    474474                if (RT_FAILURE(rc))
    475                     LogWarningFunc(("RTThreadWait(%RTthrd) -> %Rrc\n", m->m_hThrRecv, rc));
     475                    Log1WarningFunc(("RTThreadWait(%RTthrd) -> %Rrc\n", m->m_hThrRecv, rc));
    476476            }
    477477            else

  • trunk/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp

    r55980 r55988  
    4444
    4545/* All release logging goes to the backdoor logger anyway. */
    46 RTDECL(PRTLOGGER) RTLogRelGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
     46RTDECL(PRTLOGGER) RTLogRelGetDefaultInstanceEx(uint32_t fFlagsAndGroup)
    4747{
    4848    return NULL;
    … …  
    5858
    5959/* All logging goes to the backdoor logger anyway. */
    60 RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
     60RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlagsAndGroup)
    6161{
    6262    return NULL;

  • trunk/src/VBox/Runtime/common/log/log.cpp

    r55980 r55988  
    17881788            { "eo",         RTLOGGRPFLAGS_ENABLED },
    17891789            { "enabledonly",RTLOGGRPFLAGS_ENABLED },
    1790             { "e",          RTLOGGRPFLAGS_ENABLED | RTLOGGRPFLAGS_LEVEL_1 },
    1791             { "enabled",    RTLOGGRPFLAGS_ENABLED | RTLOGGRPFLAGS_LEVEL_1 },
     1790            { "e",          RTLOGGRPFLAGS_ENABLED | RTLOGGRPFLAGS_LEVEL_1 | RTLOGGRPFLAGS_WARN },
     1791            { "enabled",    RTLOGGRPFLAGS_ENABLED | RTLOGGRPFLAGS_LEVEL_1 | RTLOGGRPFLAGS_WARN },
    17921792            { "l1",         RTLOGGRPFLAGS_LEVEL_1 },
    17931793            { "level1",     RTLOGGRPFLAGS_LEVEL_1 },
    … …  
    18031803            { "l6",         RTLOGGRPFLAGS_LEVEL_6 },
    18041804            { "level6",     RTLOGGRPFLAGS_LEVEL_6 },
     1805            { "l7",         RTLOGGRPFLAGS_LEVEL_7 },
     1806            { "level7",     RTLOGGRPFLAGS_LEVEL_7 },
     1807            { "l8",         RTLOGGRPFLAGS_LEVEL_8 },
     1808            { "level8",     RTLOGGRPFLAGS_LEVEL_8 },
     1809            { "l9",         RTLOGGRPFLAGS_LEVEL_9 },
     1810            { "level9",     RTLOGGRPFLAGS_LEVEL_9 },
     1811            { "l10",        RTLOGGRPFLAGS_LEVEL_10 },
     1812            { "level10",    RTLOGGRPFLAGS_LEVEL_10 },
     1813            { "l11",        RTLOGGRPFLAGS_LEVEL_11 },
     1814            { "level11",    RTLOGGRPFLAGS_LEVEL_11 },
     1815            { "l12",        RTLOGGRPFLAGS_LEVEL_12 },
     1816            { "level12",    RTLOGGRPFLAGS_LEVEL_12 },
    18051817            { "f",          RTLOGGRPFLAGS_FLOW },
    18061818            { "flow",       RTLOGGRPFLAGS_FLOW },
     1819            { "w",          RTLOGGRPFLAGS_WARN },
     1820            { "warn",       RTLOGGRPFLAGS_WARN },
     1821            { "warning",    RTLOGGRPFLAGS_WARN },
    18071822            { "restrict",   RTLOGGRPFLAGS_RESTRICT },
    18081823
    1809             { "lelik",      RTLOGGRPFLAGS_LELIK },
    1810             { "michael",    RTLOGGRPFLAGS_MICHAEL },
    1811             { "sunlover",   RTLOGGRPFLAGS_SUNLOVER },
    1812             { "achim",      RTLOGGRPFLAGS_ACHIM },
    1813             { "achimha",    RTLOGGRPFLAGS_ACHIM },
    1814             { "s",          RTLOGGRPFLAGS_SANDER },
    1815             { "sander",     RTLOGGRPFLAGS_SANDER },
    1816             { "sandervl",   RTLOGGRPFLAGS_SANDER },
    1817             { "klaus",      RTLOGGRPFLAGS_KLAUS },
    1818             { "frank",      RTLOGGRPFLAGS_FRANK },
    1819             { "b",          RTLOGGRPFLAGS_BIRD },
    1820             { "bird",       RTLOGGRPFLAGS_BIRD },
    1821             { "aleksey",    RTLOGGRPFLAGS_ALEKSEY },
    1822             { "dj",         RTLOGGRPFLAGS_DJ },
    1823             { "n",          RTLOGGRPFLAGS_NONAME },
    1824             { "noname",     RTLOGGRPFLAGS_NONAME }
    18251824        };
    18261825        unsigned    i;
    … …  
    26152614
    26162615
    2617 RTDECL(PRTLOGGER)   RTLogDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
     2616RTDECL(PRTLOGGER)   RTLogDefaultInstanceEx(uint32_t fFlagsAndGroup)
    26182617{
    26192618    PRTLOGGER pLogger = rtLogDefaultInstanceCommon();
    … …  
    26222621        if (pLogger->fFlags & RTLOGFLAGS_DISABLED)
    26232622            pLogger = NULL;
    2624         else if (   iGroup != UINT32_MAX
     2623        else
     2624        {
     2625            uint16_t const fFlags = RT_LO_U16(fFlagsAndGroup);
     2626            uint16_t const iGroup = RT_HI_U16(fFlagsAndGroup);
     2627            if (   iGroup != UINT16_MAX
    26252628                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
    26262629                     != (fFlags | RTLOGGRPFLAGS_ENABLED)))
    26272630            pLogger = NULL;
     2631        }
    26282632    }
    26292633    return pLogger;
    … …  
    26662670
    26672671
    2668 RTDECL(PRTLOGGER) RTLogGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
     2672RTDECL(PRTLOGGER) RTLogGetDefaultInstanceEx(uint32_t fFlagsAndGroup)
    26692673{
    26702674    PRTLOGGER pLogger = rtLogGetDefaultInstanceCommon();
    … …  
    26732677        if (pLogger->fFlags & RTLOGFLAGS_DISABLED)
    26742678            pLogger = NULL;
    2675         else if (   iGroup != UINT32_MAX
     2679        else
     2680        {
     2681            uint16_t const fFlags = RT_LO_U16(fFlagsAndGroup);
     2682            uint16_t const iGroup = RT_HI_U16(fFlagsAndGroup);
     2683            if (   iGroup != UINT16_MAX
    26762684                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
    26772685                     != (fFlags | RTLOGGRPFLAGS_ENABLED)))
    26782686            pLogger = NULL;
     2687        }
    26792688    }
    26802689    return pLogger;
    … …  
    37583767                        case RTLOGGRPFLAGS_LEVEL_5:     pszGroup = "level 5" ;  cch = sizeof("level 5" ) - 1; break;
    37593768                        case RTLOGGRPFLAGS_LEVEL_6:     pszGroup = "level 6" ;  cch = sizeof("level 6" ) - 1; break;
     3769                        case RTLOGGRPFLAGS_LEVEL_7:     pszGroup = "level 7" ;  cch = sizeof("level 7" ) - 1; break;
     3770                        case RTLOGGRPFLAGS_LEVEL_8:     pszGroup = "level 8" ;  cch = sizeof("level 8" ) - 1; break;
     3771                        case RTLOGGRPFLAGS_LEVEL_9:     pszGroup = "level 9" ;  cch = sizeof("level 9" ) - 1; break;
     3772                        case RTLOGGRPFLAGS_LEVEL_10:    pszGroup = "level 10";  cch = sizeof("level 10") - 1; break;
     3773                        case RTLOGGRPFLAGS_LEVEL_11:    pszGroup = "level 11";  cch = sizeof("level 11") - 1; break;
     3774                        case RTLOGGRPFLAGS_LEVEL_12:    pszGroup = "level 12";  cch = sizeof("level 12") - 1; break;
    37603775                        case RTLOGGRPFLAGS_FLOW:        pszGroup = "flow"    ;  cch = sizeof("flow"    ) - 1; break;
    3761 
    3762                         /* personal groups */
    3763                         case RTLOGGRPFLAGS_LELIK:       pszGroup = "lelik"   ;  cch = sizeof("lelik"   ) - 1; break;
    3764                         case RTLOGGRPFLAGS_MICHAEL:     pszGroup = "Michael" ;  cch = sizeof("Michael" ) - 1; break;
    3765                         case RTLOGGRPFLAGS_SUNLOVER:    pszGroup = "sunlover";  cch = sizeof("sunlover") - 1; break;
    3766                         case RTLOGGRPFLAGS_ACHIM:       pszGroup = "Achim"   ;  cch = sizeof("Achim"   ) - 1; break;
    3767                         case RTLOGGRPFLAGS_SANDER:      pszGroup = "Sander"  ;  cch = sizeof("Sander"  ) - 1; break;
    3768                         case RTLOGGRPFLAGS_KLAUS:       pszGroup = "Klaus"   ;  cch = sizeof("Klaus"   ) - 1; break;
    3769                         case RTLOGGRPFLAGS_FRANK:       pszGroup = "Frank"   ;  cch = sizeof("Frank"   ) - 1; break;
    3770                         case RTLOGGRPFLAGS_BIRD:        pszGroup = "bird"    ;  cch = sizeof("bird"    ) - 1; break;
    3771                         case RTLOGGRPFLAGS_NONAME:      pszGroup = "noname"  ;  cch = sizeof("noname"  ) - 1; break;
     3776                        case RTLOGGRPFLAGS_WARN:        pszGroup = "warn"    ;  cch = sizeof("warn"    ) - 1; break;
    37723777                        default:                        pszGroup = "????????";  cch = sizeof("????????") - 1; break;
    37733778                    }

  • trunk/src/VBox/Runtime/common/log/logrel.cpp

    r55980 r55988  
    8181
    8282
    83 RTDECL(PRTLOGGER)   RTLogRelGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
     83RTDECL(PRTLOGGER)   RTLogRelGetDefaultInstanceEx(uint32_t fFlagsAndGroup)
    8484{
    8585#ifdef IN_RC
    … …  
    9292        if (pLogger->fFlags & RTLOGFLAGS_DISABLED)
    9393            pLogger = NULL;
    94         else if (   iGroup != UINT32_MAX
     94        else
     95        {
     96            uint16_t const fFlags = RT_LO_U16(fFlagsAndGroup);
     97            uint16_t const iGroup = RT_HI_U16(fFlagsAndGroup);
     98            if (   iGroup != UINT16_MAX
    9599                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
    96100                     != (fFlags | RTLOGGRPFLAGS_ENABLED)))
    97101            pLogger = NULL;
     102        }
    98103    }
    99104    return pLogger;

  • trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

    r50000 r55988  
    615615        if (hEventToSignal != NIL_RTSEMEVENT)
    616616        {
    617             LogBird(("Signalling %#x\n", hEventToSignal));
     617            Log8(("Signalling %#x\n", hEventToSignal));
    618618            int rc = RTSemEventSignal(hEventToSignal);
    619619            AssertRC(rc);

  • trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

    r55979 r55988  
    631631                          ? &pVCpu->pgm.s.CTX_SUFF(pStats)->StatRZTrap0eTime2DirtyAndAccessed
    632632                          : &pVCpu->pgm.s.CTX_SUFF(pStats)->StatRZTrap0eTime2GuestTrap; });
    633             LogBird(("Trap0eHandler: returns VINF_SUCCESS\n"));
     633            Log8(("Trap0eHandler: returns VINF_SUCCESS\n"));
    634634            return VINF_SUCCESS;
    635635        }

  • trunk/src/recompiler/VBoxREMWrapper.cpp

    r55980 r55988  
    10861086static const REMPARMDESC g_aArgsRTLogGetDefaultInstanceEx[] =
    10871087{
    1088     { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t),           NULL },
    10891088    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t),           NULL }
    10901089};
Note: See TracChangeset for help on using the changeset viewer.

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