less invasive error handling
This commit is contained in:
Vitor Santos Costa
485
os/time.c
485
os/time.c
@@ -27,10 +27,10 @@
|
||||
|
||||
#if THREADS
|
||||
#define StartOfTimes (*(LOCAL_ThreadHandle.start_of_timesp))
|
||||
#define last_time (*(LOCAL_ThreadHandle.last_timep))
|
||||
#define last_time (*(LOCAL_ThreadHandle.last_timep))
|
||||
|
||||
#define StartOfTimes_sys (*(LOCAL_ThreadHandle.start_of_times_sysp))
|
||||
#define last_time_sys (*(LOCAL_ThreadHandle.last_time_sysp))
|
||||
#define last_time_sys (*(LOCAL_ThreadHandle.last_time_sysp))
|
||||
|
||||
#else
|
||||
/* since the point YAP was started */
|
||||
@@ -45,82 +45,71 @@ static struct timeval StartOfTimes_sys;
|
||||
#endif
|
||||
|
||||
/* store user time in this variable */
|
||||
void
|
||||
Yap_InitTime (int wid)
|
||||
{
|
||||
struct rusage rusage;
|
||||
void Yap_InitTime(int wid) {
|
||||
struct rusage rusage;
|
||||
|
||||
#if THREADS
|
||||
REMOTE_ThreadHandle(wid).start_of_timesp = (struct timeval *)malloc(sizeof(struct timeval));
|
||||
REMOTE_ThreadHandle(wid).last_timep = (struct timeval *)malloc(sizeof(struct timeval));
|
||||
REMOTE_ThreadHandle(wid).start_of_times_sysp = (struct timeval *)malloc(sizeof(struct timeval));
|
||||
REMOTE_ThreadHandle(wid).last_time_sysp = (struct timeval *)malloc(sizeof(struct timeval));
|
||||
REMOTE_ThreadHandle(wid).start_of_timesp =
|
||||
(struct timeval *)malloc(sizeof(struct timeval));
|
||||
REMOTE_ThreadHandle(wid).last_timep =
|
||||
(struct timeval *)malloc(sizeof(struct timeval));
|
||||
REMOTE_ThreadHandle(wid).start_of_times_sysp =
|
||||
(struct timeval *)malloc(sizeof(struct timeval));
|
||||
REMOTE_ThreadHandle(wid).last_time_sysp =
|
||||
(struct timeval *)malloc(sizeof(struct timeval));
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).tv_sec =
|
||||
(*REMOTE_ThreadHandle(wid).start_of_timesp).tv_sec =
|
||||
rusage.ru_utime.tv_sec;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_timesp).tv_sec =
|
||||
rusage.ru_utime.tv_sec;
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).tv_usec =
|
||||
(*REMOTE_ThreadHandle(wid).start_of_timesp).tv_usec =
|
||||
rusage.ru_utime.tv_usec;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_timesp).tv_usec =
|
||||
rusage.ru_utime.tv_usec;
|
||||
(*REMOTE_ThreadHandle(wid).last_time_sysp).tv_sec =
|
||||
(*REMOTE_ThreadHandle(wid).start_of_times_sysp).tv_sec =
|
||||
rusage.ru_stime.tv_sec;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_times_sysp).tv_sec =
|
||||
rusage.ru_stime.tv_sec;
|
||||
(*REMOTE_ThreadHandle(wid).last_time_sysp).tv_usec =
|
||||
(*REMOTE_ThreadHandle(wid).start_of_times_sysp).tv_usec =
|
||||
rusage.ru_stime.tv_usec;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_times_sysp).tv_usec =
|
||||
rusage.ru_stime.tv_usec;
|
||||
#else
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
last_time.tv_sec =
|
||||
StartOfTimes.tv_sec =
|
||||
rusage.ru_utime.tv_sec;
|
||||
last_time.tv_usec =
|
||||
StartOfTimes.tv_usec =
|
||||
rusage.ru_utime.tv_usec;
|
||||
last_time_sys.tv_sec =
|
||||
StartOfTimes_sys.tv_sec =
|
||||
rusage.ru_stime.tv_sec;
|
||||
last_time_sys.tv_usec =
|
||||
StartOfTimes_sys.tv_usec =
|
||||
rusage.ru_stime.tv_usec;
|
||||
last_time.tv_sec = StartOfTimes.tv_sec = rusage.ru_utime.tv_sec;
|
||||
last_time.tv_usec = StartOfTimes.tv_usec = rusage.ru_utime.tv_usec;
|
||||
last_time_sys.tv_sec = StartOfTimes_sys.tv_sec = rusage.ru_stime.tv_sec;
|
||||
last_time_sys.tv_usec = StartOfTimes_sys.tv_usec = rusage.ru_stime.tv_usec;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
UInt
|
||||
Yap_cputime ( void )
|
||||
{
|
||||
UInt Yap_cputime(void) {
|
||||
CACHE_REGS
|
||||
struct rusage rusage;
|
||||
struct rusage rusage;
|
||||
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
return((rusage.ru_utime.tv_sec - StartOfTimes.tv_sec)) * 1000 +
|
||||
((rusage.ru_utime.tv_usec - StartOfTimes.tv_usec) / 1000);
|
||||
return ((rusage.ru_utime.tv_sec - StartOfTimes.tv_sec)) * 1000 +
|
||||
((rusage.ru_utime.tv_usec - StartOfTimes.tv_usec) / 1000);
|
||||
}
|
||||
|
||||
void Yap_cputime_interval(Int *now,Int *interval)
|
||||
{
|
||||
void Yap_cputime_interval(Int *now, Int *interval) {
|
||||
CACHE_REGS
|
||||
struct rusage rusage;
|
||||
struct rusage rusage;
|
||||
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
*now = (rusage.ru_utime.tv_sec - StartOfTimes.tv_sec) * 1000 +
|
||||
(rusage.ru_utime.tv_usec - StartOfTimes.tv_usec) / 1000;
|
||||
(rusage.ru_utime.tv_usec - StartOfTimes.tv_usec) / 1000;
|
||||
*interval = (rusage.ru_utime.tv_sec - last_time.tv_sec) * 1000 +
|
||||
(rusage.ru_utime.tv_usec - last_time.tv_usec) / 1000;
|
||||
(rusage.ru_utime.tv_usec - last_time.tv_usec) / 1000;
|
||||
last_time.tv_usec = rusage.ru_utime.tv_usec;
|
||||
last_time.tv_sec = rusage.ru_utime.tv_sec;
|
||||
}
|
||||
|
||||
void Yap_systime_interval(Int *now,Int *interval)
|
||||
{
|
||||
void Yap_systime_interval(Int *now, Int *interval) {
|
||||
CACHE_REGS
|
||||
struct rusage rusage;
|
||||
struct rusage rusage;
|
||||
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
*now = (rusage.ru_stime.tv_sec - StartOfTimes_sys.tv_sec) * 1000 +
|
||||
(rusage.ru_stime.tv_usec - StartOfTimes_sys.tv_usec) / 1000;
|
||||
(rusage.ru_stime.tv_usec - StartOfTimes_sys.tv_usec) / 1000;
|
||||
*interval = (rusage.ru_stime.tv_sec - last_time_sys.tv_sec) * 1000 +
|
||||
(rusage.ru_stime.tv_usec - last_time_sys.tv_usec) / 1000;
|
||||
(rusage.ru_stime.tv_usec - last_time_sys.tv_usec) / 1000;
|
||||
last_time_sys.tv_usec = rusage.ru_stime.tv_usec;
|
||||
last_time_sys.tv_sec = rusage.ru_stime.tv_sec;
|
||||
}
|
||||
@@ -132,24 +121,25 @@ void Yap_systime_interval(Int *now,Int *interval)
|
||||
/* This is stolen from the Linux kernel.
|
||||
The problem is that mingw32 does not seem to have acces to div */
|
||||
#ifndef do_div
|
||||
#define do_div(n,base) ({ \
|
||||
unsigned long __upper, __low, __high, __mod; \
|
||||
asm("":"=a" (__low), "=d" (__high):"A" (n)); \
|
||||
__upper = __high; \
|
||||
if (__high) { \
|
||||
__upper = __high % (base); \
|
||||
__high = __high / (base); \
|
||||
} \
|
||||
asm("divl %2":"=a" (__low), "=d" (__mod):"rm" (base), "0" (__low), "1" (__upper)); \
|
||||
asm("":"=A" (n):"a" (__low),"d" (__high)); \
|
||||
__mod; \
|
||||
})
|
||||
#define do_div(n, base) \
|
||||
({ \
|
||||
unsigned long __upper, __low, __high, __mod; \
|
||||
asm("" : "=a"(__low), "=d"(__high) : "A"(n)); \
|
||||
__upper = __high; \
|
||||
if (__high) { \
|
||||
__upper = __high % (base); \
|
||||
__high = __high / (base); \
|
||||
} \
|
||||
asm("divl %2" \
|
||||
: "=a"(__low), "=d"(__mod) \
|
||||
: "rm"(base), "0"(__low), "1"(__upper)); \
|
||||
asm("" : "=A"(n) : "a"(__low), "d"(__high)); \
|
||||
__mod; \
|
||||
})
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#include <time.h>
|
||||
|
||||
static FILETIME StartOfTimes, last_time;
|
||||
@@ -159,148 +149,134 @@ static FILETIME StartOfTimes_sys, last_time_sys;
|
||||
static clock_t TimesStartOfTimes, Times_last_time;
|
||||
|
||||
/* store user time in this variable */
|
||||
void
|
||||
Yap_InitTime (int wid)
|
||||
{
|
||||
void Yap_InitTime(int wid) {
|
||||
HANDLE hProcess = GetCurrentProcess();
|
||||
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime)) {
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime,
|
||||
&UserTime)) {
|
||||
/* WIN98 */
|
||||
clock_t t;
|
||||
t = clock ();
|
||||
t = clock();
|
||||
Times_last_time = TimesStartOfTimes = t;
|
||||
} else {
|
||||
#if THREADS
|
||||
REMOTE_ThreadHandle(wid).start_of_timesp = (struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
REMOTE_ThreadHandle(wid).last_timep = (struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
REMOTE_ThreadHandle(wid).start_of_times_sysp = (struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
REMOTE_ThreadHandle(wid).last_time_sysp = (struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
REMOTE_ThreadHandle(wid).start_of_timesp =
|
||||
(struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
REMOTE_ThreadHandle(wid).last_timep =
|
||||
(struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
REMOTE_ThreadHandle(wid).start_of_times_sysp =
|
||||
(struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
REMOTE_ThreadHandle(wid).last_time_sysp =
|
||||
(struct _FILETIME *)malloc(sizeof(FILETIME));
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).dwLowDateTime =
|
||||
UserTime.dwLowDateTime;
|
||||
UserTime.dwLowDateTime;
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).dwHighDateTime =
|
||||
UserTime.dwHighDateTime;
|
||||
UserTime.dwHighDateTime;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_timesp).dwLowDateTime =
|
||||
UserTime.dwLowDateTime;
|
||||
UserTime.dwLowDateTime;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_timesp).dwHighDateTime =
|
||||
UserTime.dwHighDateTime;
|
||||
UserTime.dwHighDateTime;
|
||||
(*REMOTE_ThreadHandle(wid).last_time_sysp).dwLowDateTime =
|
||||
KernelTime.dwLowDateTime;
|
||||
KernelTime.dwLowDateTime;
|
||||
(*REMOTE_ThreadHandle(wid).last_time_sysp).dwHighDateTime =
|
||||
KernelTime.dwHighDateTime;
|
||||
KernelTime.dwHighDateTime;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_times_sysp).dwLowDateTime =
|
||||
KernelTime.dwLowDateTime;
|
||||
KernelTime.dwLowDateTime;
|
||||
(*REMOTE_ThreadHandle(wid).start_of_times_sysp).dwHighDateTime =
|
||||
KernelTime.dwHighDateTime;
|
||||
KernelTime.dwHighDateTime;
|
||||
#else
|
||||
last_time.dwLowDateTime =
|
||||
UserTime.dwLowDateTime;
|
||||
last_time.dwHighDateTime =
|
||||
UserTime.dwHighDateTime;
|
||||
StartOfTimes.dwLowDateTime =
|
||||
UserTime.dwLowDateTime;
|
||||
StartOfTimes.dwHighDateTime =
|
||||
UserTime.dwHighDateTime;
|
||||
last_time_sys.dwLowDateTime =
|
||||
KernelTime.dwLowDateTime;
|
||||
last_time_sys.dwHighDateTime =
|
||||
KernelTime.dwHighDateTime;
|
||||
StartOfTimes_sys.dwLowDateTime =
|
||||
KernelTime.dwLowDateTime;
|
||||
StartOfTimes_sys.dwHighDateTime =
|
||||
KernelTime.dwHighDateTime;
|
||||
last_time.dwLowDateTime = UserTime.dwLowDateTime;
|
||||
last_time.dwHighDateTime = UserTime.dwHighDateTime;
|
||||
StartOfTimes.dwLowDateTime = UserTime.dwLowDateTime;
|
||||
StartOfTimes.dwHighDateTime = UserTime.dwHighDateTime;
|
||||
last_time_sys.dwLowDateTime = KernelTime.dwLowDateTime;
|
||||
last_time_sys.dwHighDateTime = KernelTime.dwHighDateTime;
|
||||
StartOfTimes_sys.dwLowDateTime = KernelTime.dwLowDateTime;
|
||||
StartOfTimes_sys.dwHighDateTime = KernelTime.dwHighDateTime;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
static unsigned long long int
|
||||
sub_utime(FILETIME t1, FILETIME t2)
|
||||
{
|
||||
static unsigned long long int sub_utime(FILETIME t1, FILETIME t2) {
|
||||
ULARGE_INTEGER u[2];
|
||||
memcpy((void *)u,(void *)&t1,sizeof(FILETIME));
|
||||
memcpy((void *)(u+1),(void *)&t2,sizeof(FILETIME));
|
||||
return
|
||||
u[0].QuadPart - u[1].QuadPart;
|
||||
memcpy((void *)u, (void *)&t1, sizeof(FILETIME));
|
||||
memcpy((void *)(u + 1), (void *)&t2, sizeof(FILETIME));
|
||||
return u[0].QuadPart - u[1].QuadPart;
|
||||
}
|
||||
#endif
|
||||
|
||||
UInt
|
||||
Yap_cputime ( void )
|
||||
{
|
||||
UInt Yap_cputime(void) {
|
||||
HANDLE hProcess = GetCurrentProcess();
|
||||
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime)) {
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime,
|
||||
&UserTime)) {
|
||||
clock_t t;
|
||||
t = clock ();
|
||||
return(((t - TimesStartOfTimes)*1000) / CLOCKS_PER_SEC);
|
||||
t = clock();
|
||||
return (((t - TimesStartOfTimes) * 1000) / CLOCKS_PER_SEC);
|
||||
} else {
|
||||
#ifdef __GNUC__
|
||||
unsigned long long int t =
|
||||
sub_utime(UserTime,StartOfTimes);
|
||||
do_div(t,10000);
|
||||
return((Int)t);
|
||||
unsigned long long int t = sub_utime(UserTime, StartOfTimes);
|
||||
do_div(t, 10000);
|
||||
return ((Int)t);
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
__int64 t = *(__int64 *)&UserTime - *(__int64 *)&StartOfTimes;
|
||||
return((Int)(t/10000));
|
||||
return ((Int)(t / 10000));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
void Yap_cputime_interval(Int *now,Int *interval)
|
||||
{
|
||||
void Yap_cputime_interval(Int *now, Int *interval) {
|
||||
HANDLE hProcess = GetCurrentProcess();
|
||||
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime)) {
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime,
|
||||
&UserTime)) {
|
||||
clock_t t;
|
||||
t = clock ();
|
||||
*now = ((t - TimesStartOfTimes)*1000) / CLOCKS_PER_SEC;
|
||||
t = clock();
|
||||
*now = ((t - TimesStartOfTimes) * 1000) / CLOCKS_PER_SEC;
|
||||
*interval = (t - Times_last_time) * 1000 / CLOCKS_PER_SEC;
|
||||
Times_last_time = t;
|
||||
} else {
|
||||
#ifdef __GNUC__
|
||||
unsigned long long int t1 =
|
||||
sub_utime(UserTime, StartOfTimes);
|
||||
unsigned long long int t2 =
|
||||
sub_utime(UserTime, last_time);
|
||||
do_div(t1,10000);
|
||||
unsigned long long int t1 = sub_utime(UserTime, StartOfTimes);
|
||||
unsigned long long int t2 = sub_utime(UserTime, last_time);
|
||||
do_div(t1, 10000);
|
||||
*now = (Int)t1;
|
||||
do_div(t2,10000);
|
||||
do_div(t2, 10000);
|
||||
*interval = (Int)t2;
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
__int64 t1 = *(__int64 *)&UserTime - *(__int64 *)&StartOfTimes;
|
||||
__int64 t2 = *(__int64 *)&UserTime - *(__int64 *)&last_time;
|
||||
*now = (Int)(t1/10000);
|
||||
*interval = (Int)(t2/10000);
|
||||
*now = (Int)(t1 / 10000);
|
||||
*interval = (Int)(t2 / 10000);
|
||||
#endif
|
||||
last_time.dwLowDateTime = UserTime.dwLowDateTime;
|
||||
last_time.dwHighDateTime = UserTime.dwHighDateTime;
|
||||
}
|
||||
}
|
||||
|
||||
void Yap_systime_interval(Int *now,Int *interval)
|
||||
{
|
||||
void Yap_systime_interval(Int *now, Int *interval) {
|
||||
HANDLE hProcess = GetCurrentProcess();
|
||||
FILETIME CreationTime, ExitTime, KernelTime, UserTime;
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime)) {
|
||||
if (!GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime,
|
||||
&UserTime)) {
|
||||
*now = *interval = 0; /* not available */
|
||||
} else {
|
||||
#ifdef __GNUC__
|
||||
unsigned long long int t1 =
|
||||
sub_utime(KernelTime, StartOfTimes_sys);
|
||||
unsigned long long int t2 =
|
||||
sub_utime(KernelTime, last_time_sys);
|
||||
do_div(t1,10000);
|
||||
unsigned long long int t1 = sub_utime(KernelTime, StartOfTimes_sys);
|
||||
unsigned long long int t2 = sub_utime(KernelTime, last_time_sys);
|
||||
do_div(t1, 10000);
|
||||
*now = (Int)t1;
|
||||
do_div(t2,10000);
|
||||
do_div(t2, 10000);
|
||||
*interval = (Int)t2;
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
__int64 t1 = *(__int64 *)&KernelTime - *(__int64 *)&StartOfTimes_sys;
|
||||
__int64 t2 = *(__int64 *)&KernelTime - *(__int64 *)&last_time_sys;
|
||||
*now = (Int)(t1/10000);
|
||||
*interval = (Int)(t2/10000);
|
||||
*now = (Int)(t1 / 10000);
|
||||
*interval = (Int)(t2 / 10000);
|
||||
#endif
|
||||
last_time_sys.dwLowDateTime = KernelTime.dwLowDateTime;
|
||||
last_time_sys.dwHighDateTime = KernelTime.dwHighDateTime;
|
||||
@@ -313,7 +289,7 @@ void Yap_systime_interval(Int *now,Int *interval)
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#define TicksPerSec CLOCKS_PER_SEC
|
||||
#define TicksPerSec CLOCKS_PER_SEC
|
||||
|
||||
#else
|
||||
|
||||
@@ -329,16 +305,17 @@ void Yap_systime_interval(Int *now,Int *interval)
|
||||
#include <limits.h>
|
||||
#endif
|
||||
|
||||
#define TicksPerSec CLK_TCK
|
||||
#define TicksPerSec CLK_TCK
|
||||
#endif
|
||||
|
||||
#if defined(__alpha) || defined(__FreeBSD__) || defined(__linux__) || defined(__DragonFly__)
|
||||
#if defined(__alpha) || defined(__FreeBSD__) || defined(__linux__) || \
|
||||
defined(__DragonFly__)
|
||||
|
||||
#if HAVE_TIME_H
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
#define TicksPerSec sysconf(_SC_CLK_TCK)
|
||||
#define TicksPerSec sysconf(_SC_CLK_TCK)
|
||||
|
||||
#endif
|
||||
|
||||
@@ -353,37 +330,31 @@ static clock_t StartOfTimes, last_time;
|
||||
static clock_t StartOfTimes_sys, last_time_sys;
|
||||
|
||||
/* store user time in this variable */
|
||||
static void
|
||||
InitTime (void)
|
||||
{
|
||||
static void InitTime(void) {
|
||||
struct tms t;
|
||||
times (&t);
|
||||
times(&t);
|
||||
(*REMOTE_ThreadHandle(wid).last_timep) = StartOfTimes = t.tms_utime;
|
||||
last_time_sys = StartOfTimes_sys = t.tms_stime;
|
||||
}
|
||||
|
||||
UInt
|
||||
Yap_cputime (void)
|
||||
{
|
||||
UInt Yap_cputime(void) {
|
||||
struct tms t;
|
||||
times(&t);
|
||||
return((t.tms_utime - StartOfTimes)*1000 / TicksPerSec);
|
||||
return ((t.tms_utime - StartOfTimes) * 1000 / TicksPerSec);
|
||||
}
|
||||
|
||||
void Yap_cputime_interval(Int *now,Int *interval)
|
||||
{
|
||||
void Yap_cputime_interval(Int *now, Int *interval) {
|
||||
struct tms t;
|
||||
times (&t);
|
||||
*now = ((t.tms_utime - StartOfTimes)*1000) / TicksPerSec;
|
||||
times(&t);
|
||||
*now = ((t.tms_utime - StartOfTimes) * 1000) / TicksPerSec;
|
||||
*interval = (t.tms_utime - last_time) * 1000 / TicksPerSec;
|
||||
last_time = t.tms_utime;
|
||||
}
|
||||
|
||||
void Yap_systime_interval(Int *now,Int *interval)
|
||||
{
|
||||
void Yap_systime_interval(Int *now, Int *interval) {
|
||||
struct tms t;
|
||||
times (&t);
|
||||
*now = ((t.tms_stime - StartOfTimes_sys)*1000) / TicksPerSec;
|
||||
times(&t);
|
||||
*now = ((t.tms_stime - StartOfTimes_sys) * 1000) / TicksPerSec;
|
||||
*interval = (t.tms_stime - last_time_sys) * 1000 / TicksPerSec;
|
||||
last_time_sys = t.tms_stime;
|
||||
}
|
||||
@@ -401,47 +372,42 @@ static struct timeval StartOfTimes;
|
||||
static struct timeval last_time;
|
||||
|
||||
/* store user time in this variable */
|
||||
static void
|
||||
InitTime (int wid)
|
||||
{
|
||||
struct timeval tp;
|
||||
static void InitTime(int wid) {
|
||||
struct timeval tp;
|
||||
|
||||
gettimeofday(&tp,NULL);
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).tv_sec = (*REMOTE_ThreadHandle.start_of_timesp(wid)).tv_sec = tp.tv_sec;
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).tv_usec = (*REMOTE_ThreadHandle.start_of_timesp(wid)).tv_usec = tp.tv_usec;
|
||||
gettimeofday(&tp, NULL);
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).tv_sec =
|
||||
(*REMOTE_ThreadHandle.start_of_timesp(wid)).tv_sec = tp.tv_sec;
|
||||
(*REMOTE_ThreadHandle(wid).last_timep).tv_usec =
|
||||
(*REMOTE_ThreadHandle.start_of_timesp(wid)).tv_usec = tp.tv_usec;
|
||||
}
|
||||
|
||||
UInt Yap_cputime(void) {
|
||||
struct timeval tp;
|
||||
|
||||
UInt
|
||||
Yap_cputime (void)
|
||||
{
|
||||
struct timeval tp;
|
||||
|
||||
gettimeofday(&tp,NULL);
|
||||
gettimeofday(&tp, NULL);
|
||||
if (StartOfTimes.tv_usec > tp.tv_usec)
|
||||
return((tp.tv_sec - StartOfTimes.tv_sec - 1) * 1000 +
|
||||
(StartOfTimes.tv_usec - tp.tv_usec) /1000);
|
||||
return ((tp.tv_sec - StartOfTimes.tv_sec - 1) * 1000 +
|
||||
(StartOfTimes.tv_usec - tp.tv_usec) / 1000);
|
||||
else
|
||||
return((tp.tv_sec - StartOfTimes.tv_sec)) * 1000 +
|
||||
((tp.tv_usec - StartOfTimes.tv_usec) / 1000);
|
||||
return ((tp.tv_sec - StartOfTimes.tv_sec)) * 1000 +
|
||||
((tp.tv_usec - StartOfTimes.tv_usec) / 1000);
|
||||
}
|
||||
|
||||
void Yap_cputime_interval(Int *now,Int *interval)
|
||||
{
|
||||
struct timeval tp;
|
||||
void Yap_cputime_interval(Int *now, Int *interval) {
|
||||
struct timeval tp;
|
||||
|
||||
gettimeofday(&tp,NULL);
|
||||
gettimeofday(&tp, NULL);
|
||||
*now = (tp.tv_sec - StartOfTimes.tv_sec) * 1000 +
|
||||
(tp.tv_usec - StartOfTimes.tv_usec) / 1000;
|
||||
(tp.tv_usec - StartOfTimes.tv_usec) / 1000;
|
||||
*interval = (tp.tv_sec - last_time.tv_sec) * 1000 +
|
||||
(tp.tv_usec - last_time.tv_usec) / 1000;
|
||||
(tp.tv_usec - last_time.tv_usec) / 1000;
|
||||
last_time.tv_usec = tp.tv_usec;
|
||||
last_time.tv_sec = tp.tv_sec;
|
||||
}
|
||||
|
||||
void Yap_systime_interval(Int *now,Int *interval)
|
||||
{
|
||||
*now = *interval = 0; /* not available */
|
||||
void Yap_systime_interval(Int *now, Int *interval) {
|
||||
*now = *interval = 0; /* not available */
|
||||
}
|
||||
|
||||
#endif /* SIMICS */
|
||||
@@ -450,16 +416,12 @@ void Yap_systime_interval(Int *now,Int *interval)
|
||||
/* This code is not working properly. I left it here to help future ports */
|
||||
#ifdef MPW
|
||||
|
||||
#include <files.h>
|
||||
#include <Events.h>
|
||||
#include <files.h>
|
||||
|
||||
#define TicksPerSec 60.0
|
||||
|
||||
static double
|
||||
real_cputime ()
|
||||
{
|
||||
return (((double) TickCount ()) / TicksPerSec);
|
||||
}
|
||||
static double real_cputime() { return (((double)TickCount()) / TicksPerSec); }
|
||||
|
||||
#endif /* MPW */
|
||||
|
||||
@@ -469,18 +431,13 @@ real_cputime ()
|
||||
|
||||
static long *ptime;
|
||||
|
||||
gettime ()
|
||||
{
|
||||
*ptime = *(long *) 0x462;
|
||||
}
|
||||
gettime() { *ptime = *(long *)0x462; }
|
||||
|
||||
static double
|
||||
real_cputime ()
|
||||
{
|
||||
static double real_cputime() {
|
||||
long thetime;
|
||||
ptime = &thetime;
|
||||
xbios (38, gettime);
|
||||
return (((double) thetime) / (Getrez () == 2 ? 70 : 60));
|
||||
xbios(38, gettime);
|
||||
return (((double)thetime) / (Getrez() == 2 ? 70 : 60));
|
||||
}
|
||||
|
||||
#endif /* LATTICE */
|
||||
@@ -492,18 +449,12 @@ real_cputime ()
|
||||
|
||||
static long *ptime;
|
||||
|
||||
static long
|
||||
readtime ()
|
||||
{
|
||||
return (*((long *) 0x4ba));
|
||||
}
|
||||
static long readtime() { return (*((long *)0x4ba)); }
|
||||
|
||||
static double
|
||||
real_cputime ()
|
||||
{
|
||||
static double real_cputime() {
|
||||
long time;
|
||||
|
||||
time = Supexec (readtime);
|
||||
time = Supexec(readtime);
|
||||
return (time / 200.0);
|
||||
}
|
||||
|
||||
@@ -518,11 +469,7 @@ real_cputime ()
|
||||
|
||||
#define TicksPerSec 60.0
|
||||
|
||||
static double
|
||||
real_cputime ()
|
||||
{
|
||||
return (((double) TickCount ()) / TicksPerSec);
|
||||
}
|
||||
static double real_cputime() { return (((double)TickCount()) / TicksPerSec); }
|
||||
|
||||
#endif /* LIGHT */
|
||||
|
||||
@@ -540,48 +487,35 @@ uint64_t Yap_StartOfWTimes;
|
||||
|
||||
/* since the point YAP was started */
|
||||
|
||||
void
|
||||
Yap_InitWTime (void)
|
||||
{
|
||||
Yap_StartOfWTimes = (uint64_t)gethrtime();
|
||||
}
|
||||
void Yap_InitWTime(void) { Yap_StartOfWTimes = (uint64_t)gethrtime(); }
|
||||
|
||||
/// returns time since Jan 1 1980 in nano-seconds
|
||||
uint64_t Yap_walltime(uint64_t old)
|
||||
{
|
||||
hrtime_t tp = gethrtime();
|
||||
/* return time in milliseconds */
|
||||
return = (uint64_t)tp;
|
||||
uint64_t Yap_walltime(uint64_t old) {
|
||||
hrtime_t tp = gethrtime();
|
||||
/* return time in milliseconds */
|
||||
return (uint64_t)tp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#elif HAVE_GETTIMEOFDAY
|
||||
|
||||
/* since the point YAP was started */
|
||||
/* store user time in this variable */
|
||||
void
|
||||
Yap_InitWTime (void)
|
||||
{
|
||||
struct timeval tp;
|
||||
void Yap_InitWTime(void) {
|
||||
struct timeval tp;
|
||||
|
||||
gettimeofday(&tp, NULL);
|
||||
Yap_StartOfWTimes = (uint64_t)tp.tv_sec * 1000000000 + (uint64_t)tp.tv_usec * 1000;
|
||||
gettimeofday(&tp, NULL);
|
||||
Yap_StartOfWTimes =
|
||||
(uint64_t)tp.tv_sec * 1000000000 + (uint64_t)tp.tv_usec * 1000;
|
||||
}
|
||||
|
||||
/// returns time in nano-secs since the epoch
|
||||
uint64_t Yap_walltime(void) {
|
||||
struct timeval tp;
|
||||
|
||||
/// returns time in nano-secs since the epoch
|
||||
uint64_t
|
||||
Yap_walltime(void)
|
||||
{
|
||||
struct timeval tp;
|
||||
|
||||
gettimeofday(&tp, NULL);
|
||||
return (uint64_t)tp.tv_sec * 1000000000 + (uint64_t)tp.tv_usec * 1000;
|
||||
gettimeofday(&tp, NULL);
|
||||
return (uint64_t)tp.tv_sec * 1000000000 + (uint64_t)tp.tv_usec * 1000;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#elif defined(_WIN32)
|
||||
|
||||
#include <sys/timeb.h>
|
||||
@@ -591,67 +525,50 @@ Yap_walltime(void)
|
||||
static LARGE_INTEGER Frequency;
|
||||
|
||||
/* store user time in this variable */
|
||||
void
|
||||
Yap_InitWTime (void)
|
||||
{
|
||||
LARGE_INTEGER ElapsedNanoseconds;
|
||||
QueryPerformanceFrequency(&Frequency);
|
||||
QueryPerformanceCounter(&ElapsedNanoseconds);
|
||||
ElapsedNanoseconds.QuadPart *= 1000000;
|
||||
ElapsedNanoseconds.QuadPart /= Frequency.QuadPart;
|
||||
Yap_StartOfWTimes = (uint64_t)ElapsedNanoseconds.QuadPart;
|
||||
void Yap_InitWTime(void) {
|
||||
LARGE_INTEGER ElapsedNanoseconds;
|
||||
QueryPerformanceFrequency(&Frequency);
|
||||
QueryPerformanceCounter(&ElapsedNanoseconds);
|
||||
ElapsedNanoseconds.QuadPart *= 1000000;
|
||||
ElapsedNanoseconds.QuadPart /= Frequency.QuadPart;
|
||||
Yap_StartOfWTimes = (uint64_t)ElapsedNanoseconds.QuadPart;
|
||||
}
|
||||
|
||||
uint64_t Yap_walltime(void) {
|
||||
LARGE_INTEGER ElapsedNanoseconds;
|
||||
QueryPerformanceCounter(&ElapsedNanoseconds);
|
||||
//
|
||||
// We now have the elapsed number of ticks, along with the
|
||||
// number of ticks-per-second. We use these values
|
||||
// to convert to the number of elapsed microseconds.
|
||||
// To guard against loss-of-precision, we convert
|
||||
// to microseconds *before* dividing by ticks-per-second.
|
||||
//
|
||||
|
||||
|
||||
uint64_t
|
||||
Yap_walltime (void)
|
||||
{
|
||||
LARGE_INTEGER ElapsedNanoseconds;
|
||||
QueryPerformanceCounter(&ElapsedNanoseconds);
|
||||
//
|
||||
// We now have the elapsed number of ticks, along with the
|
||||
// number of ticks-per-second. We use these values
|
||||
// to convert to the number of elapsed microseconds.
|
||||
// To guard against loss-of-precision, we convert
|
||||
// to microseconds *before* dividing by ticks-per-second.
|
||||
//
|
||||
|
||||
ElapsedNanoseconds.QuadPart *= 1000000;
|
||||
ElapsedNanoseconds.QuadPart /= Frequency.QuadPart;
|
||||
return ElapsedNanoseconds.QuadPart;
|
||||
ElapsedNanoseconds.QuadPart *= 1000000;
|
||||
ElapsedNanoseconds.QuadPart /= Frequency.QuadPart;
|
||||
return ElapsedNanoseconds.QuadPart;
|
||||
}
|
||||
|
||||
#elif HAVE_TIMES
|
||||
|
||||
/* store user time in this variable */
|
||||
void
|
||||
Yap_InitWTime (void)
|
||||
{
|
||||
void Yap_InitWTime(void) {
|
||||
// start thread 0
|
||||
REMOTE_LastWTime(0) =
|
||||
Yap_StartOfWTimes = ((uint64_t)times(NULL))*10000000/TicksPerSec;
|
||||
REMOTE_LastWTime(0) = Yap_StartOfWTimes =
|
||||
((uint64_t)times(NULL)) * 10000000 / TicksPerSec;
|
||||
}
|
||||
|
||||
uint64_t
|
||||
Yap_walltime (void)
|
||||
{
|
||||
uint64_t Yap_walltime(void) {
|
||||
clock_t t;
|
||||
t = times(NULL);
|
||||
return = ((uint64_t)times(NULL)) * 10000000 / TicksPerSec;
|
||||
}
|
||||
|
||||
#endif /* HAVE_TIMES */
|
||||
void
|
||||
Yap_ReInitWTime (void)
|
||||
{
|
||||
Yap_InitWTime();
|
||||
}
|
||||
void Yap_ReInitWTime(void) { Yap_InitWTime(); }
|
||||
|
||||
|
||||
void
|
||||
Yap_InitTimePreds(void)
|
||||
{
|
||||
/* can only do after heap is initialized */
|
||||
Yap_InitWTime();
|
||||
void Yap_InitTimePreds(void) {
|
||||
/* can only do after heap is initialized */
|
||||
Yap_InitWTime();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user