mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-10-26 13:17:40 +00:00
Code Issues 1 Releases Wiki Activity

Make os.clock more meaningful by default.

Browse Source
This commit is contained in:
Calvin Rose
2018-07-08 19:27:11 -04:00
parent 08f6c642d0
commit f92f358279
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/os.c
View File

@@ -92,9 +92,11 @@ static int os_execute(DstArgs args) {
WaitForSingleObject(pi.hProcess, INFINITE); WaitForSingleObject(pi.hProcess, INFINITE);
// Close process and thread handles. // Close process and thread handles.
WORD status = 0;
GetExitCodeProcess(pi.hProcess, &status);
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
DST_RETURN_INTEGER(args, 0); DST_RETURN_INTEGER(args, (int32_t)status);
} }
#else #else
static int os_execute(DstArgs args) { static int os_execute(DstArgs args) {
@@ -193,10 +195,29 @@ static int os_exit(DstArgs args) {
return 0; return 0;
} }
/* Shim for windows */
#ifdef DST_WINDOWS
struct timespec {
long tv_sec;
long tv_nsec;
};
static int clock_gettime(int, struct timespec *spec) {
int64 wintime;
GetSystemTimeAsFileTime((FILETIME*)&wintime);
wintime -= 116444736000000000LL; /* Windows epic is 1601, jan 1 */
spec->tv_sec = wintime / 10000000LL;
/* Resolution is 100 nanoseconds. */
spec->tv_nsec = wintime % 10000000LL * 100;
return 0;
}
#endif
static int os_clock(DstArgs args) { static int os_clock(DstArgs args) {
DST_FIXARITY(args, 0); DST_FIXARITY(args, 0);
clock_t time = clock(); struct timespec tv;
double dtime = time / (double) (CLOCKS_PER_SEC); if (clock_gettime(CLOCK_REALTIME, &tv))
DST_THROW(args, "could not get time");
double dtime = tv.tv_sec + (tv.tv_nsec / 1E9);
DST_RETURN_REAL(args, dtime); DST_RETURN_REAL(args, dtime);
} }