Wed Oct 11 00:48:28 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu>

3 files changed, 15 insertions, 23 deletions

diff --git a/Controller/Component/Controller.mpc b/Controller/Component/Controller.mpc
index 98853107607..de27e52e928 100644
--- a/Controller/Component/Controller.mpc
+++ b/Controller/Component/Controller.mpc
@@ -85,7 +85,6 @@ project(Controller_exec) : ciao_component_dnc, ciao_config_handlers {
   }
 
   Header_Files {
-    RACE_common.h
     Poller.h
     Descriptor.h
   }
diff --git a/Controller/Component/Controller_exec.cpp b/Controller/Component/Controller_exec.cpp
index 131670f4201..332ad1ed2f1 100644
--- a/Controller/Component/Controller_exec.cpp
+++ b/Controller/Component/Controller_exec.cpp
@@ -1,6 +1,5 @@
 #include "Controller_exec.h"
 #include "ciao/CIAO_common.h"
-#include "RACE_common.h"
 #include "tao/ORB_Core.h"
 
 namespace CIAO
@@ -96,26 +95,24 @@ namespace CIAO
       {
         try
           {
-            RACE_DEBUG (RACE_NORMAL, "Trying to contact TM.\n");
+            ACE_DEBUG ((LM_DEBUG, "Trying to contact TM.\n"));
             CIAO::TargetManagerExt_var TM =
               this->context_->get_connection_target_mgr_ext ();
 
             if (CORBA::is_nil (TM.in ()))
               {
-                RACE_ERROR ("Unable to connect to TM!\n");
+                ACE_ERROR ((LM_ERROR, "Unable to connect to TM!\n"));
                 throw CORBA::BAD_INV_ORDER ();
               }
-            RACE_DEBUG (RACE_NORMAL,
-                        "Done! Connection established with TM!\n");
-            RACE_DEBUG (RACE_NORMAL,
-                        "Now creating the poller object.\n");
+            ACE_DEBUG ((LM_DEBUG, "Done! Connection established with TM!\n"));
+            ACE_DEBUG ((LM_DEBUG, "Now creating the poller object.\n"));
 
             ::CIAO::RACE::Execution_Time_Monitor_var monitor =
                 this->context_->get_connection_monitor ();
 
             if (CORBA::is_nil (monitor.in ()))
               {
-                RACE_ERROR ("Unable to connect to Central Monitor!\n");
+                ACE_ERROR ((LM_ERROR, "Unable to connect to Central Monitor!\n"));
                 throw CORBA::BAD_INV_ORDER ();
               }
 
@@ -128,8 +125,7 @@ namespace CIAO
                                              reactor,
                                              this->sampling_period_));
             this->poller_->init ();
-            RACE_DEBUG (RACE_NORMAL,
-                        "Done creating the poller object.\n");
+            ACE_DEBUG ((LM_DEBUG, "Done creating the poller object.\n"));
           }
         catch (CORBA::Exception & ex)
           {
diff --git a/Controller/Component/Descriptor.cpp b/Controller/Component/Descriptor.cpp
index d4efb62e4bf..22cb980280c 100644
--- a/Controller/Component/Descriptor.cpp
+++ b/Controller/Component/Descriptor.cpp
@@ -5,7 +5,6 @@
 #include "Config_Handlers/DnC_Dump.h"
 #include <sstream>
 #include "ace/SString.h"
-#include "RACE_common.h"
 namespace CIAO
 {
   namespace RACE
@@ -75,7 +74,7 @@ namespace CIAO
        ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((::CORBA::SystemException))
       {
-        RACE_DEBUG (RACE_VERBOSE, "Descriptor::push_descriptors.\n");
+        ACE_DEBUG ((LM_DEBUG, "Descriptor::push_descriptors.\n"));
 
         App_String app_string;
         /// Register the string with the poller only if the input
@@ -146,7 +145,7 @@ namespace CIAO
             if (ACE_OS::strcmp (property.name.in (),
                                 CRITICAL_PATH) == 0)
               {
-                RACE_DEBUG (RACE_VERBOSE, "Found critical path\n");
+                ACE_DEBUG ((LM_DEBUG, "Found critical path\n"));
 
                 CORBA::Any & value = property.value;
                 CORBA::TypeCode_var tc = value.type ();
@@ -181,9 +180,8 @@ namespace CIAO
                 if (tc->kind () == CORBA::tk_double)
                   {
                     value >>= deadline;
-                    RACE_DEBUG (RACE_MIN,
-                                "Critical path deadline is:%.2f\n",
-                                 deadline);
+                    ACE_DEBUG ((LM_DEBUG, "Critical path deadline is:%.2f\n",
+                                deadline));
                     return deadline;
 
                   }
@@ -213,9 +211,8 @@ namespace CIAO
                 if (tc->kind () == CORBA::tk_long)
                   {
                     value >>= importance;
-                    RACE_DEBUG (RACE_MIN,
-                                "App-string importance is: %d\n",
-                                 importance);
+                    ACE_DEBUG ((LM_DEBUG, "App-string importance is: %d\n",
+                                importance));
                     return importance;
                   }
               }
@@ -240,8 +237,8 @@ namespace CIAO
                 if (tc->kind () == CORBA::tk_string)
                   {
                     value >>= path;
-                    RACE_DEBUG (RACE_VERBOSE, "Critical path is:%s\n",
-                                path);
+                    ACE_DEBUG ((LM_DEBUG, "Critical path is:%s\n",
+                                path));
                     return CORBA::string_dup (path);
                   }
               }
@@ -312,7 +309,7 @@ namespace CIAO
         tok.delimiter_replace (ELEMENT, 0);
         for (char *p = tok.next (); p; p = tok.next (), ++ctr)
           {
-            RACE_DEBUG (RACE_NORMAL, "%s\n", p);
+            ACE_DEBUG ((LM_DEBUG, "%s\n", p));
             ACE_Tokenizer temp_tok (p);
             temp_tok.delimiter_replace (PORT, 0);