Tue Feb 9 11:04:46 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h:
        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
          Added thread swich test to Sender component.

        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
          Optimized logging.

5 files changed, 196 insertions, 126 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
index ecc74fd4da5..62e5d05ac78 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
@@ -298,26 +298,26 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   {
      if (this->rejected_.value ())
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                               ACE_TEXT ("'on_sample_rejected' in the Receiver\n")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Have received the expected ")
+                              ACE_TEXT ("'on_sample_rejected'\n")
                     ));
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT ("warning 'on_sample_rejected' in the Receiver\n")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
+                              ACE_TEXT ("warning 'on_sample_rejected'\n")
                     ));
       }
     if (this->thread_id_listener_.value () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread ID for ConnectorStatusListener not set!\n"));
       }
     #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
     else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
                               "Thread switch for ConnectorStatusListener seems OK. "
                               "(DDS uses the CCM thread for its callback) "
                               "listener <%u> - component <%u>\n",
@@ -326,7 +326,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread switch for ConnectorStatusListener "
                               "doesn't seem to work! "
                               "listener <%u> - component <%u>\n",
@@ -337,7 +337,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
     else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: ConnectorStatusListener: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
                               "DDS seems to use a CCM thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_.value (),
@@ -345,7 +345,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : ConnectorStatusListener: "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
                               "DDS seems to use its own thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_.value (),
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
index 7958530c24e..74c05a5f813 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
@@ -17,8 +17,10 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   //============================================================
   // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &rejected)
-   : rejected_ (rejected)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &rejected,
+                                                                  Atomic_ThreadId &thread_id)
+    : rejected_ (rejected),
+      thread_id_ (thread_id)
   {
   }
 
@@ -29,41 +31,48 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/){
-    }
+     const DDS::InconsistentTopicStatus & /*status*/)
+  {
+  }
 
   void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
-    }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)
+  {
+  }
 
   void ConnectorStatusListener_exec_i::on_sample_rejected(
-     ::DDS::DataReader_ptr the_reader,
-     const DDS::SampleRejectedStatus & status)  {
-       if((status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT) &&
-          (!CORBA::is_nil(the_reader)))
-         {
-           this->rejected_ = true;
-         }
-    }
+    ::DDS::DataReader_ptr the_reader,
+    const DDS::SampleRejectedStatus & status)
+  {
+    this->thread_id_ = ACE_Thread::self ();
+    if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT &&
+        !CORBA::is_nil(the_reader))
+      {
+        this->rejected_ = true;
+      }
+  }
 
   void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-     ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
-    }
+    ::DDS::DataWriter_ptr /*the_writer*/,
+    const DDS::OfferedDeadlineMissedStatus & /*status*/)
+  {
+  }
 
   void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-     ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
-   }
+    ::DDS::DataWriter_ptr /*the_writer*/,
+    const DDS::OfferedIncompatibleQosStatus & /*status*/)
+  {
+  }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)  {
-    }
+    ::DDS::StatusKind  /*status_kind*/)
+  {
+  }
 
   //============================================================
-  // Pulse generator
+  // pulse_Generator
   //============================================================
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
@@ -77,13 +86,14 @@ namespace CIAO_CSL_SRTest_Sender_Impl
     this->pulse_callback_.tick ();
     return 0;
   }
+
   //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
+  // Sender_exec_i
   //============================================================
-
   Sender_exec_i::Sender_exec_i (void)
     : rejected_ (false),
-      rate_ (100)
+      rate_ (100),
+      thread_id_listener_ (0)
   {
     this->ticker_ = new pulse_Generator (*this);
   }
@@ -95,7 +105,8 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Sender_exec_i::get_test_topic_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->rejected_);
+    return new ConnectorStatusListener_exec_i (this->rejected_,
+                                               this->thread_id_listener_);
   }
 
   // Supported operations and attributes.
@@ -103,21 +114,22 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   Sender_exec_i::tick ()
   {
     for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
-        i != this->_ktests_.end ();
-        ++i)
+         i != this->_ktests_.end ();
+         ++i)
       {
-         try
-         {
-           if (!CORBA::is_nil (this->writer_) ) {
-              this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
-              i->second->x++;
-           }
-         }
-         catch (const CCM_DDS::InternalError& )
-         {
-           ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
+        try
+          {
+            if (!CORBA::is_nil (this->writer_))
+              {
+                this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
+                i->second->x++;
+              }
+          }
+        catch (const CCM_DDS::InternalError& )
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
                     i->first.c_str ()));
-         }
+          }
        }
   }
 
@@ -132,10 +144,10 @@ namespace CIAO_CSL_SRTest_Sender_Impl
                 0,
                 ACE_Time_Value (0, usec),
                 ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+                              ACE_TEXT ("Error scheduling timer\n")));
+      }
   }
 
   void
@@ -171,12 +183,13 @@ namespace CIAO_CSL_SRTest_Sender_Impl
     new_key->x = x;
     this->_ktests_[key] = new_key;
   }
+
   void
   Sender_exec_i::ccm_activate (void)
   {
     //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE",1);
-    this->add_instance_of_topic ("TWO",2);
+    this->add_instance_of_topic ("ONE", 1);
+    this->add_instance_of_topic ("TWO", 2);
     this->start ();
   }
 
@@ -189,18 +202,62 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   void
   Sender_exec_i::ccm_remove (void)
   {
-    if(!this->rejected_.value ())
+    if (!this->rejected_.value ())
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
+                              ACE_TEXT ("warning 'on_sample_rejected'\n")
+                  ));
+      }
+    else
+      {
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: ")
+                               ACE_TEXT ("Received the expected 'on_sample_rejected'\n")
+                   ));
+      }
+    if (this->thread_id_listener_.value () == 0)
+      {
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
+                              "Thread ID for ConnectorStatusListener not set!\n"));
+      }
+    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
+    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
+                                ACE_Thread::self ()))
+      {
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
+                              "Thread switch for ConnectorStatusListener seems OK. "
+                              "(DDS uses the CCM thread for its callback) "
+                              "listener <%u> - component <%u>\n",
+                              this->thread_id_listener_.value (),
+                              ACE_Thread::self ()));
+      }
+    else
+      {
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
+                              "Thread switch for ConnectorStatusListener "
+                              "doesn't seem to work! "
+                              "listener <%u> - component <%u>\n",
+                              this->thread_id_listener_.value (),
+                              ACE_Thread::self ()));
+      }
+    #else
+    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
+                                ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT ("warning 'on_sample_rejected' in Sender\n")
-                    ));
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
+                              "DDS seems to use a CCM thread for its callback: "
+                              "listener <%u> - component <%u>\n",
+                              this->thread_id_listener_.value (),
+                              ACE_Thread::self ()));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                               ACE_TEXT ("'on_sample_rejected' in Sender\n")
-                    ));
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
+                              "DDS seems to use its own thread for its callback: "
+                              "listener <%u> - component <%u>\n",
+                              this->thread_id_listener_.value (),
+                              ACE_Thread::self ()));
       }
+    #endif
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
index e79beb1145e..3758f820aa0 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
@@ -20,53 +20,63 @@
 namespace CIAO_CSL_SRTest_Sender_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   class Sender_exec_i;
 
+  //============================================================
+  // pulse_Generator
+  //============================================================
   class pulse_Generator :
     public ACE_Event_Handler
   {
   public:
     pulse_Generator (Sender_exec_i &callback);
-    /// Handle the timeout.
+
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
-    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
 
-class SENDER_EXEC_Export ConnectorStatusListener_exec_i
+  //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-   virtual ~ConnectorStatusListener_exec_i (void);
-    
+    ConnectorStatusListener_exec_i (Atomic_Boolean &,
+                                    Atomic_ThreadId &);
+    virtual ~ConnectorStatusListener_exec_i (void);
+
     virtual
-    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
+    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
+    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
                              const DDS::SampleRejectedStatus & status);
     virtual
-      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
+    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
-       ::DDS::StatusKind  status_kind);
-     private:
+    void on_unexpected_status (::DDS::Entity_ptr the_entity,
+                               ::DDS::StatusKind  status_kind);
+  private:
     Atomic_Boolean &rejected_;
-  
+    Atomic_ThreadId &thread_id_;
   };
 
+  //============================================================
+  // Sender_exec_i
+  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -74,7 +84,7 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
-    virtual void add_instance_of_topic (const char *, int x );
+
     void tick (void);
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
@@ -85,7 +95,7 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
 
     // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-      get_test_topic_connector_status(void);
+    get_test_topic_connector_status (void);
 
   private:
     void start (void);
@@ -94,13 +104,16 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     CCM_DDS::TestTopic::Writer_var writer_;
    ::CSL_SRTest::CCM_Sender_Context_var context_;
     pulse_Generator * ticker_;
- 
+
     Atomic_Boolean rejected_;
     CORBA::ULong rate_;
-   
+    Atomic_ThreadId thread_id_listener_;
+
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table;
     CSL_SRTest_Table _ktests_;
+
+    void add_instance_of_topic (const char *, int x);
  };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
index 099eac6c91a..38525323ff1 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
@@ -207,52 +207,52 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   {
      if (!this->subscription_matched_received_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Didn't receive the expected ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
+                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")
                     ));
       }
     if (!this->publication_matched_received_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Didn't receive the expected ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Received the expected ")
-                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' in Receiver\n")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
+                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' \n")
                     ));
       }
     if (!this->liveliness_changed_received_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Didn't receive the expected ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' in Receiver\n")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
+                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' \n")
                     ));
       }
 
     //test thread switch for SUBSCRIPTION_MATCHED_STATUS
     if (this->thread_id_listener_subscription_matched_.value () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread ID for 'SUBSCRIPTION_MATCHED_STATUS' not set!\n"));
       }
     #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
     else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
                               "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' seems OK. "
                               "(DDS uses the CCM thread for its callback) "
                               "listener <%u> - component <%u>\n",
@@ -261,7 +261,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' "
                               "doesn't seem to work! "
                               "listener <%u> - component <%u>\n",
@@ -272,7 +272,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
                               "DDS seems to use a CCM thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_subscription_matched_.value (),
@@ -280,7 +280,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : 'SUBSCRIPTION_MATCHED_STATUS': "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'SUBSCRIPTION_MATCHED_STATUS': "
                               "DDS seems to use its own thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_subscription_matched_.value (),
@@ -291,14 +291,14 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     //test thread switch for PUBLICATION_MATCHED_STATUS
     if (this->thread_id_listener_publication_matched_.value () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread ID for 'PUBLICATION_MATCHED_STATUS' not set!\n"));
       }
     #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
     else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
                               "Thread switch for 'PUBLICATION_MATCHED_STATUS' seems OK. "
                               "(DDS uses the CCM thread for its callback) "
                               "listener <%u> - component <%u>\n",
@@ -307,7 +307,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread switch for 'PUBLICATION_MATCHED_STATUS' "
                               "doesn't seem to work! "
                               "listener <%u> - component <%u>\n",
@@ -318,7 +318,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: 'PUBLICATION_MATCHED_STATUS': "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'PUBLICATION_MATCHED_STATUS': "
                               "DDS seems to use a CCM thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_publication_matched_.value (),
@@ -326,7 +326,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : 'PUBLICATION_MATCHED_STATUS': "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'PUBLICATION_MATCHED_STATUS': "
                               "DDS seems to use its own thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_publication_matched_.value (),
@@ -337,14 +337,14 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     //test thread switch for LIVELINESS_CHANGED_STATUS
     if (this->thread_id_listener_liveliness_changed_.value () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread ID for 'LIVELINESS_CHANGED_STATUS' not set!\n"));
       }
     #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
     else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
                               "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. "
                               "(DDS uses the CCM thread for its callback) "
                               "listener <%u> - component <%u>\n",
@@ -353,7 +353,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
                               "Thread switch for 'LIVELINESS_CHANGED_STATUS' "
                               "doesn't seem to work! "
                               "listener <%u> - component <%u>\n",
@@ -364,7 +364,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: 'LIVELINESS_CHANGED_STATUS': "
+        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'LIVELINESS_CHANGED_STATUS': "
                               "DDS seems to use a CCM thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_liveliness_changed_.value (),
@@ -372,7 +372,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : 'LIVELINESS_CHANGED_STATUS': "
+        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'LIVELINESS_CHANGED_STATUS': "
                               "DDS seems to use its own thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_liveliness_changed_.value (),
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
index 874c06d46ac..71a64437119 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
@@ -150,37 +150,37 @@ namespace CIAO_CSL_USTest_Sender_Impl
   {
      if (!this->subscription_matched_received_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Didn't receive the expected ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Received the expected ")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
                                ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n")
                     ));
       }
     if (!this->publication_matched_received_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Didn't receive the expected ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Received the expected ")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
                                ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' in Receiver\n")
                     ));
       }
     if (!this->liveliness_changed_received_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Didn't receive the expected ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Received the expected ")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
                                ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' in Receiver\n")
                     ));
       }
@@ -188,14 +188,14 @@ namespace CIAO_CSL_USTest_Sender_Impl
     //test thread switch for SUBSCRIPTION_MATCHED_STATUS
     if (this->thread_id_listener_subscription_matched_.value () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
                               "Thread ID for 'SUBSCRIPTION_MATCHED_STATUS' not set!\n"));
       }
     #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
     else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
                               "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' seems OK. "
                               "(DDS uses the CCM thread for its callback) "
                               "listener <%u> - component <%u>\n",
@@ -204,7 +204,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
                               "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' "
                               "doesn't seem to work! "
                               "listener <%u> - component <%u>\n",
@@ -215,7 +215,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
     else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
                               "DDS seems to use a CCM thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_subscription_matched_.value (),
@@ -223,7 +223,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : 'SUBSCRIPTION_MATCHED_STATUS': "
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'SUBSCRIPTION_MATCHED_STATUS': "
                               "DDS seems to use its own thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_subscription_matched_.value (),
@@ -234,14 +234,14 @@ namespace CIAO_CSL_USTest_Sender_Impl
     //test thread switch for PUBLICATION_MATCHED_STATUS
     if (this->thread_id_listener_publication_matched_.value () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
                               "Thread ID for 'PUBLICATION_MATCHED_STATUS' not set!\n"));
       }
     #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
     else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
                               "Thread switch for 'PUBLICATION_MATCHED_STATUS' seems OK. "
                               "(DDS uses the CCM thread for its callback) "
                               "listener <%u> - component <%u>\n",
@@ -250,7 +250,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
                               "Thread switch for 'PUBLICATION_MATCHED_STATUS' "
                               "doesn't seem to work! "
                               "listener <%u> - component <%u>\n",
@@ -261,7 +261,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
     else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: 'PUBLICATION_MATCHED_STATUS': "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'PUBLICATION_MATCHED_STATUS': "
                               "DDS seems to use a CCM thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_publication_matched_.value (),
@@ -269,7 +269,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : 'PUBLICATION_MATCHED_STATUS': "
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'PUBLICATION_MATCHED_STATUS': "
                               "DDS seems to use its own thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_publication_matched_.value (),
@@ -280,14 +280,14 @@ namespace CIAO_CSL_USTest_Sender_Impl
     //test thread switch for LIVELINESS_CHANGED_STATUS
     if (this->thread_id_listener_liveliness_changed_.value () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
                               "Thread ID for 'LIVELINESS_CHANGED_STATUS' not set!\n"));
       }
     #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
     else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
                               "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. "
                               "(DDS uses the CCM thread for its callback) "
                               "listener <%u> - component <%u>\n",
@@ -296,7 +296,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
                               "Thread switch for 'LIVELINESS_CHANGED_STATUS' "
                               "doesn't seem to work! "
                               "listener <%u> - component <%u>\n",
@@ -307,7 +307,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
     else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
                                 ACE_Thread::self ()))
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: 'LIVELINESS_CHANGED_STATUS': "
+        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'LIVELINESS_CHANGED_STATUS': "
                               "DDS seems to use a CCM thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_liveliness_changed_.value (),
@@ -315,7 +315,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "OK : 'LIVELINESS_CHANGED_STATUS': "
+        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'LIVELINESS_CHANGED_STATUS': "
                               "DDS seems to use its own thread for its callback: "
                               "listener <%u> - component <%u>\n",
                               this->thread_id_listener_liveliness_changed_.value (),