Wed May 23 18:36:35 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>

6 files changed, 17 insertions, 18 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a87402c1b42..69aea25401b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed May 23 18:36:35 UTC 2007  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * MPC/config/ciao_deployment_stub.mpb:
+        
+          Added "requires += threads" to disable single threaded build.
+        
+        * DAnCE/NodeManager/Node_Manager.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.cpp
+        * DAnCE/NodeManager/NodeManager_Impl.h
+        
+          Removed ACE_HAS_THREADS guards.
+
 Wed May 23 02:21:30 UTC 2007  Gan Deng  <gan.deng@vanderbilt.edu>
 
         * DAnCE/Deployment/NodeApp_CB_Impl.h:
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 8b7ff044e0c..bb8a90e5112 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -4,8 +4,6 @@
 #include "DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h"
 #include "ace/Log_Msg.h"
 
-#if defined (ACE_HAS_THREADS)
-
 CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
                                                     CORBA::ORB_ptr orb,
                                                     PortableServer::POA_ptr poa,
@@ -679,5 +677,3 @@ CIAO::Static_NodeManager_Impl::destroyManager
     }
 
 }
-
-#endif /* ACE_HAS_THREADS */
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
index e067cc7573a..45edfb63899 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -22,8 +22,6 @@
 #define CIAO_NODEMANAGER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#if defined (ACE_HAS_THREADS)
-
 #include "Interfaces/NodeManagerDaemonS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -324,5 +322,3 @@ namespace CIAO
 
 #include /**/ "ace/post.h"
 #endif /* CIAO_NODEMANAGER_IMPL_H */
-
-#endif /* ACE_HAS_THREADS */
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index ac1a910275f..ace6e13bd86 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -12,8 +12,6 @@
 #include "ciao/Server_init.h"
 #include "ciao/CIAO_common.h"
 
-#if defined (ACE_HAS_THREADS)
-
 const char *ior_file_name_ = "nodedaemon.ior";
 char *nodeapp_location_ = 0;
 const char *pid_file_name_ = 0;
@@ -295,6 +293,3 @@ main (int argc, char *argv[])
               "CIAO_NodeManager has closed\n"));
   return 0;
 }
-
-#endif /* ACE_HAS_THREADS */
-
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp
index 8db7f9281ac..38299e5dcb8 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp
@@ -5,7 +5,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Stats.h"
 #include "ace/Sample_History.h"
-#include "Utils/Plan_Handler.h"
+#include "DAnCE/Utils/Plan_Handler.h"
 
 namespace CIAO
 {
@@ -21,13 +21,13 @@ namespace CIAO
     {
       try
         {
-          /*
+          
           DAnCE_Utils::add_instance (
             const_cast<::Deployment::DeploymentPlan&> (plan), 
             "Hello-Sender-idd-02", "SenderNode", "Hello-Sender-mdd");
 
           DAnCE_Utils::print_instances (plan);
-          DAnCE_Utils::print_connections (plan);*/
+          DAnCE_Utils::print_connections (plan);
           
 
           ///// Start Test ////////////////////////////////////////////
@@ -123,7 +123,6 @@ namespace CIAO
             call_end = ACE_OS::gethrtime ();
             history_finish_launch.sample (call_end - call_start);
 
-
             if (CIAO::debug_level ())
               ACE_DEBUG ((LM_DEBUG, "[success]\n"));
 
@@ -132,7 +131,7 @@ namespace CIAO
               ACE_DEBUG ((LM_DEBUG,
                           "CIAO_PlanLauncher: start activating components...\n"));
 
-            //////// Measure the latency for finishLaunch()  ////////////////
+            //////// Measure the latency for start()  ////////////////
             call_start = ACE_OS::gethrtime ();
             dam->start ();
             call_end = ACE_OS::gethrtime ();
diff --git a/CIAO/MPC/config/ciao_deployment_stub.mpb b/CIAO/MPC/config/ciao_deployment_stub.mpb
index 7e3d375c68a..651038b0fb0 100644
--- a/CIAO/MPC/config/ciao_deployment_stub.mpb
+++ b/CIAO/MPC/config/ciao_deployment_stub.mpb
@@ -6,4 +6,5 @@ project : ciao_client_dnc, ciao_events_base_dnc, messaging {
   libs  += CIAO_Deployment_stub
   includes += $(CIAO_ROOT)/DAnCE
   idlflags += -I$(CIAO_ROOT)/DAnCE
+  requires += threads
 }