vbox的更動 35876 路徑 trunk/src/VBox/Runtime/r3/posix

時間撮記:

2011-2-7 下午02:54:18 (14 年 以前)

作者:

vboxsync

訊息:

thread-posix.cpp: don't use uninitialized variables, fail instead. nits

檔案:

• trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp (修改) (4 筆差異)

trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

@@ -419 +419 @@
 #endif
 
+/** @todo move this into platform specific files. */
 RTR3DECL(int) RTThreadGetExecutionTimeMilli(uint64_t *pKernelTime, uint64_t *pUserTime)
 {
@@ -430 +431 @@
     *pUserTime   = ts.ru_utime.tv_sec * 1000 + ts.ru_utime.tv_usec / 1000;
     return VINF_SUCCESS;
+
 #elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
     /* on Linux, getrusage(RUSAGE_THREAD, ...) is available since 2.6.26 */
@@ -440 +442 @@
     *pUserTime = (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
     return VINF_SUCCESS;
+
 #elif defined(RT_OS_DARWIN)
     thread_basic_info ThreadInfo;
@@ -446 +449 @@
 
     krc = thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t)&ThreadInfo, &Count);
-    Assert(krc == KERN_SUCCESS);
+    AssertReturn(krc == KERN_SUCCESS, RTErrConvertFromDarwinKern(krc));
 
     *pKernelTime = ThreadInfo.system_time.seconds * 1000 + ThreadInfo.system_time.microseconds / 1000;
-    *pUserTime   = ThreadInfo.user_time.seconds * 1000 + ThreadInfo.user_time.microseconds / 1000;;
+    *pUserTime   = ThreadInfo.user_time.seconds   * 1000 + ThreadInfo.user_time.microseconds   / 1000;
 
     return VINF_SUCCESS;