diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-03 11:51:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-03 11:51:25 +0000 |
| commit | 84b7d23d30371215871efcd67e9d595a2d694f56 (patch) | |
| tree | b586de5c70021c549d3e694439b0a2d440caee02 /ACE | |
| parent | 246a32a8f694101534afe60b9a52cabdc90a8064 (diff) | |
| download | ATCD-84b7d23d30371215871efcd67e9d595a2d694f56.tar.gz | |
Mon Nov 3 10:51:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 15 |
3 files changed, 20 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 34cd696a03f..88f48d7ebc2 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Mon Nov 3 10:51:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_Thread.inl: + Use CeGetThreadPriority/CeSetThreadPriority when building + for Windows CE. This fixes bugzilla 3487. Thanks to Danial Lang + <danial dot lang at alphagate dot at> for reporting this. + Mon Nov 3 10:30:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_other_tests.lst: diff --git a/ACE/THANKS b/ACE/THANKS index 789eb0cf899..d4f0d435df8 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2265,6 +2265,7 @@ Jack Lavender <jack dot lavender at seconcepts dot com> Alexandre Skrzyniarz <alexandre dot skrzyniarz at fr dot thalesgroup dot com> E Vahala <erkki dot vahala at pp dot inet dot fi> Christian Fromme <kaner dot strace dot org> +Daniel Lang <danial dot lang at alphagate dot at> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index d4bba743c56..fbf4c07be00 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -2674,10 +2674,13 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int, -1); -# elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +# elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); - +# if !defined (ACE_HAS_WINCE) priority = ::GetThreadPriority (ht_id); +# else + priority = ::CeGetThreadPriority (ht_id); +# endif # if defined (ACE_HAS_PHARLAP) # if defined (ACE_PHARLAP_LABVIEW_RT) @@ -2686,7 +2689,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) DWORD timeslice = ::EtsGetTimeSlice (); policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO; # endif /* ACE_PHARLAP_LABVIEW_RT */ -# else +# elif !defined (ACE_HAS_WINCE) DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess ()); if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR) ACE_FAIL_RETURN (-1); @@ -3104,9 +3107,15 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) result), int, -1); # elif defined (ACE_HAS_WTHREADS) +# if !defined (ACE_HAS_WINCE) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetThreadPriority (ht_id, priority), ace_result_), int, -1); +# else + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CeSetThreadPriority (ht_id, priority), + ace_result_), + int, -1); +# endif /* ACE_HAS_WINCE */ # elif defined (ACE_HAS_VXTHREADS) ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int, -1); # else |