Changeset 37439 in vbox for trunk/src/VBox/VMM/VMMAll
- Timestamp:
- Jun 14, 2011 2:30:40 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
r35346 r37439 22 22 #define LOG_GROUP LOG_GROUP_TM 23 23 #include <VBox/vmm/tm.h> 24 #include <VBox/vmm/dbgftrace.h> 24 25 #ifdef IN_RING3 25 26 # include <VBox/vmm/rem.h> … … 83 84 DECLINLINE(uint64_t) tmVirtualGetRawNanoTS(PVM pVM) 84 85 { 85 # ifdef IN_RING386 returnCTXALLSUFF(pVM->tm.s.pfnVirtualGetRaw)(&CTXALLSUFF(pVM->tm.s.VirtualGetRawData));86 # ifdef IN_RING3 87 uint64_t u64 = CTXALLSUFF(pVM->tm.s.pfnVirtualGetRaw)(&CTXALLSUFF(pVM->tm.s.VirtualGetRawData)); 87 88 # else /* !IN_RING3 */ 88 89 uint32_t cPrevSteps = pVM->tm.s.CTX_SUFF(VirtualGetRawData).c1nsSteps; … … 90 91 if (cPrevSteps != pVM->tm.s.CTX_SUFF(VirtualGetRawData).c1nsSteps) 91 92 VMCPU_FF_SET(VMMGetCpu(pVM), VMCPU_FF_TO_R3); 93 # endif /* !IN_RING3 */ 94 /*DBGFTRACE_POS_U64(pVM, u64);*/ 92 95 return u64; 93 # endif /* !IN_RING3 */94 96 } 95 97 … … 504 506 505 507 Log6(("tmVirtualSyncGetHandleCatchUpLocked -> %'RU64\n", u64)); 508 DBGFTRACE_U64_TAG(pVM, u64, "tmVirtualSyncGetHandleCatchUpLocked"); 506 509 return u64; 507 510 } … … 531 534 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGetLocked); 532 535 Log6(("tmVirtualSyncGetLocked -> %'RU64 [stopped]\n", u64)); 536 DBGFTRACE_U64_TAG(pVM, u64, "tmVirtualSyncGetLocked-stopped"); 533 537 return u64; 534 538 } … … 578 582 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGetLocked); 579 583 Log6(("tmVirtualSyncGetLocked -> %'RU64\n", u64)); 584 DBGFTRACE_U64_TAG(pVM, u64, "tmVirtualSyncGetLocked"); 580 585 return u64; 581 586 } … … 597 602 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGet); 598 603 604 uint64_t u64; 599 605 if (!pVM->tm.s.fVirtualSyncTicking) 600 606 { 601 607 if (pcNsToDeadline) 602 608 *pcNsToDeadline = 0; 603 return pVM->tm.s.u64VirtualSync; 609 u64 = pVM->tm.s.u64VirtualSync; 610 DBGFTRACE_U64_TAG(pVM, u64, "tmVirtualSyncGetEx-stopped1"); 611 return u64; 604 612 } 605 613 … … 608 616 */ 609 617 Assert(pVM->tm.s.cVirtualTicking); 610 u int64_t u64 = tmVirtualGetRaw(pVM);618 u64 = tmVirtualGetRaw(pVM); 611 619 if (fCheckTimers) 612 620 { … … 647 655 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGetLockless); 648 656 Log6(("tmVirtualSyncGetEx -> %'RU64 [lockless]\n", off)); 657 DBGFTRACE_U64_TAG(pVM, off, "tmVirtualSyncGetEx-lockless"); 649 658 return off; 650 659 } … … 661 670 STAM_COUNTER_INC(&pVM->tm.s.StatVirtualSyncGetLockless); 662 671 Log6(("tmVirtualSyncGetEx -> %'RU64 [lockless/stopped]\n", off)); 672 DBGFTRACE_U64_TAG(pVM, off, "tmVirtualSyncGetEx-stopped2"); 663 673 return off; 664 674 } … … 702 712 *pcNsToDeadline = 0; 703 713 Log6(("tmVirtualSyncGetEx -> %'RU64 [stopped]\n", off)); 714 DBGFTRACE_U64_TAG(pVM, off, "tmVirtualSyncGetEx-stopped3"); 704 715 return off; 705 716 } … … 794 805 795 806 Log6(("tmVirtualSyncGetEx -> %'RU64\n", u64)); 807 DBGFTRACE_U64_TAG(pVM, u64, "tmVirtualSyncGetEx-nolock"); 796 808 return u64; 797 809 }
Note:
See TracChangeset
for help on using the changeset viewer.