diff options
| author | Steve Huston <shuston@riverace.com> | 2012-11-20 23:57:54 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-11-20 23:57:54 +0000 |
| commit | ebd7f0a56bb5773eb93fd2ce7cb0d9e6916f362d (patch) | |
| tree | bf505510c8874824bae0c2a9df5f229fcdae2889 | |
| parent | e882fd65814508cf00b6f566349c989df506cca6 (diff) | |
| download | ATCD-ebd7f0a56bb5773eb93fd2ce7cb0d9e6916f362d.tar.gz | |
ChangeLogTag:Tue Nov 20 23:55:57 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_netdb.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/config-hpux-11.00.h | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 85cfcfccccf..32ac1f93d09 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 20 23:55:57 UTC 2012 Steve Huston <shuston@riverace.com> + + * ace/config-hpux-11.00.h: + * ace/OS_NS_netdb.inl: Although HP-UX 11 doesn't have the _r + netdb calls, the regular ones are reentrant for multiple threads. + Therefore, do not use the mutex-acquiring wrapper for HP-UX 11. + Tue Nov 20 19:10:38 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ace/XML_Utils/ACE_XML_Utils.pc.in: diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl index 4d574487f1a..dc17a38d76a 100644 --- a/ACE/ace/OS_NS_netdb.inl +++ b/ACE/ace/OS_NS_netdb.inl @@ -7,7 +7,7 @@ #include "ace/OS_NS_errno.h" #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11) # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ @@ -25,7 +25,7 @@ return ace_result_; \ } \ } while(0) -# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0) */ +# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0 && !HPUX_11) */ # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 7df5bd584a3..505f703434f 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -231,10 +231,9 @@ // HP-UX 11 has reentrant netdb functions. The catch is that the old // functions (gethostbyname, etc.) are thread-safe and the _r versions are -// not used and will be removed at some point. So, define things so -// the _r versions are not used. This will slow things down a bit due to -// the extra mutex lock in the ACE_NETDBCALL_RETURN macro, and will be fixed -// in the future (problem ID P64). +// obsolescent. So, define things so the _r versions are not used. +// OS_NS_netdb.inl ensures no funny lock games are played in the +// ACE_NETDBCALL_RETURN macro. #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS /* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ |