VirtualBox

Changeset 55988 in vbox for trunk/src/VBox/Main/src-server


Ignore:
Timestamp:
May 20, 2015 11:24:44 PM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
100497
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/VBox/Main/src-server
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • 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)
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