database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Change windows pthread_cond_timedwait to use an absolute time value

Browse Source 
include/my_pthread.h:
  Calculate absolute time value int set_timespec_*
mysys/my_wincond.c:
  Use absolute timevalue in pthread_cond_timedwwait
This commit is contained in:
unknown
2006-12-18 11:09:47 +01:00
parent e1411580c1
commit 43a251011c
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/my_pthread.h
View File

@@ -94,17 +94,19 @@ typedef void * (__cdecl *pthread_handler)(void *);
__int64 i64; __int64 i64;
}; };
struct timespec { struct timespec {
union ft64 start; union ft64 tv;
/* The max timeout value in millisecond for pthread_cond_timedwait */ /* The max timeout value in millisecond for pthread_cond_timedwait */
long timeout_msec; long max_timeout_msec;
}; };
#define set_timespec(ABSTIME,SEC) { \ #define set_timespec(ABSTIME,SEC) { \
GetSystemTimeAsFileTime(&((ABSTIME).start.ft)); \ GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \
(ABSTIME).timeout_msec= (long)((SEC)*1000); \ (ABSTIME).tv.i64+= (__int64)(SEC)*10000000; \
(ABSTIME).max_timeout_msec= (long)((SEC)*1000); \
} }
#define set_timespec_nsec(ABSTIME,NSEC) { \ #define set_timespec_nsec(ABSTIME,NSEC) { \
GetSystemTimeAsFileTime(&((ABSTIME).start.ft)); \ GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \
(ABSTIME).timeout_msec= (long)((NSEC)/1000000); \ (ABSTIME).tv.i64+= (__int64)(NSEC)/100; \
(ABSTIME).max_timeout_msec= (long)((NSEC)/1000000); \
} }
void win_pthread_init(void); void win_pthread_init(void);

19
mysys/my_wincond.c
View File

@@ -37,7 +37,7 @@ int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
int pthread_cond_destroy(pthread_cond_t *cond) int pthread_cond_destroy(pthread_cond_t *cond)
{ {
return CloseHandle(cond->semaphore) ? 0 : EINVAL; return CloseHandle(cond->semaphore) ? 0 : EINVAL;
} }
@@ -51,6 +51,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
return 0 ; return 0 ;
} }
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
struct timespec *abstime) struct timespec *abstime)
{ {
@@ -61,26 +62,26 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
GetSystemTimeAsFileTime(&now.ft); GetSystemTimeAsFileTime(&now.ft);
/* /*
- subtract start time from current time(values are in 100ns units Calculate time left to abstime
- subtract start time from current time(values are in 100ns units)
- convert to millisec by dividing with 10000 - convert to millisec by dividing with 10000
- subtract time since start from max timeout
*/ */
timeout= abstime->timeout_msec - (long)((now.i64 - abstime->start.i64) / 10000); timeout= (long)((abstime->tv.i64 - now.i64) / 10000);
/* Don't allow the timeout to be negative */ /* Don't allow the timeout to be negative */
if (timeout < 0) if (timeout < 0)
timeout = 0L; timeout= 0L;
/* /*
Make sure the calucated time does not exceed original timeout Make sure the calucated timeout does not exceed original timeout
value which could cause "wait for ever" if system time changes value which could cause "wait for ever" if system time changes
*/ */
if (timeout > abstime->timeout_msec) if (timeout > abstime->max_timeout_msec)
timeout= abstime->timeout_msec; timeout= abstime->max_timeout_msec;
InterlockedIncrement(&cond->waiting); InterlockedIncrement(&cond->waiting);
LeaveCriticalSection(mutex); LeaveCriticalSection(mutex);
result=WaitForSingleObject(cond->semaphore,timeout); result= WaitForSingleObject(cond->semaphore,timeout);
InterlockedDecrement(&cond->waiting); InterlockedDecrement(&cond->waiting);
EnterCriticalSection(mutex); EnterCriticalSection(mutex);