summaryrefslogtreecommitdiff
path: root/ACE/tests/Proactor_Test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/tests/Proactor_Test.cpp')
-rw-r--r--ACE/tests/Proactor_Test.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp
index e82b054b90c..6657c096a15 100644
--- a/ACE/tests/Proactor_Test.cpp
+++ b/ACE/tests/Proactor_Test.cpp
@@ -50,7 +50,6 @@
# include "ace/POSIX_Proactor.h"
# include "ace/POSIX_CB_Proactor.h"
-# include "ace/SUN_Proactor.h"
#endif /* ACE_WIN32 */
@@ -58,7 +57,7 @@
// Proactor Type (UNIX only, Win32 ignored)
-using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB };
+using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB };
static ProactorType proactor_type = DEFAULT;
// POSIX : > 0 max number aio operations proactor,
@@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
break;
#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
-# if defined (sun)
- case SUN:
- ACE_NEW_RETURN (proactor_impl,
- ACE_SUN_Proactor (max_op),
- -1);
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("(%t) Create Proactor Type = SUN\n")));
- break;
-# endif /* sun */
-
# if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case CB:
ACE_NEW_RETURN (proactor_impl,
@@ -1722,7 +1711,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
ACE_TEXT ("\n a AIOCB")
ACE_TEXT ("\n i SIG")
ACE_TEXT ("\n c CB")
- ACE_TEXT ("\n s SUN")
ACE_TEXT ("\n d default")
ACE_TEXT ("\n-d <duplex mode 1-on/0-off>")
ACE_TEXT ("\n-h <host> for Client mode")
@@ -1761,11 +1749,6 @@ set_proactor_type (const ACE_TCHAR *ptype)
case 'I':
proactor_type = SIG;
return 1;
-#if defined (sun)
- case 'S':
- proactor_type = SUN;
- return 1;
-#endif /* sun */
#if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
case 'C':
proactor_type = CB;
@@ -1849,13 +1832,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
} // switch
} // while
- if (proactor_type == SUN && threads > 1)
- {
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ")
- ACE_TEXT ("changing to 1 thread\n")));
- threads = 1;
- }
-
return 0;
}