Changeset 34255 in vbox for trunk/src/VBox/Additions/common/VBoxService
- Timestamp:
- Nov 22, 2010 3:50:09 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp
r33854 r34255 331 331 */ 332 332 static int VBoxServiceControlExecProcLoop(PVBOXSERVICECTRLTHREAD pThread, 333 RTPROCESS hProcess, RTMSINTERVAL cM illies, RTPOLLSET hPollSet,333 RTPROCESS hProcess, RTMSINTERVAL cMsTimeout, RTPOLLSET hPollSet, 334 334 PRTPIPE phStdInW, PRTPIPE phStdOutR, PRTPIPE phStdErrR) 335 335 { … … 465 465 */ 466 466 uint32_t cMilliesLeft = RT_INDEFINITE_WAIT; 467 if (cM illies!= RT_INDEFINITE_WAIT)467 if (cMsTimeout != RT_INDEFINITE_WAIT) 468 468 { 469 469 uint64_t u64Now = RTTimeMilliTS(); 470 470 uint64_t cMsElapsed = u64Now - MsStart; 471 if (cMsElapsed >= cM illies)472 { 473 VBoxServiceVerbose(3, "ControlExec: Process timed out (%ums elapsed > %ums timeout), killing ...", cMsElapsed, cM illies);471 if (cMsElapsed >= cMsTimeout) 472 { 473 VBoxServiceVerbose(3, "ControlExec: Process timed out (%ums elapsed > %ums timeout), killing ...", cMsElapsed, cMsTimeout); 474 474 475 475 fProcessTimedOut = true; … … 478 478 { 479 479 if (u64Now - MsProcessKilled > 20*60*1000) 480 break; /* give up after 20 mins*/480 break; /* Give up after 20 mins. */ 481 481 RTProcTerminate(hProcess); 482 482 MsProcessKilled = u64Now; … … 486 486 } 487 487 else 488 cMilliesLeft = cM illies- (uint32_t)cMsElapsed;488 cMilliesLeft = cMsTimeout - (uint32_t)cMsElapsed; 489 489 } 490 490
Note:
See TracChangeset
for help on using the changeset viewer.