Mon Jul 26 13:01:16 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/DAnCE/DAnCE_Properties.idl:

          Added property for CPU Affinity.

        * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp:
        
          Bugfix.
        
        * DAnCE/tests/LocalityManager/CPUAffinity:
        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.idl:
        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.mpc:
        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.h:
        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp:
        * DAnCE/tests/LocalityManager/CPUAffinity/Component.cdp:
        * DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl:
        * bin/ciao_tests.lst:

          Added test for CPUAffinity.  Must have MULTICORE set for test
          script.  This test requires at least 2 processors/cores.

10 files changed, 799 insertions, 1 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fb239906d82..dc703699a86 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,25 @@
+Mon Jul 26 13:01:16 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/DAnCE/DAnCE_Properties.idl:
+
+          Added property for CPU Affinity.
+
+        * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp:
+        
+          Bugfix.
+        
+        * DAnCE/tests/LocalityManager/CPUAffinity:
+        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.idl:
+        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.mpc:
+        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.h:
+        * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp:
+        * DAnCE/tests/LocalityManager/CPUAffinity/Component.cdp:
+        * DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl:
+        * bin/ciao_tests.lst:
+
+          Added test for CPUAffinity.  Must have MULTICORE set for test
+          script.  This test requires at least 2 processors/cores.
+
 Mon Jul 26 12:29:14 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/DDS4CCM-INSTALL.html:
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl b/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl
index 34f1d371f6c..1baa345da72 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl
+++ b/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl
@@ -84,5 +84,6 @@ module DAnCE
   const string DANCE_LM_LIBPATH = "edu.vanderbilt.dre.DAnCE.LocalityManager.libpath";
   const string DANCE_LM_INSTALLER = "edu.vanderbilt.dre.DAnCE.LocalityManager.installer";
   const string DANCE_LM_PROCESSNAME = "edu.vanderbilt.dre.DAnCE.LocalityManager.ProcessName";
+  const string DANCE_LM_CPUAFFINITY = "edu.vanderbilt.dre.DAnCE.LocalityManager.CPUAffinity";
 };
 
diff --git a/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp b/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp
index dd53494447b..ae45b245cdd 100644
--- a/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp
+++ b/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp
@@ -29,7 +29,7 @@ namespace DAnCE
 
   char * CPU_Affinity::type (void)
   {
-    return CORBA::string_dup (DAnCE::DANCE_LM_PROCESSNAME);
+    return CORBA::string_dup (DAnCE::DANCE_LM_CPUAFFINITY);
   }
 
   void CPU_Affinity::configure (const ::Deployment::Property & prop)
@@ -63,6 +63,10 @@ namespace DAnCE
         
         if (i >= 0)
           {
+            DANCE_DEBUG (7, (LM_DEBUG, DLINFO
+                             ACE_TEXT ("CPU_Affinity::configure - ") 
+                             ACE_TEXT ("Toggling affinity for CPU %i\n"),
+                             i));
             CPU_SET (i, &mask);
           }
         else
@@ -97,6 +101,9 @@ namespace DAnCE
         throw ::Deployment::StartError (prop.name.in (),
                                         message.c_str ());
       }
+    
+    return;
+
 #endif
 #endif
     
diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.idl b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.idl
new file mode 100644
index 00000000000..d3bdee474ed
--- /dev/null
+++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.idl
@@ -0,0 +1,22 @@
+// $Id$
+
+/**
+ * @file
+ * @author Marcel Smit <msmit@remedy.nl>
+ *
+ * by-hand idl3 translation of sender components.
+ */
+
+#ifndef COMMAND_LINE_PASSAGE_IDL_
+#define COMMAND_LINE_PASSAGE_IDL_
+
+#include  <Components.idl>
+
+module cpuaffinity
+{
+  component A
+  {
+    attribute long cpu_affinity;
+  };
+};
+#endif
diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.mpc b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.mpc
new file mode 100644
index 00000000000..af9a8de9035
--- /dev/null
+++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.mpc
@@ -0,0 +1,124 @@
+// $Id$
+
+project(CPUAffinity_idl_gen) : componentidldefaults {
+  after +=
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=COMMANDLINEPASSAGE_STUB_Export \
+              -Wb,stub_export_include=CPUAffinity_stub_export.h \
+              -Wb,skel_export_macro=COMMANDLINEPASSAGE_SVNT_Export \
+              -Wb,skel_export_include=CPUAffinity_svnt_export.h \
+              -Wb,exec_export_macro=COMMANDLINEPASSAGE_EXEC_Export \
+              -Wb,exec_export_include=CPUAffinity_exec_export.h \
+              -I ..
+
+  IDL_Files {
+    CPUAffinity.idl
+  }
+}
+
+project(CPUAffinity_lem_gen) : ciaoidldefaults {
+  after += CPUAffinity_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=COMMANDLINEPASSAGE_EXEC_Export \
+              -Wb,stub_export_include=CPUAffinity_exec_export.h \
+              -SS -Gxhst -I ..
+
+  IDL_Files {
+    CPUAffinityE.idl
+  }
+}
+
+project(CPUAffinity_lem_stub) : ccm_svnt {
+  after += CPUAffinity_lem_gen CPUAffinity_stub
+  libs  += CPUAffinity_stub
+  sharedname = CPUAffinity_lem_stub
+  dynamicflags += COMMANDLINEPASSAGE_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CPUAffinityEC.cpp
+  }
+
+  Header_Files {
+    CPUAffinityEC.h
+    CPUAffinity_exec_export.h
+  }
+
+  Inline_Files {
+    CPUAffinityEC.inl
+  }
+}
+
+project(CPUAffinity_stub) : ccm_stub {
+  after += CPUAffinity_idl_gen
+  libs  +=
+  sharedname = CPUAffinity_stub
+  dynamicflags += COMMANDLINEPASSAGE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CPUAffinityC.cpp
+  }
+
+  Header_Files {
+    CPUAffinityC.h
+    CPUAffinity_stub_export.h
+  }
+
+  Inline_Files {
+    CPUAffinityC.inl
+  }
+}
+
+project(CPUAffinity_exec) : ciao_executor {
+  after   += CPUAffinity_lem_stub CPUAffinity_stub
+  sharedname = CPUAffinity_exec
+  libs += CPUAffinity_stub CPUAffinity_lem_stub
+  dynamicflags += COMMANDLINEPASSAGE_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CPUAffinity_exec.cpp
+  }
+
+  Header_Files {
+    CPUAffinity_exec.h
+    CPUAffinity_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(CPUAffinity_svnt) : ciao_servant {
+  after      += CPUAffinity_lem_stub
+  sharedname  = CPUAffinity_svnt
+  libs       += CPUAffinity_stub CPUAffinity_lem_stub
+  dynamicflags += COMMANDLINEPASSAGE_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CPUAffinityS.cpp
+    CPUAffinity_svnt.cpp
+  }
+
+  Header_Files {
+    CPUAffinityS.h
+    CPUAffinity_svnt.h
+    CPUAffinity_svnt_export.h
+  }
+
+  Inline_Files {
+    CPUAffinityS.inl
+  }
+}
+
diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp
new file mode 100644
index 00000000000..af880ab67ff
--- /dev/null
+++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp
@@ -0,0 +1,124 @@
+// -*- C++ -*-
+// $Id$
+
+#include "CPUAffinity_exec.h"
+#include "DAnCE/Logger/Log_Macros.h"
+#include "tao/ORB_Core.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
+
+#if defined (LINUX_VERSION_CODE) && defined (KERNEL_VERSION)
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,8))
+#include <sched.h>
+
+#endif
+#endif
+
+namespace CIAO_cpuaffinity_A_Impl
+{
+  //============================================================
+  // Pulse generator
+  //============================================================
+
+  Component_exec_i::Component_exec_i  (void)
+    : cpu_affinity_ (-1)
+  {
+  }
+
+  Component_exec_i::~Component_exec_i  (void)
+  {
+  }
+
+  // Port operations.
+  void Component_exec_i::cpu_affinity (CORBA::Long tc_max)
+  {
+    this->cpu_affinity_ = tc_max;
+  }
+
+  CORBA::Long Component_exec_i::cpu_affinity (void)
+  {
+    return this->cpu_affinity_;
+  }
+  // Operations from Components::SessionComponent.
+  void
+  Component_exec_i::set_session_context (
+    ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ =
+      ::cpuaffinity::CCM_A_Context::_narrow (ctx);
+
+    if ( ::CORBA::is_nil (this->context_.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  Component_exec_i::configuration_complete (void)
+  {
+  }
+
+  void
+  Component_exec_i::ccm_activate (void)
+  {
+#if defined (LINUX_VERSION_CODE) && defined (KERNEL_VERSION)
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,8))
+    cpu_set_t mask;
+    CPU_ZERO (&mask);
+
+    int retval = sched_getaffinity (0, sizeof (cpu_set_t), &mask);
+    
+    if (retval != 0)
+      {
+        ACE_ERROR ((LM_ERROR, "Error: Non-zero return value from sched_getaffinity %p\n"));
+        return;
+      }
+    
+    if (cpu_affinity_ == 0 &&
+        (!CPU_ISSET (0, &mask) ||
+         CPU_ISSET (1, &mask)))
+      {
+        ACE_ERROR ((LM_ERROR, "Error: Expected to only be on processor zero.\n"));
+        return;
+      }
+    
+    if (cpu_affinity_ == 1 &&
+        (CPU_ISSET (0, &mask) ||
+         !CPU_ISSET (1, &mask)))
+      {
+        ACE_ERROR ((LM_ERROR, "Error: Expected to only be on processor one.\n"));
+      }
+    
+    if (cpu_affinity_ > 1)
+      {
+        ACE_ERROR ((LM_ERROR, "Error: Trying to test an affinity I don't support\n"));
+      }
+
+#endif
+#endif
+  }
+
+  void
+  Component_exec_i::ccm_passivate (void)
+  {
+  }
+
+  void
+  Component_exec_i::ccm_remove (void)
+  {
+  }
+
+  extern "C" COMMANDLINEPASSAGE_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Component_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Component_exec_i );
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.h b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.h
new file mode 100644
index 00000000000..cf7e7fb87ba
--- /dev/null
+++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity_exec.h
@@ -0,0 +1,54 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef COMPONENTLINPASSAGE_EXEC_H_
+#define COMPONENTLINPASSAGE_EXEC_H_
+
+
+#include "CPUAffinityEC.h"
+
+#include /**/ "CPUAffinity_exec_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+
+#include <map>
+
+namespace CIAO_cpuaffinity_A_Impl
+{
+  class Component_exec_i
+    : public virtual A_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Component_exec_i  (void);
+    virtual ~Component_exec_i  (void);
+
+    virtual void
+    cpu_affinity (CORBA::Long tc_max);
+
+    virtual CORBA::Long
+    cpu_affinity (void);
+
+    virtual void
+    set_session_context (
+      ::Components::SessionContext_ptr ctx);
+    virtual void configuration_complete (void);
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+  
+  private:
+    ::cpuaffinity::CCM_A_Context_var context_;
+    CORBA::Long cpu_affinity_;
+  };
+  
+  extern "C" COMMANDLINEPASSAGE_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Component_Impl (void);
+}
+
+#endif /* ifndef */
+
diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/Component.cdp b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/Component.cdp
new file mode 100644
index 00000000000..78685e78cff
--- /dev/null
+++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/Component.cdp
@@ -0,0 +1,198 @@
+<Deployment:DeploymentPlan
+ xmlns:Deployment="http://www.omg.org/Deployment"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+  <label>Hello_DDS_Deployment_1</label>
+  <UUID>Hello_DDS_Deployment_1</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Home implementation -->
+  
+  <implementation xmi:id="CompSvrImpl">
+    <name>CompSvr</name>
+    <source />
+    <artifact xmi:idref="CompSvrArt" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+      
+  <implementation xmi:id="CPUAffinityImplementation">
+    <name>CPUAffinityImplementation</name>
+    <source/>
+    <artifact xmi:idref="CPUAffinity_ExecArtifact" />
+    <artifact xmi:idref="CPUAffinity_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see 10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Component_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_cpuaffinity_A_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>CPUAffinity_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>CPUAffinity_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+  
+  <instance xmi:id="CompSvrInst">
+    <name>ComponentServerInstance</name>
+    <node>CPUAffinityNode</node>
+    <source />
+    <implementation xmi:idref="CompSvrImpl" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.LocalityManager.CPUAffinity</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>0</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="CPUAffinityInstance">
+    <name>CPUAffinity</name>
+    <node>CPUAffinityNode</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="CPUAffinityImplementation" />
+    <!-- set both edu.vanderbilt.dre.CIAO.ComponentServer.Args and
+         tc_max to the same number -->
+    <configProperty>
+      <name>cpu_affinity</name>
+      <value>
+        <type>
+          <kind>tk_long</kind>
+        </type>
+        <value>
+          <long>0</long>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="CompSvrInstTwo">
+    <name>ComponentServerInstance</name>
+    <node>CPUAffinityNodeTwo</node>
+    <source />
+    <implementation xmi:idref="CompSvrImpl" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.LocalityManager.CPUAffinity</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>1</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="CPUAffinityInstanceTwo">
+    <name>CPUAffinity</name>
+    <node>CPUAffinityNodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="CPUAffinityImplementation" />
+    <!-- set both edu.vanderbilt.dre.CIAO.ComponentServer.Args and
+         tc_max to the same number -->
+    <configProperty>
+      <name>cpu_affinity</name>
+      <value>
+        <type>
+          <kind>tk_long</kind>
+        </type>
+        <value>
+          <long>1</long>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="CompSvrArt">
+    <name>CompoSvrArtifactName</name>
+    <source />
+    <node />
+    <location>dance_locality_manager</location>
+  </artifact>
+  <artifact xmi:id="CPUAffinity_ExecArtifact">
+    <name>CPUAffinity_exec</name>
+    <source/>
+    <node/>
+    <location>CPUAffinity_exec</location>
+  </artifact>
+  <artifact xmi:id="CPUAffinity_SvntArtifact">
+    <name>CPUAffinity_svnt</name>
+    <source/>
+    <node/>
+    <location>CPUAffinity_svnt</location>
+  </artifact>
+  <artifact xmi:id="CPUAffinity_StubArtifact">
+    <name>CPUAffinity_stub</name>
+    <source/>
+    <node/>
+    <location>CPUAffinity_stub</location>
+  </artifact>
+  
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="CompSvrInst" />
+    <constrainedInstance xmi:idref="CPUAffinityInstance" />
+  </localityConstraint>
+
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="CompSvrInstTwo" />
+    <constrainedInstance xmi:idref="CPUAffinityInstanceTwo" />
+  </localityConstraint>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl
new file mode 100755
index 00000000000..64c96fe60f3
--- /dev/null
+++ b/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl
@@ -0,0 +1,245 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{'ACE_ROOT'}/bin";
+use PerlACE::TestTarget;
+
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
+
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+
+$nr_daemon = 2;
+@ports = ( 60001, 60002 );
+@iorbases = ( "CPUAffinity.ior", "CPUAffinityTwo.ior" );
+@iorfiles = 0;
+@nodenames = ( "CPUAffinityNode", "CPUAffinityNodeTwo" );
+
+# ior files other than daemon
+# ior files other than daemon
+$ior_nsbase = "ns.ior";
+$ior_nsfile = 0;
+$ior_embase = "EM.ior";
+$ior_emfile = 0;
+
+#  Processes
+$E = 0;
+$EM = 0;
+$NS = 0;
+@DEAMONS = 0;
+
+# targets
+@tg_daemons = 0;
+$tg_naming = 0;
+$tg_exe_man = 0;
+$tg_executor = 0;
+
+$status = 0;
+$cdp_file = "Component.cdp";
+
+
+sub create_targets {
+    #   naming service
+    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
+    $tg_naming->AddLibPath ('.');
+    #   daemon
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
+        $tg_daemons[$i]->AddLibPath ('.');
+    }
+    #   execution manager
+    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
+    $tg_exe_man->AddLibPath ('.');
+    #   executor (plan_launcher)
+    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
+    $tg_executor->AddLibPath ('.');
+}
+
+sub init_ior_files {
+    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
+    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+    delete_ior_files ();
+}
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
+    }
+    $tg_naming->DeleteFile ($ior_nsbase);
+    $tg_exe_man->DeleteFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+}
+
+sub kill_node_daemon {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+    }
+}
+
+sub kill_open_processes {
+    if ($daemons_running == 1) {
+        kill_node_daemon ();
+    }
+
+    if ($em_running == 1) {
+        $EM->Kill (); $EM->TimedWait (1);
+    }
+
+    if ($ns_running == 1) {
+        $NS->Kill (); $NS->TimedWait (1);
+    }
+    # in case shutdown did not perform as expected
+    $tg_executor->KillAll ('dance_locality_manager');
+}
+
+sub run_node_daemons {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorbase = $iorbases[$i];
+        $iorfile = $iorfiles[$i];
+        $port = $ports[$i];
+        $nodename = $nodenames[$i];
+        $iiop = "iiop://localhost:$port";
+        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
+
+        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
+        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
+
+        print "Run dance_node_manager with $d_param\n";
+        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
+        $DEAMONS[$i]->Spawn ();
+
+        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
+                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
+            print STDERR
+              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
+            for (; $i >= 0; --$i) {
+                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+            }
+            return -1;
+        }
+    }
+    return 0;
+}
+
+create_targets ();
+init_ior_files ();
+
+# Invoke naming service
+
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+
+print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+
+$ns_status = $NS->Spawn ();
+
+if ($ns_status != 0) {
+    print STDERR "ERROR: Unable to execute the naming service\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+if ($tg_naming->WaitForFileTimed ($ior_nsbase,
+                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
+    print STDERR "ERROR: cannot find naming service IOR file\n";
+    $NS->Kill (); $NS->TimedWait (1);
+    exit 1;
+}
+
+$ns_running = 1;
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
+# Invoke node daemon.
+print "Invoking node daemon\n";
+$status = run_node_daemons ();
+
+if ($status != 0) {
+    print STDERR "ERROR: Unable to execute the node daemon\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$daemons_running = 1;
+
+# Invoke execution manager.
+print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
+$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
+                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
+$em_status = $EM->Spawn ();
+
+if ($em_status != 0) {
+    print STDERR "ERROR: dance_execution_manager returned $em_status";
+    exit 1;
+}
+
+if ($tg_exe_man->WaitForFileTimed ($ior_embase,
+                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
+    print STDERR
+      "ERROR: The ior file of execution manager could not be found\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$em_running = 1;
+
+# Invoke executor - start the application -.
+print "Invoking executor - launch the application -\n";
+
+print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
+$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                        "-x $cdp_file -k file://$ior_emfile");
+
+$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
+
+if ($pl_status != 0) {
+    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+for ($i = 0; $i < $nr_daemon; ++$i) {
+    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
+                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
+        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+        kill_open_processes ();
+        exit 1;
+    }
+}
+
+print "Sleeping 10 seconds to allow task to complete\n";
+sleep (10);
+
+# Invoke executor - stop the application -.
+print "Invoking executor - stop the application -\n";
+print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n";
+
+$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                                  "-k file://$ior_emfile -x $cdp_file -s");
+$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
+
+if ($pl_status != 0) {
+    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+print "Executor returned.\n";
+print "Shutting down rest of the processes.\n";
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index 8d2c3b1404d..63422b68bdd 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -49,6 +49,7 @@ TAO/CIAO/DAnCE/tests/LocalityManager/SpawnOne/run_test.pl: !STATIC !MINIMUM !COR
 TAO/CIAO/DAnCE/tests/LocalityManager/ExplicitExec/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/DAnCE/tests/LocalityManager/SpawnMultiple/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/DAnCE/tests/LocalityManager/ProcessName/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST LINUX
+TAO/CIAO/DAnCE/tests/LocalityManager/CPUAffinity/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST LINUX MULTICORE
 TAO/CIAO/DAnCE/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST