Changeset 42817 in vbox
- Timestamp:
- Aug 15, 2012 8:37:16 AM (13 years ago)
- svn:sync-xref-src-repo-rev:
- 80064
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-client/GuestImpl.cpp
r42261 r42817 47 47 ///////////////////////////////////////////////////////////////////////////// 48 48 49 DEFINE_EMPTY_CTOR_DTOR 49 DEFINE_EMPTY_CTOR_DTOR(Guest) 50 50 51 51 HRESULT Guest::FinalConstruct() … … 56 56 void Guest::FinalRelease() 57 57 { 58 uninit 58 uninit(); 59 59 BaseFinalRelease(); 60 60 } … … 104 104 105 105 mMagic = GUEST_MAGIC; 106 int vrc = RTTimerLRCreate (&mStatTimer, 1000 /* ms */, 107 &Guest::staticUpdateStats, this); 108 AssertMsgRC (vrc, ("Failed to create guest statistics " 109 "update timer(%Rra)\n", vrc)); 106 int vrc = RTTimerLRCreate(&mStatTimer, 1000 /* ms */, 107 &Guest::staticUpdateStats, this); 108 AssertMsgRC(vrc, ("Failed to create guest statistics update timer(%Rra)\n", vrc)); 110 109 111 110 #ifdef VBOX_WITH_GUEST_CONTROL … … 165 164 166 165 /* Destroy stat update timer */ 167 int vrc = RTTimerLRDestroy (mStatTimer); 168 AssertMsgRC (vrc, ("Failed to create guest statistics " 169 "update timer(%Rra)\n", vrc)); 166 int vrc = RTTimerLRDestroy(mStatTimer); 167 AssertMsgRC(vrc, ("Failed to create guest statistics update timer(%Rra)\n", vrc)); 170 168 mStatTimer = NULL; 171 169 mMagic = 0; … … 182 180 void Guest::staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick) 183 181 { 184 AssertReturnVoid 185 Guest *guest = static_cast <Guest *>(pvUser);182 AssertReturnVoid(pvUser != NULL); 183 Guest *guest = static_cast<Guest *>(pvUser); 186 184 Assert(guest->mMagic == GUEST_MAGIC); 187 185 if (guest->mMagic == GUEST_MAGIC) 188 186 guest->updateStats(iTick); 189 187 190 NOREF 188 NOREF(hTimerLR); 191 189 } 192 190 … … 222 220 uZeroMem = 0; 223 221 224 Console::SafeVMPtr pVM 222 Console::SafeVMPtr pVM(mParent); 225 223 if (pVM.isOk()) 226 224 { … … 296 294 } 297 295 298 STDMETHODIMP Guest::COMGETTER(AdditionsRunLevel) 296 STDMETHODIMP Guest::COMGETTER(AdditionsRunLevel)(AdditionsRunLevelType_T *aRunLevel) 299 297 { 300 298 AutoCaller autoCaller(this);
Note:
See TracChangeset
for help on using the changeset viewer.