diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-01 08:44:09 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-01 08:44:09 +0000 |
| commit | dd5197dd746d653f97b5cbaae8cf8991707a0947 (patch) | |
| tree | 9b21f2a01e22db71a817b3afbf1d0476eea2749b | |
| parent | 4ff4896395d42a8f8e0810ddb75ea27473964fc7 (diff) | |
| download | ATCD-dd5197dd746d653f97b5cbaae8cf8991707a0947.tar.gz | |
Tue Nov 01 08:41:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* tests/Collocation/Sender/Sender_exec.cpp:
Add define in test in case of CIAO not build with
ccm_direct_colloation.
| -rw-r--r-- | CIAO/ChangeLog.BRANCH | 5 | ||||
| -rw-r--r-- | CIAO/tests/Collocation/Sender/Sender_exec.cpp | 17 |
2 files changed, 20 insertions, 2 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH index afba8cc154b..b2ba8f0030b 100644 --- a/CIAO/ChangeLog.BRANCH +++ b/CIAO/ChangeLog.BRANCH @@ -1,3 +1,8 @@ +Tue Nov 01 08:41:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/Sender/Sender_exec.cpp: + Add define in test in case of CIAO not build with + ccm_direct_colloation. + Mon Oct 31 13:55:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * ciao/Containers/Container_Base.idl: * ciao/Containers/Container_Base_T.h: diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.cpp b/CIAO/tests/Collocation/Sender/Sender_exec.cpp index 64daf1a536e..c5bb949dc81 100644 --- a/CIAO/tests/Collocation/Sender/Sender_exec.cpp +++ b/CIAO/tests/Collocation/Sender/Sender_exec.cpp @@ -22,6 +22,14 @@ namespace CIAO_Sender_Impl hello_exec_i::set_point (const pointer_id &p, const char * strat) { CORBA::Boolean coll = false; + +#if !defined (CCM_DIRECTCOLL) + ACE_DEBUG ((LM_DEBUG, + "SENDER: hello_exec_i::set_point pointer" + "No collocation because CIAO not build with " + "ccm_diect_collocation = 1.\n", + (void *)&p)); +#else if ((ACE_OS::strcmp("direct", strat) == 0) || (ACE_OS::strcmp("best", strat) == 0)) coll = true; @@ -31,7 +39,7 @@ namespace CIAO_Sender_Impl ACE_ERROR ((LM_DEBUG, "Error: hello_exec_i::set_point - " "Unexpected strategy <%C> \n", strat)); - +#endif ACE_DEBUG ((LM_DEBUG, "SENDER: hello_exec_i::set_point pointer <%@>\n", (void *)&p)); @@ -39,12 +47,17 @@ namespace CIAO_Sender_Impl CORBA::Long ptr_nmb = (long)&p; if (coll) { + + // In case of collocation pointer p is still the same pointer + // as at the point where poiner p was generated. + // Direct or thru_poa collocation, but thru_poa collocation is disabled, + // so remains direct . if (ptr_nmb == p.point) { ACE_DEBUG ((LM_DEBUG, "hello_exec_i::set_point - current pointer <%u> " " is same as starting pointer <%u>," - "direct or thru_poa collocation ! \n", + " direct collocation! \n", ptr_nmb, p.point)); } else |