Module: wine Branch: master Commit: c019ebc82f397d1f5c195d6bfc24697260290f57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c019ebc82f397d1f5c195d6bfc...
Author: Sebastian Lackner sebastian@fds-team.de Date: Thu Jul 16 15:01:33 2015 +0200
vcomp: Implement _vcomp_sections_init and _vcomp_sections_next.
---
dlls/vcomp/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 4 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index f085f7c..0f8a272 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -58,6 +58,9 @@ struct vcomp_thread_data /* only used for concurrent tasks */ struct list entry; CONDITION_VARIABLE cond; + + /* section */ + unsigned int section; };
struct vcomp_team_data @@ -74,6 +77,11 @@ struct vcomp_team_data /* barrier */ unsigned int barrier; int barrier_count; + + /* section */ + unsigned int section; + int num_sections; + int section_index; };
#if defined(__i386__) @@ -301,6 +309,42 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); }
+void CDECL _vcomp_sections_init(int n) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + struct vcomp_team_data *team_data = thread_data->team; + + TRACE("(%d)\n", n); + + EnterCriticalSection(&vcomp_section); + thread_data->section++; + if ((int)(thread_data->section - team_data->section) > 0) + { + team_data->section = thread_data->section; + team_data->num_sections = n; + team_data->section_index = 0; + } + LeaveCriticalSection(&vcomp_section); +} + +int CDECL _vcomp_sections_next(void) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + struct vcomp_team_data *team_data = thread_data->team; + int i = -1; + + TRACE("()\n"); + + EnterCriticalSection(&vcomp_section); + if (thread_data->section == team_data->section && + team_data->section_index != team_data->num_sections) + { + i = team_data->section_index++; + } + LeaveCriticalSection(&vcomp_section); + return i; +} + static DWORD WINAPI _vcomp_fork_worker(void *param) { struct vcomp_thread_data *thread_data = param; @@ -368,10 +412,12 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) __ms_va_start(team_data.valist, wrapper); team_data.barrier = 0; team_data.barrier_count = 0; + team_data.section = 0;
thread_data.team = &team_data; thread_data.thread_num = 0; thread_data.fork_threads = 0; + thread_data.section = 1; list_init(&thread_data.entry); InitializeConditionVariable(&thread_data.cond);
@@ -387,6 +433,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->team = &team_data; data->thread_num = team_data.num_threads++; data->fork_threads = 0; + data->section = 1; list_remove(&data->entry); list_add_tail(&thread_data.entry, &data->entry); WakeAllConditionVariable(&data->cond); @@ -405,6 +452,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->team = &team_data; data->thread_num = team_data.num_threads; data->fork_threads = 0; + data->section = 1; InitializeConditionVariable(&data->cond);
thread = CreateThread(NULL, 0, _vcomp_fork_worker, data, 0, NULL); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index d446574..dfbd184 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -83,8 +83,8 @@ @ stub _vcomp_reduction_u2 @ stub _vcomp_reduction_u4 @ stub _vcomp_reduction_u8 -@ stub _vcomp_sections_init -@ stub _vcomp_sections_next +@ cdecl _vcomp_sections_init(long) +@ cdecl _vcomp_sections_next() @ cdecl _vcomp_set_num_threads(long) @ cdecl _vcomp_single_begin(long) @ cdecl _vcomp_single_end() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 2c04e91..6eb6ae5 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -83,8 +83,8 @@ @ stub _vcomp_reduction_u2 @ stub _vcomp_reduction_u4 @ stub _vcomp_reduction_u8 -@ stub _vcomp_sections_init -@ stub _vcomp_sections_next +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 2c04e91..6eb6ae5 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -83,8 +83,8 @@ @ stub _vcomp_reduction_u2 @ stub _vcomp_reduction_u4 @ stub _vcomp_reduction_u8 -@ stub _vcomp_sections_init -@ stub _vcomp_sections_next +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end