Merge branch 'master' into message_queue_ex_get_queue

1 files changed, 12 insertions, 37 deletions

diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index c4e2adb050d..0a4e4e84c18 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -51,14 +51,13 @@
 
 #  include "ace/POSIX_Proactor.h"
 #  include "ace/POSIX_CB_Proactor.h"
-#  include "ace/SUN_Proactor.h"
 
 #endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */
 
 #include "Proactor_Test.h"
 
 // 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,
@@ -200,7 +199,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
 
   ACE_TEST_ASSERT (this->proactor_ == 0);
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
 
   ACE_UNUSED_ARG (type_proactor);
   ACE_UNUSED_ARG (max_op);
@@ -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,
@@ -264,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op)
       break;
   }
 
-#endif // (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#endif // (ACE_WIN32)
 
   // always delete implementation  1 , not  !(proactor_impl == 0)
   ACE_NEW_RETURN (this->proactor_,
@@ -1316,8 +1305,7 @@ Client::initiate_write_stream ()
 
   static const size_t complete_message_length = ACE_OS::strlen (complete_message);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-
+#if defined (ACE_WIN32)
   ACE_Message_Block *mb1 = 0,
                     *mb2 = 0,
                     *mb3 = 0;
@@ -1354,7 +1342,7 @@ Client::initiate_write_stream ()
                         ACE_TEXT ("Client::ACE_Asynch_Stream::writev")),
                        -1);
     }
-#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#else /* defined (ACE_WIN32) */
 
   ACE_Message_Block *mb = 0;
 
@@ -1381,7 +1369,7 @@ Client::initiate_write_stream ()
                         ACE_TEXT ("write")),
                        -1);
     }
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   this->io_count_++;
   this->total_w_++;
@@ -1397,7 +1385,7 @@ Client::initiate_read_stream ()
   static const size_t complete_message_length =
     ACE_OS::strlen (complete_message);
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
   ACE_Message_Block *mb1 = 0,
                     *mb2 = 0,
                     *mb3 = 0,
@@ -1446,7 +1434,7 @@ Client::initiate_read_stream ()
                          ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")),
                         -1);
     }
-#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#else /* defined (ACE_WIN32) */
 
   // Try to read more chunks
   size_t blksize = ( complete_message_length > BUFSIZ ) ?
@@ -1479,7 +1467,7 @@ Client::initiate_read_stream ()
                          ACE_TEXT ("read")),
                         -1);
     }
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
   this->io_count_++;
   this->total_r_++;
@@ -1530,7 +1518,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                     ACE_TEXT ("error"),
                     result.error ()));
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_WIN32)
         size_t bytes_transferred = result.bytes_transferred ();
         char index = 0;
         for (ACE_Message_Block* mb_i = &mb;
@@ -1561,7 +1549,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                         index,
                         mb_i->rd_ptr ()));
           }
-#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#else /* defined (ACE_WIN32) */
         // write 0 at string end for proper printout (if end of mb, it's 0 already)
         mb.rd_ptr()[0]  = '\0';
         // move rd_ptr backwards as required for printout
@@ -1570,7 +1558,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
                     ACE_TEXT ("%s = %s\n"),
                     ACE_TEXT ("message_block"),
                     mb.rd_ptr ()));
-#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
+#endif /* defined (ACE_WIN32) */
 
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("**** end of message ****************\n")));
@@ -1760,7 +1748,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")
@@ -1799,11 +1786,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;
@@ -1891,13 +1873,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;
 }