diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix WIN32 complaints

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1889 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2007-05-26 08:19:33 +00:00
parent dc9ab3b1c7
commit 7132173dbd
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
C/sysbits.c
View File

@ -39,7 +39,7 @@ static char SccsId[] = "%W% %G%";
#if HAVE_WINDOWS_H #if HAVE_WINDOWS_H
#include <windows.h> #include <windows.h>
#endif #endif
#if HAVE_SYS_TIME_H && !defined(__MINGW32__) && !_MSC_VER #if HAVE_SYS_TIME_H && !_MSC_VER
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
@ -399,6 +399,18 @@ InitTime (void)
} }
} }
#ifdef __GNUC__
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;
}
#endif
UInt UInt
Yap_cputime (void) Yap_cputime (void)
{ {
@ -411,8 +423,7 @@ Yap_cputime (void)
} else { } else {
#ifdef __GNUC__ #ifdef __GNUC__
unsigned long long int t = unsigned long long int t =
*(unsigned long long int *)&UserTime - sub_utime(UserTime,StartOfTimes);
*(unsigned long long int *)&StartOfTimes;
do_div(t,10000); do_div(t,10000);
return((Int)t); return((Int)t);
#endif #endif
@ -436,11 +447,9 @@ void Yap_cputime_interval(Int *now,Int *interval)
} else { } else {
#ifdef __GNUC__ #ifdef __GNUC__
unsigned long long int t1 = unsigned long long int t1 =
*(unsigned long long int *)&UserTime - sub_utime(UserTime, StartOfTimes);
*(unsigned long long int *)&StartOfTimes;
unsigned long long int t2 = unsigned long long int t2 =
*(unsigned long long int *)&UserTime - sub_utime(UserTime, last_time);
*(unsigned long long int *)&last_time;
do_div(t1,10000); do_div(t1,10000);
*now = (Int)t1; *now = (Int)t1;
do_div(t2,10000); do_div(t2,10000);
@ -2226,13 +2235,15 @@ static Int p_file_age(void)
static DWORD WINAPI static DWORD WINAPI
DoTimerThread(LPVOID targ) DoTimerThread(LPVOID targ)
{ {
Int time = *(Int *)targ; Int *time = (Int *)targ;
HANDLE htimer; HANDLE htimer;
LARGE_INTEGER liDueTime; LARGE_INTEGER liDueTime;
htimer = CreateWaitableTimer(NULL, FALSE, NULL); htimer = CreateWaitableTimer(NULL, FALSE, NULL);
liDueTime.QuadPart = -10000000; liDueTime.QuadPart = -10000000;
liDueTime.QuadPart *= time; liDueTime.QuadPart *= time[0];
/* add time in usecs */
liDueTime.QuadPart -= time[1]*10;
/* Copy the relative time into a LARGE_INTEGER. */ /* Copy the relative time into a LARGE_INTEGER. */
if (SetWaitableTimer(htimer, &liDueTime,0,NULL,NULL,0) == 0) { if (SetWaitableTimer(htimer, &liDueTime,0,NULL,NULL,0) == 0) {
return(FALSE); return(FALSE);
@ -2274,9 +2285,12 @@ p_alarm(void)
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
{ {
Term tout; Term tout;
Int time = IntegerOfTerm(t); Int time[2];
if (time != 0) { time[0] = IntegerOfTerm(t);
time[1] = IntegerOfTerm(t2);
if (time[0] != 0 && time[1] != 0) {
DWORD dwThreadId; DWORD dwThreadId;
HANDLE hThread; HANDLE hThread;
@ -2284,7 +2298,7 @@ p_alarm(void)
NULL, /* no security attributes */ NULL, /* no security attributes */
0, /* use default stack size */ 0, /* use default stack size */
DoTimerThread, /* thread function */ DoTimerThread, /* thread function */
(LPVOID)&time, /* argument to thread function */ (LPVOID)time, /* argument to thread function */
0, /* use default creation flags */ 0, /* use default creation flags */
&dwThreadId); /* returns the thread identifier */ &dwThreadId); /* returns the thread identifier */