aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/mutex8e.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
commit3c0d2312573b81e3067bea610a58b1940c075e05 (patch)
tree3f025a27d813374f225957801226aa8ee829a33a /pthreads/tests/mutex8e.c
parentba033884541714680fd7552ab9d6c8817650f7d8 (diff)
parent88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff)
downloadvcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.gz
vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.bz2
vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
Diffstat (limited to 'pthreads/tests/mutex8e.c')
-rw-r--r--pthreads/tests/mutex8e.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/pthreads/tests/mutex8e.c b/pthreads/tests/mutex8e.c
index b99d24edd..a36056673 100644
--- a/pthreads/tests/mutex8e.c
+++ b/pthreads/tests/mutex8e.c
@@ -44,7 +44,7 @@
#include "test.h"
#include <sys/timeb.h>
-static int lockCount = 0;
+static int lockCount;
static pthread_mutex_t mutex;
static pthread_mutexattr_t mxAttr;
@@ -52,12 +52,12 @@ static pthread_mutexattr_t mxAttr;
void * locker(void * arg)
{
struct timespec abstime = { 0, 0 };
- struct _timeb currSysTime;
+ PTW32_STRUCT_TIMEB currSysTime;
const DWORD NANOSEC_PER_MILLISEC = 1000000;
- _ftime(&currSysTime);
+ PTW32_FTIME(&currSysTime);
- abstime.tv_sec = currSysTime.time;
+ abstime.tv_sec = (long)currSysTime.time;
abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
abstime.tv_sec += 1;
@@ -76,6 +76,10 @@ main()
int mxType = -1;
assert(pthread_mutexattr_init(&mxAttr) == 0);
+
+ BEGIN_MUTEX_STALLED_ROBUST(mxAttr)
+
+ lockCount = 0;
assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_ERRORCHECK) == 0);
assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
assert(mxType == PTHREAD_MUTEX_ERRORCHECK);
@@ -92,6 +96,8 @@ main()
assert(pthread_mutex_unlock(&mutex) == 0);
+ END_MUTEX_STALLED_ROBUST(mxAttr)
+
return 0;
}