Browse Source

Add default return value for system::getTime() and getThreadTime().

tags/v2.4.1
Andrew Belt 1 year ago
parent
commit
83737b6467
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      src/system.cpp

+ 6
- 4
src/system.cpp View File

@@ -788,16 +788,16 @@ double getTime() {
LARGE_INTEGER counter; LARGE_INTEGER counter;
QueryPerformanceCounter(&counter); QueryPerformanceCounter(&counter);
return (counter.QuadPart - startCounter) * counterTime; return (counter.QuadPart - startCounter) * counterTime;
#endif
#if defined ARCH_LIN
#elif defined ARCH_LIN
struct timespec ts; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC_RAW, &ts); clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
int64_t time = int64_t(ts.tv_sec) * 1000000000LL + ts.tv_nsec; int64_t time = int64_t(ts.tv_sec) * 1000000000LL + ts.tv_nsec;
return (time - startTime) / 1e9; return (time - startTime) / 1e9;
#endif
#if defined ARCH_MAC
#elif defined ARCH_MAC
int64_t counter = mach_absolute_time(); int64_t counter = mach_absolute_time();
return (counter - startCounter) * counterTime; return (counter - startCounter) * counterTime;
#else
return 0.0;
#endif #endif
} }


@@ -833,6 +833,8 @@ double getThreadTime() {
if (GetThreadTimes(GetCurrentThread(), &creationTime, &exitTime, &kernelTime, &userTime) == 0) if (GetThreadTimes(GetCurrentThread(), &creationTime, &exitTime, &kernelTime, &userTime) == 0)
return 0.0; return 0.0;
return ((uint64_t(userTime.dwHighDateTime) << 32) + userTime.dwLowDateTime) * 1e-7; return ((uint64_t(userTime.dwHighDateTime) << 32) + userTime.dwLowDateTime) * 1e-7;
#else
return 0.0;
#endif #endif
} }




Loading…
Cancel
Save