Skip to content

W
wine-cw
Commit f212a137 authored by Sebastian Lackner's avatar Sebastian Lackner Committed by Alexandre Julliard
Browse files
Options

vcomp: Implement OpenMP nested locking functions.

The test marked with todo_wine suggests that native OpenMP might use a separate counter for the nesting level. However, to implement the owner checks required for regular locks we need to access the critical section private members anyway.
parent 037a079f
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 12 deletions
dlls/vcomp/main.c
View file @ f212a137
...@@ -1057,6 +1057,24 @@ void CDECL omp_destroy_lock(omp_lock_t *lock) ...@@ -1057,6 +1057,24 @@ void CDECL omp_destroy_lock(omp_lock_t *lock)
destroy_critsect(*lock); destroy_critsect(*lock);
} }
void CDECL omp_set_nest_lock(omp_nest_lock_t *lock)
{
TRACE("(%p)\n", lock);
EnterCriticalSection(*lock);
}
void CDECL omp_unset_nest_lock(omp_nest_lock_t *lock)
{
TRACE("(%p)\n", lock);
LeaveCriticalSection(*lock);
}
int CDECL omp_test_nest_lock(omp_nest_lock_t *lock)
{
TRACE("(%p)\n", lock);
return TryEnterCriticalSection(*lock) ? (*lock)->RecursionCount : 0;
}
void CDECL _vcomp_enter_critsect(CRITICAL_SECTION **critsect) void CDECL _vcomp_enter_critsect(CRITICAL_SECTION **critsect)
{ {
TRACE("(%p)\n", critsect); TRACE("(%p)\n", critsect);
......
dlls/vcomp/tests/vcomp.c
View file @ f212a137
...@@ -82,8 +82,11 @@ static int (CDECL *pomp_get_thread_num)(void); ...@@ -82,8 +82,11 @@ static int (CDECL *pomp_get_thread_num)(void);
static int (CDECL *pomp_in_parallel)(void); static int (CDECL *pomp_in_parallel)(void);
static void (CDECL *pomp_init_lock)(omp_lock_t *lock); static void (CDECL *pomp_init_lock)(omp_lock_t *lock);
static void (CDECL *pomp_init_nest_lock)(omp_nest_lock_t *lock); static void (CDECL *pomp_init_nest_lock)(omp_nest_lock_t *lock);
static void (CDECL *pomp_set_nest_lock)(omp_nest_lock_t *lock);
static void (CDECL *pomp_set_nested)(int nested); static void (CDECL *pomp_set_nested)(int nested);
static void (CDECL *pomp_set_num_threads)(int num_threads); static void (CDECL *pomp_set_num_threads)(int num_threads);
static int (CDECL *pomp_test_nest_lock)(omp_nest_lock_t *lock);
static void (CDECL *pomp_unset_nest_lock)(omp_nest_lock_t *lock);
#define VCOMP_DYNAMIC_FLAGS_STATIC 0x01 #define VCOMP_DYNAMIC_FLAGS_STATIC 0x01
#define VCOMP_DYNAMIC_FLAGS_CHUNKED 0x02 #define VCOMP_DYNAMIC_FLAGS_CHUNKED 0x02
...@@ -265,8 +268,11 @@ static BOOL init_vcomp(void) ...@@ -265,8 +268,11 @@ static BOOL init_vcomp(void)
VCOMP_GET_PROC(omp_in_parallel); VCOMP_GET_PROC(omp_in_parallel);
VCOMP_GET_PROC(omp_init_lock); VCOMP_GET_PROC(omp_init_lock);
VCOMP_GET_PROC(omp_init_nest_lock); VCOMP_GET_PROC(omp_init_nest_lock);
VCOMP_GET_PROC(omp_set_nest_lock);
VCOMP_GET_PROC(omp_set_nested); VCOMP_GET_PROC(omp_set_nested);
VCOMP_GET_PROC(omp_set_num_threads); VCOMP_GET_PROC(omp_set_num_threads);
VCOMP_GET_PROC(omp_test_nest_lock);
VCOMP_GET_PROC(omp_unset_nest_lock);
return TRUE; return TRUE;
} }
...@@ -1298,10 +1304,42 @@ static void test_vcomp_flush(void) ...@@ -1298,10 +1304,42 @@ static void test_vcomp_flush(void)
static void test_omp_init_nest_lock(void) static void test_omp_init_nest_lock(void)
{ {
omp_nest_lock_t lock;
int ret;
ok(pomp_init_nest_lock == pomp_init_lock, "expected omp_init_nest_lock == %p, got %p\n", ok(pomp_init_nest_lock == pomp_init_lock, "expected omp_init_nest_lock == %p, got %p\n",
pomp_init_lock, pomp_init_nest_lock); pomp_init_lock, pomp_init_nest_lock);
ok(pomp_destroy_nest_lock == pomp_destroy_lock, "expected omp_destroy_nest_lock == %p, got %p\n", ok(pomp_destroy_nest_lock == pomp_destroy_lock, "expected omp_destroy_nest_lock == %p, got %p\n",
pomp_destroy_lock, pomp_destroy_nest_lock); pomp_destroy_lock, pomp_destroy_nest_lock);
pomp_init_nest_lock(&lock);
/* test omp_set_nest_lock */
pomp_set_nest_lock(&lock);
pomp_set_nest_lock(&lock);
pomp_unset_nest_lock(&lock);
pomp_unset_nest_lock(&lock);
/* test omp_test_nest_lock */
ret = pomp_test_nest_lock(&lock);
ok(ret == 1, "expected ret == 1, got %d\n", ret);
ret = pomp_test_nest_lock(&lock);
ok(ret == 2, "expected ret == 2, got %d\n", ret);
ret = pomp_test_nest_lock(&lock);
ok(ret == 3, "expected ret == 3, got %d\n", ret);
pomp_unset_nest_lock(&lock);
pomp_unset_nest_lock(&lock);
pomp_unset_nest_lock(&lock);
/* test with EnterCriticalSection */
EnterCriticalSection(lock);
ret = pomp_test_nest_lock(&lock);
todo_wine
ok(ret == 1, "expected ret == 1, got %d\n", ret);
pomp_unset_nest_lock(&lock);
LeaveCriticalSection(lock);
pomp_destroy_nest_lock(&lock);
} }
static void test_atomic_integer32(void) static void test_atomic_integer32(void)
......
dlls/vcomp/vcomp.spec
View file @ f212a137
...@@ -103,10 +103,10 @@ ...@@ -103,10 +103,10 @@
@ cdecl omp_init_nest_lock(ptr) omp_init_lock @ cdecl omp_init_nest_lock(ptr) omp_init_lock
@ cdecl omp_set_dynamic(long) @ cdecl omp_set_dynamic(long)
@ stub omp_set_lock @ stub omp_set_lock
@ stub omp_set_nest_lock @ cdecl omp_set_nest_lock(ptr)
@ cdecl omp_set_nested(long) @ cdecl omp_set_nested(long)
@ cdecl omp_set_num_threads(long) @ cdecl omp_set_num_threads(long)
@ stub omp_test_lock @ stub omp_test_lock
@ stub omp_test_nest_lock @ cdecl omp_test_nest_lock(ptr)
@ stub omp_unset_lock @ stub omp_unset_lock
@ stub omp_unset_nest_lock @ cdecl omp_unset_nest_lock(ptr)
dlls/vcomp100/vcomp100.spec
View file @ f212a137
...@@ -103,10 +103,10 @@ ...@@ -103,10 +103,10 @@
@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock
@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic
@ stub omp_set_lock @ stub omp_set_lock
@ stub omp_set_nest_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock
@ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_nested(long) vcomp.omp_set_nested
@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads
@ stub omp_test_lock @ stub omp_test_lock
@ stub omp_test_nest_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock
@ stub omp_unset_lock @ stub omp_unset_lock
@ stub omp_unset_nest_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock
dlls/vcomp110/vcomp110.spec
View file @ f212a137
...@@ -104,10 +104,10 @@ ...@@ -104,10 +104,10 @@
@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock
@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic
@ stub omp_set_lock @ stub omp_set_lock
@ stub omp_set_nest_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock
@ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_nested(long) vcomp.omp_set_nested
@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads
@ stub omp_test_lock @ stub omp_test_lock
@ stub omp_test_nest_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock
@ stub omp_unset_lock @ stub omp_unset_lock
@ stub omp_unset_nest_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock
dlls/vcomp90/vcomp90.spec
View file @ f212a137
...@@ -103,10 +103,10 @@ ...@@ -103,10 +103,10 @@
@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock
@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic
@ stub omp_set_lock @ stub omp_set_lock
@ stub omp_set_nest_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock
@ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_nested(long) vcomp.omp_set_nested
@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads
@ stub omp_test_lock @ stub omp_test_lock
@ stub omp_test_nest_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock
@ stub omp_unset_lock @ stub omp_unset_lock
@ stub omp_unset_nest_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment