VirtualBox

Changeset 36679 in vbox


Ignore:
Timestamp:
Apr 15, 2011 9:35:07 AM (14 years ago)
Author:
vboxsync
Message:

Runtime/log: move writing the initial log messages to after the lock is created, avoids triggering an assertion

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Runtime/common/log/log.cpp

    r36408 r36679  
    532532                }
    533533            }
    534 
    535             /* Use the callback to generate some initial log contents. */
    536             Assert(VALID_PTR(pLogger->pFile->pfnPhase) || pLogger->pFile->pfnPhase == NULL);
    537             if (pLogger->pFile->pfnPhase)
    538                 pLogger->pFile->pfnPhase(pLogger, RTLOGPHASE_BEGIN, rtlogPhaseMsgNormal);
    539534#endif  /* IN_RING3 */
    540535
     
    558553                        ASMAtomicWriteU32(&g_cLoggerLockCount, c);
    559554                    }
     555
     556                    /* Use the callback to generate some initial log contents. */
     557                    Assert(VALID_PTR(pLogger->pFile->pfnPhase) || pLogger->pFile->pfnPhase == NULL);
     558                    if (pLogger->pFile->pfnPhase)
     559                        pLogger->pFile->pfnPhase(pLogger, RTLOGPHASE_BEGIN, rtlogPhaseMsgNormal);
    560560#endif
    561561                    *ppLogger = pLogger;
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