diff options
| author | Steve Huston <shuston@riverace.com> | 2002-12-05 02:55:51 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-12-05 02:55:51 +0000 |
| commit | 888dfa6aa6075b7101b409434e8a3e05c9d5e815 (patch) | |
| tree | ac33fbde4c3230919dbed3df3b241f1de8e601a2 | |
| parent | 0c3c4b298d77b8c4170d79bd9c77407af319742a (diff) | |
| download | ATCD-888dfa6aa6075b7101b409434e8a3e05c9d5e815.tar.gz | |
ChangeLogTag:Wed Dec 4 21:53:28 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/OS.cpp | 2 | ||||
| -rw-r--r-- | ace/OS.h | 8 |
4 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 747267ee1df..6a0b969b220 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 4 21:53:28 2002 Steve Huston <shuston@riverace.com> + + * ace/OS.h: Include <sys/pstat.h> for __hpux platform. + * ace/OS.cpp (num_processors_online): Try the syscall for this + on HP-UX if __hpux is defined, not hpux (only set for g++). + Wed Dec 4 21:18:31 2002 Steve Huston <shuston@riverace.com> * ace/Proactor_Timer_Test.cpp: Fix incorrect use of pointer-integer diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 747267ee1df..6a0b969b220 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Wed Dec 4 21:53:28 2002 Steve Huston <shuston@riverace.com> + + * ace/OS.h: Include <sys/pstat.h> for __hpux platform. + * ace/OS.cpp (num_processors_online): Try the syscall for this + on HP-UX if __hpux is defined, not hpux (only set for g++). + Wed Dec 4 21:18:31 2002 Steve Huston <shuston@riverace.com> * ace/Proactor_Timer_Test.cpp: Fix incorrect use of pointer-integer diff --git a/ace/OS.cpp b/ace/OS.cpp index 6ec621d7cd8..175a6aa82d9 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -7503,7 +7503,7 @@ ACE_OS::num_processors_online (void) return sys_info.dwNumberOfProcessors; #elif defined (linux) || defined (sun) return ::sysconf (_SC_NPROCESSORS_ONLN); -#elif defined (hpux) +#elif defined (__hpux) struct pst_dynamic psd; if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) return psd.psd_proc_cnt; @@ -3358,6 +3358,14 @@ extern "C" # include /**/ <sys/param.h> # endif /* ACE_LACKS_PARAM_H */ +// This is here for ACE_OS::num_processors_online(). On HP-UX, it +// needs sys/param.h (above) and sys/pstat.h. The implementation of the +// num_processors_online() method also uses 'defined (__hpux)' to decide +// whether or not to try the syscall. +# if defined (__hpux) +# include /**/ <sys/pstat.h> +# endif /* __hpux **/ + # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && !defined (VXWORKS) # include /**/ <sys/un.h> # endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ |