diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-24 11:22:07 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-24 11:22:07 +0000 |
| commit | 793609e83e431b1531ab6316102bd63c0628d99e (patch) | |
| tree | 18a098cf4e56f5c272cdb8d8794566425fe65049 | |
| parent | 5ecb15c61aae23f755b5f9fda1e319205b44f3a4 (diff) | |
| download | ATCD-793609e83e431b1531ab6316102bd63c0628d99e.tar.gz | |
Fri Apr 24 12:21:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Condition_Recursive_Thread_Mutex.h:
Doxygen change
* ace/config-cygwin32.h:
Change for Cygwin 1.7
* ace/OS_NS_unistd.cpp (num_processors_online):
Don't use a hard max of 32.
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/ace/Condition_Recursive_Thread_Mutex.h | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.cpp | 3 | ||||
| -rw-r--r-- | ACE/ace/config-cygwin32.h | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 57ac4d3f7da..a497bc193e1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Fri Apr 24 12:21:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Condition_Recursive_Thread_Mutex.h: + Doxygen change + + * ace/config-cygwin32.h: + Change for Cygwin 1.7 + + * ace/OS_NS_unistd.cpp (num_processors_online): + Don't use a hard max of 32. + Wed Apr 22 10:14:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_unistd.cpp: diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h index cfcd46a9551..6fad971fc98 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.h +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h @@ -57,7 +57,7 @@ public: /** * Block on condition, or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" <wait> semantics. Else, if <abstime> + * abstime == 0 use "blocking" <wait> semantics. Else, if @a abstime * != 0 and the call times out before the condition is signaled * <wait> returns -1 and sets errno to ETIME. */ diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index ba54c05a6e8..421c0287f86 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -430,7 +430,8 @@ ACE_OS::num_processors_online (void) cpuset_t cpuset; CPUSET_ZERO (cpuset); cpuset = vxCpuEnabledGet(); - for (int i =0; i < 32; i++) + unsigned int const maxcpu = vxCpuConfiguredGet(); + for (int i =0; i < maxcpu; i++) { if (CPUSET_ISSET (cpuset, i)) { diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h index c8f04092a2b..a81356d0fb3 100644 --- a/ACE/ace/config-cygwin32.h +++ b/ACE/ace/config-cygwin32.h @@ -196,9 +196,11 @@ # define ACE_LACKS_PTHREAD_YIELD 1 # define ACE_LACKS_PTHREAD_ATTR_SETSTACK +#if CYGWIN_VERSION_API_MINOR < 207 // In the 1.5.9 release of Cygwin the pthread_kill gives an access violation // so for the time being we say Cygwin doesn't support pthread_kill. # define ACE_LACKS_PTHREAD_KILL +#endif #endif /* ACE_MT_SAFE */ |