diff options
| author | msmit <msmit@remedy.nl> | 2010-02-09 12:26:58 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-02-09 12:26:58 +0000 |
| commit | 150563b9ce0861c5576ccb4e4eda4cc8680ec732 (patch) | |
| tree | 9d78b03ddb084242f9f34839123a1ef10f06f3ac /CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver | |
| parent | c440d107ec86da06780d8f1deadc533be4de2bb7 (diff) | |
| download | ATCD-150563b9ce0861c5576ccb4e4eda4cc8680ec732.tar.gz | |
Tue Feb 9 12:24:14 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
Optimized logging.
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h:
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
Added test for thread switch.
* connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp:
Resolved compiler warnings on Linux.
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver')
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp index 004084982bf..a275f43903e 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp @@ -174,26 +174,26 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl { if (this->deadline_missed_.value ()) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Received the expected ") - ACE_TEXT ("'on_offered_deadline_missed' in Receiver\n") + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ") + ACE_TEXT ("'on_offered_deadline_missed'\n") )); } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ") - ACE_TEXT ("'on_offered_deadline_missed' in Receiver\n") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: didn't receive the expected ") + ACE_TEXT ("'on_offered_deadline_missed'\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", @@ -202,7 +202,7 @@ namespace CIAO_CSL_DeadlineTest_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", @@ -213,7 +213,7 @@ namespace CIAO_CSL_DeadlineTest_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 (), @@ -221,7 +221,7 @@ namespace CIAO_CSL_DeadlineTest_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 (), |