Changeset 99901 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

May 22, 2023 2:15:10 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157544

Message:

IPRT: Cleaned up RTThreadGetExecutionTimeMilli and associated testcase.

Location:

trunk/src/VBox/Runtime/r3

Files:

• os2/thread-os2.cpp (modified) (1 diff)
• posix/thread-posix.cpp (modified) (3 diffs)
• win/thread-win.cpp (modified) (2 diffs)

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

@@ -325 +325 @@
 
 
-RTR3DECL(int) RTThreadGetExecutionTimeMilli(uint64_t *pKernelTime, uint64_t *pUserTime)
-{
+RTR3DECL(int) RTThreadGetExecutionTimeMilli(uint64_t *pcMsKernelTime, uint64_t *pcMsUserTime)
+{
+    RT_NOREF(pcMsKernelTime, pcMsUserTime);
     return VERR_NOT_IMPLEMENTED;
 }

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

@@ -732 +732 @@
 
 /** @todo move this into platform specific files. */
-RTR3DECL(int) RTThreadGetExecutionTimeMilli(uint64_t *pKernelTime, uint64_t *pUserTime)
+RTR3DECL(int) RTThreadGetExecutionTimeMilli(uint64_t *pcMsKernelTime, uint64_t *pcMsUserTime)
 {
 #if defined(RT_OS_SOLARIS)
     struct rusage ts;
-    int rc = getrusage(RUSAGE_LWP, &ts);
-    if (rc)
-        return RTErrConvertFromErrno(rc);
-
-    *pKernelTime = ts.ru_stime.tv_sec * 1000 + ts.ru_stime.tv_usec / 1000;
-    *pUserTime   = ts.ru_utime.tv_sec * 1000 + ts.ru_utime.tv_usec / 1000;
+    int const rc = getrusage(RUSAGE_LWP, &ts);
+    AsserReturn(rc == 0, RTErrConvertFromErrno(rc));
+
+    *pcMsKernelTime = ts.ru_stime.tv_sec * 1000 + ts.ru_stime.tv_usec / 1000;
+    *pcMsUserTime   = 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 */
+    /* on Linux, getrusage(RUSAGE_THREAD, ...) is available since 2.6.26. maybe it's slower? */
     struct timespec ts;
-    int rc = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
-    if (rc)
-        return RTErrConvertFromErrno(rc);
-
-    *pKernelTime = 0;
-    *pUserTime = (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+    int const rc = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
+    AssertReturn(rc == 0, RTErrConvertFromErrno(rc));
+
+    *pcMsKernelTime = 0;
+    *pcMsUserTime   = (uint64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
     return VINF_SUCCESS;
 
@@ -761 +759 @@
     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;
-
+    *pcMsKernelTime = ThreadInfo.system_time.seconds * 1000 + ThreadInfo.system_time.microseconds / 1000;
+    *pcMsUserTime   = ThreadInfo.user_time.seconds   * 1000 + ThreadInfo.user_time.microseconds   / 1000;
     return VINF_SUCCESS;
+
 #elif defined(RT_OS_HAIKU)
     thread_info       ThreadInfo;
@@ -770 +768 @@
     AssertReturn(status == B_OK, RTErrConvertFromErrno(status));
 
-    *pKernelTime = ThreadInfo.kernel_time / 1000;
-    *pUserTime   = ThreadInfo.user_time / 1000;
-
+    *pcMsKernelTime = ThreadInfo.kernel_time / 1000;
+    *pcMsUserTime   = ThreadInfo.user_time / 1000;
     return VINF_SUCCESS;
+
 #else
+    RT_NOREF(pcMsKernelTime, pcMsUserTime);
     return VERR_NOT_IMPLEMENTED;
 #endif

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

@@ -529 +529 @@
 
 
-RTR3DECL(int) RTThreadGetExecutionTimeMilli(uint64_t *pKernelTime, uint64_t *pUserTime)
+RTR3DECL(int) RTThreadGetExecutionTimeMilli(uint64_t *pcMsKernelTime, uint64_t *pcMsUserTime)
 {
     uint64_t u64CreationTime, u64ExitTime, u64KernelTime, u64UserTime;
@@ -535 +535 @@
     if (GetThreadTimes(GetCurrentThread(), (LPFILETIME)&u64CreationTime, (LPFILETIME)&u64ExitTime, (LPFILETIME)&u64KernelTime, (LPFILETIME)&u64UserTime))
     {
-        *pKernelTime = u64KernelTime / 10000;    /* GetThreadTimes returns time in 100 ns units */
-        *pUserTime   = u64UserTime / 10000;    /* GetThreadTimes returns time in 100 ns units */
+        *pcMsKernelTime = u64KernelTime / 10000;    /* GetThreadTimes returns time in 100 ns units */
+        *pcMsUserTime   = u64UserTime / 10000;    /* GetThreadTimes returns time in 100 ns units */
         return VINF_SUCCESS;
     }
 
-    int iLastError = GetLastError();
-    AssertMsgFailed(("GetThreadTimes failed, LastError=%d\n", iLastError));
-    return RTErrConvertFromWin32(iLastError);
+    DWORD const dwErr = GetLastError();
+    AssertMsgFailed(("GetThreadTimes failed, LastError=%d\n", dwErr));
+    return RTErrConvertFromWin32(dwErr);
 }