ChangeLogTag:Sat May 6 19:05:32 2000 Ossama Othman <ossama@uci.edu>

12 files changed, 57 insertions, 48 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 8c0dbf88c78..5447e48be7a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -506,12 +506,12 @@ TAO_SSLIOP_Connector::connect (TAO_Profile *pfile,
           profile->addr_to_string (buffer,
                                    sizeof(buffer) - 1);
           ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) %s:%u, connection to "
-                      "%s failed (%p)\n",
+                      ACE_TEXT ("(%P|%t) %s:%u, connection to ")
+                      ACE_TEXT ("%s failed (%p)\n"),
                       __FILE__,
                       __LINE__,
                       buffer,
-                      "errno"));
+                      ACE_TEXT ("errno")));
         }
       return -1;
     }
@@ -528,8 +528,8 @@ TAO_SSLIOP_Connector::connect (TAO_Profile *pfile,
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("(%N|%l|%p|%t) messaging_init() ")
-                      ASYS_TEXT ("failed\n")));
+                      ACE_TEXT ("(%N|%l|%p|%t) messaging_init() ")
+                      ACE_TEXT ("failed\n")));
         }
       return -1;
     }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 5c6b3a9409c..bfbc428b6c6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -159,7 +159,7 @@ TAO_SSLIOP_Protocol_Factory::requires_explicit_endpoint (void) const
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_SSLIOP_Protocol_Factory,
-                       ASYS_TEXT ("SSLIOP_Factory"),
+                       ACE_TEXT ("SSLIOP_Factory"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_SSLIOP_Protocol_Factory),
                        ACE_Service_Type::DELETE_THIS |
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 9ffa5fe14c6..c11f6998b0c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -106,14 +106,13 @@ TAO_SSLIOP_Server_Transport::~TAO_SSLIOP_Server_Transport (void)
 
 // ****************************************************************
 
-TAO_SSLIOP_Client_Transport::
-    TAO_SSLIOP_Client_Transport (TAO_SSLIOP_Client_Connection_Handler *handler,
-                               TAO_ORB_Core *orb_core)
-  :  TAO_SSLIOP_Transport (handler,
-                         orb_core),
-     client_mesg_factory_ (0),
-     orb_core_ (orb_core),
-     params_ ()
+TAO_SSLIOP_Client_Transport::TAO_SSLIOP_Client_Transport (
+      TAO_SSLIOP_Client_Connection_Handler *handler,
+      TAO_ORB_Core *orb_core)
+  : TAO_SSLIOP_Transport (handler, orb_core),
+    client_mesg_factory_ (0),
+    orb_core_ (orb_core),
+    params_ ()
 {
 }
 
@@ -328,9 +327,9 @@ TAO_SSLIOP_Client_Transport::messaging_init (CORBA::Octet major,
               if (TAO_debug_level > 0)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
-                                     ASYS_TEXT ("(%N|%l|%p|%t) ")
-                                     ASYS_TEXT ("No matching minor ")
-                                     ASYS_TEXT ("version number \n")),
+                                     ACE_TEXT ("(%N|%l|%p|%t) ")
+                                     ACE_TEXT ("No matching minor ")
+                                     ACE_TEXT ("version number \n")),
                                     0);
                 }
             }
@@ -340,9 +339,9 @@ TAO_SSLIOP_Client_Transport::messaging_init (CORBA::Octet major,
           if (TAO_debug_level > 0)
             {
                   ACE_ERROR_RETURN ((LM_ERROR,
-                                     ASYS_TEXT ("(%N|%l|%p|%t) ")
-                                     ASYS_TEXT ("No matching minor ")
-                                     ASYS_TEXT ("version number \n")),
+                                     ACE_TEXT ("(%N|%l|%p|%t) ")
+                                     ACE_TEXT ("No matching minor ")
+                                     ACE_TEXT ("version number \n")),
                                     0);
             }
         }
diff --git a/ace/SSL/SSL_SOCK_Connector.cpp b/ace/SSL/SSL_SOCK_Connector.cpp
index 6fd7fe05509..903b6847d4a 100644
--- a/ace/SSL/SSL_SOCK_Connector.cpp
+++ b/ace/SSL/SSL_SOCK_Connector.cpp
@@ -139,6 +139,8 @@ ACE_SSL_SOCK_Connector::connect (ACE_SSL_SOCK_Stream &new_stream,
 {
   ACE_TRACE ("ACE_SSL_SOCK_Connector::connect");
 
+  // @@ FIXME: Not thread safe!
+
   if (this->non_ssl_connect_done_ == 0)
     {
       if (this->connector_.connect (new_stream.peer (),
@@ -177,6 +179,8 @@ ACE_SSL_SOCK_Connector::connect (ACE_SSL_SOCK_Stream &new_stream,
 {
   ACE_TRACE ("ACE_SSL_SOCK_Connector::connect");
 
+  // @@ FIXME: Not thread safe!
+
   if (this->non_ssl_connect_done_ == 0)
     {
       if (this->connector_.connect (new_stream.peer (),
@@ -211,6 +215,8 @@ ACE_SSL_SOCK_Connector::complete (ACE_SSL_SOCK_Stream &new_stream,
 {
   ACE_TRACE ("ACE_SSL_SOCK_Connector::complete");
 
+  // @@ FIXME: Not thread safe!
+
   if (this->non_ssl_connect_done_ == 0)
     {
       if (this->connector_.complete (new_stream.peer (),
@@ -253,8 +259,8 @@ ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (
       && timeout != 0
       && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR,
-		ASYS_TEXT ("%p\n"),
-		ASYS_TEXT (
+		ACE_TEXT ("%p\n"),
+		ACE_TEXT (
                   "ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"
                )));
 }
@@ -291,8 +297,8 @@ ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (
       && timeout != 0
       && !(errno == EWOULDBLOCK || errno == ETIME))
     ACE_ERROR ((LM_ERROR,
-		ASYS_TEXT ("%p\n"),
-		ASYS_TEXT (
+		ACE_TEXT ("%p\n"),
+		ACE_TEXT (
                   "ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"
               )));
 }
diff --git a/ace/SSL/SSL_SOCK_Connector.h b/ace/SSL/SSL_SOCK_Connector.h
index 76569ce36e3..7bab2a4cd36 100644
--- a/ace/SSL/SSL_SOCK_Connector.h
+++ b/ace/SSL/SSL_SOCK_Connector.h
@@ -37,14 +37,13 @@ class ACE_SSL_Export ACE_SSL_SOCK_Connector
   //   Defines a factory that creates new <ACE_Stream>s actively.
   //
   // = DESCRIPTION
-  //   The <ACE_SOCK_Connector> doesn't have a socket of its own,
-  //   i.e., it simply "borrows" the one from the ACE_SOCK_Stream
+  //   The <ACE_SSL_SOCK_Connector> doesn't have a socket of its own,
+  //   i.e., it simply "borrows" the one from the ACE_SSL_SOCK_Stream
   //   that's being connected.  The reason for this is that the
   //   underlying socket API doesn't use a "factory" socket to connect
   //   "data-mode" sockets.  Therefore, there's no need to inherit
-  //   <ACE_SOCK_Connector> from <ACE_SOCK>.  A nice side-effect of
-  //   this is that <ACE_SOCK_Connector>'s do not store state so they
-  //   can be used reentrantly in multi-threaded programs.
+  //   <ACE_SSL_SOCK_Connector> from <ACE_SSL_SOCK>.
+
 public:
   // = Initialization and termination methods.
   ACE_SSL_SOCK_Connector (void);
diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i
index 0683b438111..c493d1a8b6b 100644
--- a/ace/SSL/SSL_SOCK_Stream.i
+++ b/ace/SSL/SSL_SOCK_Stream.i
@@ -60,6 +60,8 @@ ACE_SSL_SOCK_Stream::send (const void *buf,
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::send");
 
+  // @@ FIXME: Not thread safe!
+
   // No send flags are supported in SSL.
   if (flags != 0)
     ACE_NOTSUP_RETURN (-1);
@@ -93,6 +95,8 @@ ACE_SSL_SOCK_Stream::recv (void *buf,
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::recv");
 
+  // @@ FIXME: Not thread safe!
+
   if (flags)
     {
       if (ACE_BIT_ENABLED (flags, MSG_PEEK))
@@ -130,6 +134,8 @@ ACE_SSL_SOCK_Stream::send (const void *buf,
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::send");
 
+  // @@ FIXME: Not thread safe!
+
   int status = ::SSL_write (this->ssl_,
                             ACE_static_cast (const char *, buf),
                             n);
@@ -158,6 +164,8 @@ ACE_SSL_SOCK_Stream::recv (void *buf,
 {
   ACE_TRACE ("ACE_SSL_SOCK_Stream::recv");
 
+  // @@ FIXME: Not thread safe!
+
   int status = ::SSL_read (this->ssl_,
                            ACE_static_cast (char*, buf),
                            n);
diff --git a/examples/IPC_SAP/SSL_SAP/Makefile b/examples/IPC_SAP/SSL_SAP/Makefile
index 53473ee54f4..5e39183b406 100644
--- a/examples/IPC_SAP/SSL_SAP/Makefile
+++ b/examples/IPC_SAP/SSL_SAP/Makefile
@@ -428,7 +428,6 @@ endif
  $(ACE_ROOT)/ace/Functor_T.h \
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
@@ -448,9 +447,7 @@ endif
  $(ACE_ROOT)/ace/Module.i \
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index 1687678499e..024a3b3eb0a 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -323,7 +323,7 @@ Options::twoway_client_test (void)
   double messages_per_sec = iteration * double (ACE_ONE_SECOND_IN_USECS) / real_time;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) messages = %d\n(%t) usec-per-message = %f\n(%t) messages-per-second = %0.00f\n"),
+              ACE_TEXT ("(%t) messages = %d\n(%t) usec-per-message = %f\n(%t) messages-per-second = %0.00f\n"),
               iteration,
               real_time / double (iteration),
               messages_per_sec < 0 ? 0 : messages_per_sec));
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index 42d9f2b79f6..05249d59405 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -350,9 +350,9 @@ Options::twoway_client_test (void *)
     iteration * double (ACE_ONE_SECOND_IN_USECS) / real_time;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) messages = %d\n")
-              ASYS_TEXT ("(%t) usec-per-message = %f\n")
-              ASYS_TEXT ("(%t) messages-per-second = %0.00f\n"),
+              ACE_TEXT ("(%t) messages = %d\n")
+              ACE_TEXT ("(%t) usec-per-message = %f\n")
+              ACE_TEXT ("(%t) messages-per-second = %0.00f\n"),
               iteration,
               real_time / double (iteration),
               messages_per_sec < 0 ? 0 : messages_per_sec));
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index 370813eb372..17c6364bd75 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -358,13 +358,13 @@ Oneway_Handler::print_results (void)
   this->timer_.elapsed_time (et);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\t\treal time = %f secs \n\t\tuser time = %f secs \n\t\tsystem time = %f secs\n"),
+              ACE_TEXT ("\t\treal time = %f secs \n\t\tuser time = %f secs \n\t\tsystem time = %f secs\n"),
               et.real_time,
               et.user_time,
               et.system_time));
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\t\tmessages = %d\n\t\ttotal bytes = %d\n\t\tmbits/sec = %f\n\t\tusec-per-message = %f\n"),
+              ACE_TEXT ("\t\tmessages = %d\n\t\ttotal bytes = %d\n\t\tmbits/sec = %f\n\t\tusec-per-message = %f\n"),
               this->message_count_,
               this->total_bytes_,
               (((double) this->total_bytes_ * 8) / et.real_time) / (double) (1024 * 1024),
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
index 1c5050c13ef..eda6f62abfb 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
@@ -227,7 +227,7 @@ oneway_server (ACE_SSL_SOCK_Stream &stream)
   timer.elapsed_time (et);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\t\treal time = %f secs \n\t\tuser time = %f secs \n\t\tsystem time = %f secs\n"),
+              ACE_TEXT ("\t\treal time = %f secs \n\t\tuser time = %f secs \n\t\tsystem time = %f secs\n"),
               et.real_time,
               et.user_time,
               et.system_time));
@@ -235,7 +235,7 @@ oneway_server (ACE_SSL_SOCK_Stream &stream)
   double messages_per_sec = double (message_count) / et.real_time;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\t\tmessages = %d\n\t\ttotal bytes = %d\n\t\tmbits/sec = %f\n\t\tusec-per-message = %f\n\t\tmessages-per-second = %0.00f\n"),
+              ACE_TEXT ("\t\tmessages = %d\n\t\ttotal bytes = %d\n\t\tmbits/sec = %f\n\t\tusec-per-message = %f\n\t\tmessages-per-second = %0.00f\n"),
               message_count,
               total_bytes,
               (((double) total_bytes * 8) / et.real_time) / (double) (1024 * 1024),
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
index 71685fd3c17..534bbbe2e2e 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
@@ -250,9 +250,9 @@ oneway_server (void *arg)
   timer.elapsed_time (et);
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\t\treal time = %f secs \n")
-              ASYS_TEXT ("\t\tuser time = %f secs \n")
-              ASYS_TEXT ("\t\tsystem time = %f secs\n"),
+              ACE_TEXT ("\t\treal time = %f secs \n")
+              ACE_TEXT ("\t\tuser time = %f secs \n")
+              ACE_TEXT ("\t\tsystem time = %f secs\n"),
               et.real_time,
               et.user_time,
               et.system_time));
@@ -260,11 +260,11 @@ oneway_server (void *arg)
   double messages_per_sec = double (message_count) / et.real_time;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\t\tmessages = %d\n")
-              ASYS_TEXT ("\t\ttotal bytes = %d\n")
-              ASYS_TEXT ("\t\tmbits/sec = %f\n")
-              ASYS_TEXT ("\t\tusec-per-message = %f\n")
-              ASYS_TEXT ("\t\tmessages-per-second = %0.00f\n"),
+              ACE_TEXT ("\t\tmessages = %d\n")
+              ACE_TEXT ("\t\ttotal bytes = %d\n")
+              ACE_TEXT ("\t\tmbits/sec = %f\n")
+              ACE_TEXT ("\t\tusec-per-message = %f\n")
+              ACE_TEXT ("\t\tmessages-per-second = %0.00f\n"),
               message_count,
               total_bytes,
               (((double) total_bytes * 8) / et.real_time) / (double) (1024 * 1024),