diff options
| -rw-r--r-- | ACE/ChangeLog | 16 | ||||
| -rw-r--r-- | ACE/ace/Proactor.cpp | 3 | ||||
| -rw-r--r-- | ACE/ace/config-lynxos.h | 14 | ||||
| -rw-r--r-- | ACE/ace/os_include/net/os_if.h | 5 | ||||
| -rw-r--r-- | ACE/tests/Proactor_Test.cpp | 10 | ||||
| -rw-r--r-- | ACE/tests/Proactor_Test_IPV6.cpp | 10 |
6 files changed, 30 insertions, 28 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 340e3a03af1..ca048c976e3 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,19 @@ +Fri Feb 2 10:47:55 UTC 2007 Olli Savia <ops@iki.fi> + + * ace/Proactor.cpp: + Layout change. + + * ace/config-lynxos.h: + Enabled POSIX_SIG_REACTOR and made some cleanups. + + * ace/os_include/net/os_if.h: + Removed LynxOS specific include. + + * tests/Proactor_Test.cpp: + * tests/Proactor_Test_IPV6.cpp: + Enabled these tests again even if ACE_HAS_BROKEN_SIGEVENT_STRUCT + is defined. + Fri Feb 2 10:31:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/CORBA_macros.h: diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index da46649dc33..9d529243604 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -11,9 +11,10 @@ #include "ace/Proactor_Impl.h" #include "ace/Object_Manager.h" #include "ace/Task_T.h" + #if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) # include "ace/Service_Config.h" -# endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ ACE_RCSID (ace, diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index 99b6e42bc6f..f1d743c3640 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -18,7 +18,6 @@ // Compile using multi-thread libraries. #if !defined (ACE_MT_SAFE) # define ACE_MT_SAFE 1 -# define _REENTRANT #endif #include "ace/config-posix.h" @@ -38,6 +37,7 @@ #define ACE_HAS_ALLOCA #define ACE_HAS_ALLOCA_H #define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1 #define ACE_HAS_BROKEN_SIGEVENT_STRUCT #define ACE_HAS_CHARPTR_SHMAT #define ACE_HAS_CHARPTR_SHMDT @@ -97,8 +97,8 @@ #define ACE_LACKS_VSNPRINTF #define ACE_LACKS_WCHAR_H #define ACE_MALLOC_ALIGN 8 -#define ACE_NEEDS_IPC_1C_H #define ACE_PAGE_SIZE 4096 +#define ACE_POSIX_SIG_PROACTOR #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR #if ACE_MT_SAFE == 1 @@ -113,16 +113,6 @@ # endif #endif /* ACE_MT_SAFE */ -#define ACE_POSIX_AIOCB_PROACTOR -// AIOCB Proactor works on Lynx. But it is not multi-threaded. -// Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use -// SIG Proactor also, with multiple threads. So, let us use the AIOCB -// Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn -// on SIG Proactor for this platform. -// #define ACE_POSIX_SIG_PROACTOR - -#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1 - #if __GNUC__ < 3 # define ACE_LACKS_NUMERIC_LIMITS #endif /* __GNUC__ < 3 */ diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index c689e07ab7e..bb44c58504c 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -24,11 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_NEEDS_IPC_1C_H) - // LynxOS 3.1.0 and later need this -# include /**/ <ipc_1c.h> -#endif /* ACE_NEEDS_IPC_1C_H */ - #if !defined (ACE_LACKS_NET_IF_H) // This part if to avoid STL name conflict with the map structure // in net/if.h. diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index 160e502d1ca..eb94ffbe3de 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -20,7 +20,7 @@ ACE_RCSID (tests, Proactor_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) +#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. @@ -253,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; # endif /* sun */ -# if !defined(__Lynx__) +# if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, ACE_POSIX_CB_Proactor (max_op), @@ -261,7 +261,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Create Proactor Type = CB\n"))); break; -# endif /* __Lynx__ */ +# endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ default: ACE_DEBUG ((LM_DEBUG, @@ -1769,11 +1769,11 @@ set_proactor_type (const ACE_TCHAR *ptype) proactor_type = SUN; return 1; #endif /* sun */ -#if !defined (__Lynx__) +#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; return 1; -#endif /* __Lynx__ */ +#endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ default: break; } diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index 2358928891f..9958d41e8d0 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -20,7 +20,7 @@ ACE_RCSID (tests, Proactor_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) +#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. @@ -253,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; # endif /* sun */ -# if !defined(__Lynx__) +# if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, ACE_POSIX_CB_Proactor (max_op), @@ -261,7 +261,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Create Proactor Type = CB\n"))); break; -# endif /* __Lynx__ */ +# endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ default: ACE_DEBUG ((LM_DEBUG, @@ -1809,11 +1809,11 @@ set_proactor_type (const ACE_TCHAR *ptype) proactor_type = SUN; return 1; #endif /* sun */ -#if !defined (__Lynx__) +#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; return 1; -#endif /* __Lynx__ */ +#endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ default: break; } |