*** empty log message ***

9 files changed, 31 insertions, 24 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index d0198de6996..1d5f4395199 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -44,18 +44,10 @@ namespace {
     ACE_ENV_ARG_DECL)
   {
     FTRTEC_TRACE("obtain_push_consumer_and_connect");
-    FTRTEC_LOGTIME("obtain_push_consumer_and_connect");
 
-    {
-      TAO_FTRTEC::TimeLogger logger("Request_Context_Repository().set_object_id()");
     Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER);
-    }
-    RtecEventChannelAdmin::ProxyPushConsumer_var consumer;
-    {
-      TAO_FTRTEC::TimeLogger logger("ec->supplier_admin()->obtain()");
-    consumer =
+    RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
       ec->supplier_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
 
     ACE_CHECK;
 
@@ -63,12 +55,9 @@ namespace {
       &TAO_FTEC_SupplierAdmin::disconnect,
       consumer.in());
 
-    {
-      TAO_FTRTEC::TimeLogger logger("consumer->connect_push_supplier()");
     consumer->connect_push_supplier(push_supplier, qos
       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    }
 
     guard.Dismiss();
   }
@@ -380,8 +369,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
 {
   FTRTEC_TRACE("TAO_FTEC_Event_Channel_Impl::connect_push_supplier"); 
   FtRtecEventChannelAdmin::ObjectId_var object_id;
-  {
-  FTRTEC_LOGTIME("TAO_FTEC_Event_Channel_Impl::connect_push_supplier");
   CORBA::Any_var any
     = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(0);
@@ -396,7 +383,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
     return result;
   }
 
-
   ACE_NEW_THROW_EX(oid, FtRtecEventChannelAdmin::ObjectId, CORBA::NO_MEMORY());
   object_id = oid;
 
@@ -409,8 +395,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
                                    ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN(0);
-  }
-  TAO_FTRTEC::TimeLogger::output();
 
   return object_id._retn();
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index f57066f27d0..c1a5b4bc4b4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -21,7 +21,6 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
   const FtRtecEventChannelAdmin::Operation& op
   ACE_ENV_ARG_DECL)
 {
-  FTRTEC_LOGTIME("FT_ProxyAdmin::obtain_proxy(op)");
   Request_Context_Repository().set_object_id(op.object_id
                                      ACE_ENV_ARG_PARAMETER);
 
@@ -53,8 +52,6 @@ template <class EC_PROXY_ADMIN, class Proxy,
 typename FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::ProxyInterface_ptr
 FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  FTRTEC_LOGTIME("FT_ProxyAdmin::obtain_proxy()");
-
   CORBA::Any_var any = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(0);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index ee057299409..b37a1e050b4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -221,8 +221,6 @@ FtEventServiceInterceptor::receive_request_service_contexts (
       ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(block1);
 
-    FTRTEC_LOGTIME("FtEventServiceInterceptor::receive_request_service_contexts");
-
     bool is_new_request = request_table_.is_new_request(
       ft_request_service_context.client_id.in(),
       ft_request_service_context.retention_id);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 8b6cdce1b9c..4291efacc17 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -144,6 +144,7 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr info)
         /// there's nothing we can do if the naming service is down
       }
       ACE_ENDTRY;
+
     }
   }
   info_ = info;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index e1089957e24..41cbc01350d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -20,15 +20,17 @@ ACE_RCSID (EventChannel,
 
 
 static IOGR_Maker* maker;
+static CORBA::ORB_ptr orb;
 
 IOGR_Maker::IOGR_Maker()
 {
 }
 
 void
-IOGR_Maker::init(CORBA::ORB_ptr orb
+IOGR_Maker::init(CORBA::ORB_ptr the_orb
                  ACE_ENV_ARG_DECL)
 {
+    orb = the_orb;
     iorm_ = resolve_init<TAO_IOP::TAO_IOR_Manipulation>(orb,
                                                         TAO_OBJID_IORMANIPULATION
                                                         ACE_ENV_ARG_PARAMETER);
@@ -69,6 +71,13 @@ IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
                      ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN(CORBA::Object::_nil());
+
+  if (TAO_FTRTEC::Log::level() > 3)
+  {
+    CORBA::String_var str = orb->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_DEBUG((LM_DEBUG, "new IOGR = %s\n", str.in()));
+  }
+
   return obj._retn();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 6e233be3e21..16daa60e23c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -433,7 +433,6 @@ void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier (
   TAO_FTRTEC::Log(3, "FTEC_Gateway_ProxyPushConsumer::connect_push_supplier\n");
   PortableServer::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  FTRTEC_LOGTIME("FTEC_Gateway_ProxyPushSupplier::connect_push_supplier");
   *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
index 553d602c6e9..078c625e144 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
@@ -45,6 +45,7 @@ namespace TAO_FTRTEC {
   public:
     Log (unsigned int log_level, const ACE_TCHAR* format, ...);
     static void level(unsigned int log_level);
+    static unsigned int level();
     static void hexdump(unsigned int log_level, const char* buf, size_t len, const char* msg);
   private:
     friend class Trace;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
index 909d297eea0..07ec051f99a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
@@ -24,6 +24,12 @@ namespace TAO_FTRTEC {
   }
 
   ACE_INLINE
+  unsigned int Log::level()
+  {
+    return log_level_;
+  }
+
+  ACE_INLINE
   void Log::hexdump(unsigned int level, const char* buf, size_t len, const char* msg)
   {
     if (Log::log_level_ >= level)
@@ -51,6 +57,12 @@ namespace TAO_FTRTEC {
   }
 
   ACE_INLINE
+  unsigned int Log::level()
+  {
+    return 0;
+  }
+
+  ACE_INLINE
   void Log::hexdump(unsigned int, const char*, size_t, const char*)
   {
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/RT_Task.cpp
index e716faca87d..6e5e10231e8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/RT_Task.cpp
@@ -3,18 +3,23 @@
 #include "ace/Task.h"
 #include "ace/Sched_Params.h"
 
+#define ENABLE_RT_CLASS 0
+
 void RT_Task::set_current()
 {
+#if ENABLE_RT_CLASS == 1
   ACE_hthread_t thr_handle;
   ACE_Thread::self (thr_handle);
   long prio = ACE_Sched_Params::priority_max(ACE_SCHED_FIFO);
   if (ACE_OS::thr_setprio(thr_handle, prio, ACE_SCHED_FIFO) == -1){
     ACE_DEBUG((LM_DEBUG, "Cannot set the thread to RT class\n"));
   }
+#endif
 }
 
 int RT_Task::activate(ACE_Task_Base* task)
 {
+#if ENABLE_RT_CLASS == 1
   long priority = ACE_Sched_Params::priority_max(ACE_SCHED_FIFO);
   long flags = THR_NEW_LWP;
 
@@ -67,5 +72,6 @@ int RT_Task::activate(ACE_Task_Base* task)
                         -1));
         }
     }
+#endif
   return 0;
 }