Fri Mar 7 21:04:59 UTC 2008 Nishanth Shanakran <nshankar@nospam.com>Onl_Mon

4 files changed, 25 insertions, 10 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 5ea2bcc04a7..09879207217 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Mar  7 21:04:59 UTC 2008  Nishanth Shanakran  <nshankar@nospam.com>
+
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+        * DAnCE/TM_Daemon/DomainDataManager.cpp:
+        * DAnCE/TM_Daemon/TM_Daemon.cpp:
+
+        The ordering of the nodes in the domain structure returned when
+        the get_intial_domain and get_snapshot methods were called were
+        different. This is a bug, and this was fixed.
+
 Wed Jan 16 20:13:56 UTC 2008  Nishanth Shankaran  <nshankar@nospam.com>
 
         * DAnCE/NodeManager/CIAO_Monitor.cpp:
diff --git a/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp b/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
index cd3df0db16c..4e3e09f0470 100644
--- a/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
+++ b/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
@@ -75,10 +75,10 @@ int CIAO::CIAO_Monitor::stop ()
   CORBA::Any any;
   any <<= current_load;
 
-  ACE_DEBUG ((LM_DEBUG, "(%P) CIAO_Monitor::get_current_data [%s]:"
-              " :-The current load is %f\n",
-              current_domain_->node[0].name.in (),
-              current_load));
+//   ACE_DEBUG ((LM_DEBUG, "(%P) CIAO_Monitor::get_current_data [%s]:"
+//               " :-The current load is %f\n",
+//               current_domain_->node[0].name.in (),
+//               current_load));
 
   // here insert the util value, in the right position
 
diff --git a/CIAO/DAnCE/TM_Daemon/DomainDataManager.cpp b/CIAO/DAnCE/TM_Daemon/DomainDataManager.cpp
index 244debce33e..75fdbb408fd 100644
--- a/CIAO/DAnCE/TM_Daemon/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TM_Daemon/DomainDataManager.cpp
@@ -280,12 +280,14 @@ namespace CIAO
       // Now update the current domain.
 //       ACE_DEBUG ((LM_DEBUG, "Obtained resource data from node monitors."
 //                   "\nNow updating the current domain!\n"));
-      this->current_domain_.node.length (this->node_info_map_.size ());
-      std::map<std::string, ::Deployment::Node>::iterator itr = this->node_info_map_.begin ();
-      CORBA::ULong i = 0;
-      for (;itr != this->node_info_map_.end (); ++itr, ++i)
+
+      //      this->current_domain_.node.length (this->node_info_map_.size ());
+      //std::map<std::string, ::Deployment::Node>::iterator itr = this->node_info_map_.begin ();
+
+      for (CORBA::ULong i = 0; i < this->initial_domain_.node.length (); ++i)
         {
-          this->current_domain_.node [i] = (*itr).second;
+          this->current_domain_.node [i] = this->node_info_map_
+                                           [this->initial_domain_.node[i].name.in ()];
         }
 
       return this->current_domain_;
diff --git a/CIAO/DAnCE/TM_Daemon/TM_Daemon.cpp b/CIAO/DAnCE/TM_Daemon/TM_Daemon.cpp
index 3ba69df7be7..a01465317fe 100644
--- a/CIAO/DAnCE/TM_Daemon/TM_Daemon.cpp
+++ b/CIAO/DAnCE/TM_Daemon/TM_Daemon.cpp
@@ -32,7 +32,7 @@ namespace CIAO
       CORBA::Object_var object = poa->id_to_reference (id.in ());
       this->handler_  = Onl_Monitor::AMI_NM_MonitorHandler::_narrow (object.in ());
 
-      this->manager_->start_monitor_qos (this->handler_);
+      //      this->manager_->start_monitor_qos (this->handler_);
       //      ACE_DEBUG ((LM_DEBUG, "Created the Daemon!\n"));
 
     }
@@ -75,8 +75,11 @@ namespace CIAO
     Daemon_impl::getSnapshot ()
     {
       ACE_DEBUG ((LM_DEBUG, "In getSnapshot!\n"));
+//       ::Deployment::Domain_var domain = new
+//           ::Deployment::Domain ();
       ::Deployment::Domain_var domain = new
           ::Deployment::Domain (this->manager_->get_all_data (this->handler_));
+
 //       std::map<std::string, ::Deployment::Node> temp =
 //         this->manager_->get_all_data (this->handler_);