ChangeLogTag: Wed Jan 17 18:16:18 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>

12 files changed, 86 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 755c8076c10..2998a2a237f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Jan 17 18:16:18 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/Transport.h:
+        * tao/Transport.inl:
+        * tao/Transport.cpp:
+        * tao/TransportCurrent/Current_Impl.h:
+        * tao/TransportCurrent/Current_Impl.cpp:
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_Loader.cpp:
+        * tao/TransportCurrent/IIOP_Current_Impl.h:
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+        * tao/TransportCurrent/IIOP_Current_Loader.h:
+        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+        * tests/TransportCurrent/IIOP/client.cpp:
+        * tests/TransportCurrent/IIOP/server.cpp:
+
+          Updated to prevent any footprint impact when
+          Transport::Current functionality is disabled
+          (TAO_HAS_TRANSPORT_CURRENT is 0 or undefined)
+
 Wed Jan 17 16:05:42 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/orbsvcs/Notify/Properties.h:
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 8138085af05..755880a3d26 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -114,10 +114,12 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
 TAO::Transport::Stats::~Stats ()
 {
   // no-op
 }
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
 TAO_Transport::TAO_Transport (CORBA::ULong tag,
                               TAO_ORB_Core *orb_core)
@@ -168,8 +170,6 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   ACE_NEW_THROW_EX (this->stats_,
                     TAO::Transport::Stats,
                     CORBA::NO_MEMORY ());
-#else
-  this->stats_ = 0;
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   /*
@@ -1247,9 +1247,11 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
         break;
     }
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
   // "Count" the message, only if no error was encountered.
   if (ret != -1 && this->stats_ != 0)
     this->stats_->messages_sent (message_length);
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   return ret;
 }
@@ -2221,9 +2223,11 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
   // Get the <message_type> that we have received
   const TAO_Pluggable_Message_Type t = qd->msg_type_;
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
   // Update stats, if any
   if (this->stats_ != 0)
     this->stats_->messages_received (qd->msg_block_->length ());
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   if (t == TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION)
     {
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 6053ddcbcd0..94308e15e9d 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -1076,8 +1076,10 @@ private:
   TAO_MMAP_Allocator * const mmap_allocator_;
 #endif  /* TAO_HAS_SENDFILE==1 */
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
   /// Statistics
   TAO::Transport::Stats* stats_;
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   /*
    * specialization hook to add class members from concrete
@@ -1094,6 +1096,7 @@ private:
 
 //@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
 namespace TAO
 {
   namespace Transport
@@ -1132,12 +1135,12 @@ namespace TAO
       const ACE_Time_Value& opened_since (void) const;
 
     private:
-      // @NOTE: I could have used bytes_rcvd_.samples_count() instead,
+      // The bytes_rcvd_.samples_count() could have been used instead,
       // however there was a suspicion that 32 bits would be
       // insufficient.
       CORBA::LongLong messages_rcvd_;
 
-      // @NOTE: I could have used bytes_sent_.samples_count() instead,
+      // The bytes_sent_.samples_count() could have been used instead,
       // however there was a suspicion that 32 bits would be
       // insufficient.
       CORBA::LongLong messages_sent_;
@@ -1149,6 +1152,7 @@ namespace TAO
     };
   }
 }
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index e53d2848830..88d3683de7d 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -189,6 +189,8 @@ TAO_Transport::sent_byte_count (void) const
   return this->sent_byte_count_;
 }
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 ACE_INLINE TAO::Transport::Stats*
 TAO_Transport::stats (void) const
 {
@@ -254,6 +256,7 @@ TAO::Transport::Stats::opened_since (void) const
 {
   return this->opened_since_;
 }
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 3dab7b8c310..564764a5247 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -1,13 +1,17 @@
 // $Id$
+// @file: Current_Impl.cpp
+//
 
-#include "tao/Transport.h"
-#include "tao/Transport_Selection_Guard.h"
+#include /**/ "tao/Transport.h"
 
+#include "tao/Transport_Selection_Guard.h"
 #include "tao/TransportCurrent/Current_Loader.h"
 #include "tao/TransportCurrent/Current_Impl.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 namespace TAO
 {
   namespace Transport
@@ -102,5 +106,7 @@ namespace TAO
 
 }
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 68731b626ec..8fc01419b5d 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -9,6 +9,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 #include "tao/TransportCurrent/TCC.h"
 #include "tao/LocalObject.h"
 
@@ -114,6 +116,9 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
+
 #include /**/ "ace/post.h"
 
 #endif /* CURRENT_IMPL_H */
diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index a4e2a6dde40..11fa994497b 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -16,14 +16,17 @@
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
-#include "tao/TransportCurrent/Current_ORBInitializer.h"
-#include "tao/TransportCurrent/Current_Loader.h"
-#include "tao/TransportCurrent/Current_Impl.h"
 
 ACE_RCSID (TC,
            Current_Loader,
            "$Id$")
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+#include "tao/TransportCurrent/Current_ORBInitializer.h"
+#include "tao/TransportCurrent/Current_Loader.h"
+#include "tao/TransportCurrent/Current_Impl.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -87,6 +90,7 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+
 #endif /* defined (TAO_AS_STATIC_LIBS) */
 
 
@@ -102,3 +106,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Transport_Current_Loader,
 ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current,
                               TAO_Transport_Current_Loader,
                               TAO::Transport::Current_Loader)
+
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index 388a3b7c342..7ea115f8c6b 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -23,6 +23,10 @@
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 #include "tao/Versioned_Namespace.h"
+
+
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 #include "tao/TransportCurrent/Transport_Current_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -71,6 +75,8 @@ ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current,
 ACE_FACTORY_DECLARE (TAO_Transport_Current,
                      TAO_Transport_Current_Loader)
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TRANSPORT_CURRENT_LOADER_H */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 97129f16539..015ff4cd099 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -5,6 +5,8 @@
 #include "tao/IIOP_Transport.h"
 #include "tao/Transport_Selection_Guard.h"
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 #include "IIOP_Current_Impl.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -149,3 +151,6 @@ namespace TAO
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
+
+
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index a39f527b50e..76659a27cc4 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -17,6 +17,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 #include "tao/TransportCurrent/TC_IIOPC.h"
 #include "tao/TransportCurrent/Current_Impl.h"
 
@@ -104,6 +106,8 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 #include /**/ "ace/post.h"
 
 #endif /* IIOP_CURRENT_IMPL_H */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
index 97d2a1071d4..2f1e5a86f58 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
@@ -13,20 +13,20 @@
 
 
 #include "ace/Service_Config.h"
-
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORB_Constants.h"
-
 #include "tao/PI/PI.h"
 
-#include "tao/TransportCurrent/Current_ORBInitializer.h"
-#include "tao/TransportCurrent/IIOP_Current_Loader.h"
-#include "tao/TransportCurrent/IIOP_Current_Impl.h"
-
 ACE_RCSID (Transport_Current,
            IIOP_Current_Loader,
            "$Id$")
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+#include "tao/TransportCurrent/Current_ORBInitializer.h"
+#include "tao/TransportCurrent/IIOP_Current_Loader.h"
+#include "tao/TransportCurrent/IIOP_Current_Impl.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -71,7 +71,6 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
-
 #if defined (TAO_AS_STATIC_LIBS)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -108,3 +107,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Transport_IIOP_Current_Loader,
 ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current,
                               TAO_Transport_IIOP_Current_Loader,
                               TAO::Transport::IIOP::Current_Loader)
+
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
index 2199de74781..e2b74e217e0 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
@@ -17,6 +17,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+
 #include "tao/TransportCurrent/Current_Loader.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -67,4 +71,6 @@ ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current,
 ACE_FACTORY_DECLARE (TAO_Transport_Current,
                      TAO_Transport_IIOP_Current_Loader)
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 #endif /* TAO_TRANSPORT_IIOP_TRAITS_LOADER_H */