ChangeLogTag: Mon Dec 15 10:11:31 2003 Chad Elliott <elliott_c@ociweb.com>

11 files changed, 101 insertions, 43 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d8f749a777..74a16ba2ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,31 @@
+Mon Dec 15 10:11:31 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/NonBlocking_Conn_Test.h:
+        * tests/NonBlocking_Conn_Test.cpp:
+
+          Moved the template class Svc_Handler into a header file so that
+          Visual Age C++ could implicitly instantiate the template.
+
+        * tests/Message_Queue_Notifications_Test.cpp:
+        * tests/Process_Strategy_Test.cpp:
+        * tests/Reactor_Registration_Test.cpp:
+        * tests/Reactors_Test.cpp:
+        * tests/Recursive_Mutex_Test.cpp:
+        * tests/Reference_Counted_Event_Handler_Test.cpp:
+        * tests/Svc_Handler_Test.cpp:
+        * tests/TP_Reactor_Test.h:
+
+          Added various #include's to get the tests to build on AIX with
+          Visual Age C++ 5.0.
+
 Mon Dec 15 10:06:17 2003  Steve Huston  <shuston@riverace.com>
 
-	* ace/OS_NS_stdio.cpp (gets): Reverted this change:
-	  Thu Dec 11 18:13:29 2003  Steve Huston  <shuston@riverace.com>
-	  It broke the Borland build and wasn't a very good fix for the
-	  AIX situation either. Since Riverace is dropping AIX 4.3 support
-	  at ACE 5.4, I'm not going to push this issue. It appears to be a
-	  compiler issue with Visual Age C++ version 5.
+        * ace/OS_NS_stdio.cpp (gets): Reverted this change:
+          Thu Dec 11 18:13:29 2003  Steve Huston  <shuston@riverace.com>
+          It broke the Borland build and wasn't a very good fix for the
+          AIX situation either. Since Riverace is dropping AIX 4.3 support
+          at ACE 5.4, I'm not going to push this issue. It appears to be a
+          compiler issue with Visual Age C++ version 5.
 
 Mon Dec 15 07:29:27 2003  Chad Elliott  <elliott_c@ociweb.com>
 
@@ -27,17 +47,17 @@ Mon Dec 15 11:35:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Dec 14 15:26:46 2003  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/Thread_Semaphore.{h,cpp}: Added support for an ACE_Thread_Semaphore
-	  that takes a first param that's an ACE_TCHAR * so that things
- 	  will work properly if ACE_Thread_Semaphore is used with
- 	  ACE_Malloc<>.  Thanks to John Glynn <jglynn@bjc.org> for
- 	  motivating this.
-  
-	* ace/Process_Semaphore.{h,cpp}: Added support for an ACE_Process_Semaphore
-	  that takes a first param that's an ACE_TCHAR * so that things
- 	  will work properly if ACE_Process_Semaphore is used with
- 	  ACE_Malloc<>.  Thanks to John Glynn <jglynn@bjc.org> for
- 	  motivating this.
+        * ace/Thread_Semaphore.{h,cpp}: Added support for an ACE_Thread_Semaphore
+          that takes a first param that's an ACE_TCHAR * so that things
+          will work properly if ACE_Thread_Semaphore is used with
+          ACE_Malloc<>.  Thanks to John Glynn <jglynn@bjc.org> for
+          motivating this.
+
+        * ace/Process_Semaphore.{h,cpp}: Added support for an ACE_Process_Semaphore
+          that takes a first param that's an ACE_TCHAR * so that things
+          will work properly if ACE_Process_Semaphore is used with
+          ACE_Malloc<>.  Thanks to John Glynn <jglynn@bjc.org> for
+          motivating this.
 
 Sat Dec 13 23:29:05 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp
index 96b707a9e04..6dd0a3d4a24 100644
--- a/tests/Message_Queue_Notifications_Test.cpp
+++ b/tests/Message_Queue_Notifications_Test.cpp
@@ -40,6 +40,7 @@
 #include "ace/Reactor_Notification_Strategy.h"
 #include "ace/Atomic_Op.h"
 #include "ace/Barrier.h"
+#include "ace/Synch.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(tests, Message_Queue_Notifications_Test, "$Id$")
diff --git a/tests/NonBlocking_Conn_Test.cpp b/tests/NonBlocking_Conn_Test.cpp
index 556536a2966..c07d8059c19 100644
--- a/tests/NonBlocking_Conn_Test.cpp
+++ b/tests/NonBlocking_Conn_Test.cpp
@@ -22,9 +22,8 @@
 // ============================================================================
 
 #include "test_config.h"
+#include "NonBlocking_Conn_Test.h"
 #include "ace/Connector.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Stream.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/Select_Reactor.h"
 #include "ace/TP_Reactor.h"
@@ -35,30 +34,6 @@ static int test_select_reactor = 1;
 static int test_tp_reactor = 1;
 static int test_wfmo_reactor = 1;
 
-class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-
-  enum Connection_Status
-    {
-      SUCCEEDED,
-      FAILED
-    };
-
-  Svc_Handler (void);
-
-  void connection_status (Connection_Status &status,
-                          int &completion_counter);
-
-  int open (void *);
-
-  int handle_close (ACE_HANDLE handle,
-                    ACE_Reactor_Mask mask);
-
-  Connection_Status *status_;
-  int *completion_counter_;
-};
-
 Svc_Handler::Svc_Handler (void)
   : status_ (0),
     completion_counter_ (0)
diff --git a/tests/NonBlocking_Conn_Test.h b/tests/NonBlocking_Conn_Test.h
new file mode 100644
index 00000000000..238c0255e21
--- /dev/null
+++ b/tests/NonBlocking_Conn_Test.h
@@ -0,0 +1,55 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    NonBlocking_Conn_Test.cpp
+//
+// = DESCRIPTION
+//    This test checks for the proper working of the following:
+//    - blocking connections
+//    - blocking connections with timeouts
+//    - non-blocking connections
+//    - non-blocking connections without waiting for completions
+//    - non-blocking connections with timeouts
+//
+// = AUTHOR
+//    Irfan Pyarali <irfan@oomworks.com>
+//
+// ============================================================================
+
+#ifndef NONBLOCKING_CONN_TEST_H
+#define NONBLOCKING_CONN_TEST_H
+
+#include "ace/Svc_Handler.h"
+#include "ace/SOCK_Stream.h"
+#include "ace/Synch.h"
+
+class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+public:
+
+  enum Connection_Status
+    {
+      SUCCEEDED,
+      FAILED
+    };
+
+  Svc_Handler (void);
+
+  void connection_status (Connection_Status &status,
+                          int &completion_counter);
+
+  int open (void *);
+
+  int handle_close (ACE_HANDLE handle,
+                    ACE_Reactor_Mask mask);
+
+  Connection_Status *status_;
+  int *completion_counter_;
+};
+
+#endif /* NONBLOCKING_CONN_TEST_H */
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index d871dce2133..c697f160161 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -46,6 +46,7 @@
 #include "ace/Strategies_T.h"
 #include "ace/Singleton.h"
 #include "ace/File_Lock.h"
+#include "ace/Synch.h"
 
 // Counting_Service and Options in here
 #include "Process_Strategy_Test.h"
diff --git a/tests/Reactor_Registration_Test.cpp b/tests/Reactor_Registration_Test.cpp
index 4cf25a5e593..6d3e3be5e21 100644
--- a/tests/Reactor_Registration_Test.cpp
+++ b/tests/Reactor_Registration_Test.cpp
@@ -21,6 +21,7 @@
 #include "ace/Select_Reactor.h"
 #include "ace/TP_Reactor.h"
 #include "ace/WFMO_Reactor.h"
+#include "ace/ACE.h"
 
 ACE_RCSID(tests, Reactor_Registration_Test, "$Id$")
 
diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp
index 9c5933f5d1d..8c4971134c9 100644
--- a/tests/Reactors_Test.cpp
+++ b/tests/Reactors_Test.cpp
@@ -23,6 +23,7 @@
 #include "ace/Task.h"
 #include "ace/Reactor.h"
 #include "ace/Atomic_Op.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 ACE_RCSID(tests, Reactors_Test, "$Id$")
 
diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp
index 46f10b7a78d..b7dc5541161 100644
--- a/tests/Recursive_Mutex_Test.cpp
+++ b/tests/Recursive_Mutex_Test.cpp
@@ -21,6 +21,7 @@
 #include "test_config.h"
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 ACE_RCSID(tests, Recursive_Mutex_Test, "$Id$")
 
diff --git a/tests/Reference_Counted_Event_Handler_Test.cpp b/tests/Reference_Counted_Event_Handler_Test.cpp
index 2b6dbb38955..89d495fed74 100644
--- a/tests/Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/Reference_Counted_Event_Handler_Test.cpp
@@ -22,6 +22,7 @@
 #include "ace/TP_Reactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Get_Opt.h"
+#include "ace/ACE.h"
 
 ACE_RCSID(tests, Reference_Counted_Event_Handler_Test, "$Id$")
 
diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp
index 20bd9493fab..62c77d26760 100644
--- a/tests/Svc_Handler_Test.cpp
+++ b/tests/Svc_Handler_Test.cpp
@@ -21,6 +21,7 @@
 #include "test_config.h"
 #include "ace/FILE_Connector.h"
 #include "ace/Svc_Handler.h"
+#include "ace/Synch.h"
 
 ACE_RCSID(tests, Svc_Handler_Test, "$Id$")
 
diff --git a/tests/TP_Reactor_Test.h b/tests/TP_Reactor_Test.h
index f98c5f41a4e..6ebfe56cece 100644
--- a/tests/TP_Reactor_Test.h
+++ b/tests/TP_Reactor_Test.h
@@ -27,6 +27,7 @@
 #include "ace/Acceptor.h"
 #include "ace/Connector.h"
 #include "ace/Svc_Handler.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 const  size_t MAX_SENDERS = 1000;
 const  size_t MAX_RECEIVERS = 1000;