diff options
| author | nshankar <nshankar@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-01-16 20:14:41 +0000 |
|---|---|---|
| committer | nshankar <nshankar@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-01-16 20:14:41 +0000 |
| commit | fffe843b80309efc5071a3c221a13ec9d0c4772c (patch) | |
| tree | 01f3883ece6063ef7e6a60f3db6cbbfcfed0210b | |
| parent | 937fe1decae9ee54c100134bdde7e2e03e11b18c (diff) | |
| download | ATCD-fffe843b80309efc5071a3c221a13ec9d0c4772c.tar.gz | |
Wed Jan 16 20:13:56 UTC 2008 Nishanth Shankaran <nshankar@nospam.com>
| -rw-r--r-- | CIAO/ChangeLog | 12 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp | 9 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeManager/MonitorController.cpp | 9 | ||||
| -rw-r--r-- | CIAO/examples/space/descriptors/NodeManagerMap_1.dat | 2 | ||||
| -rwxr-xr-x | CIAO/examples/space/descriptors/run_TM.sh | 2 |
5 files changed, 23 insertions, 11 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 72478b57fa9..5ea2bcc04a7 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,15 @@ +Wed Jan 16 20:13:56 UTC 2008 Nishanth Shankaran <nshankar@nospam.com> + + * DAnCE/NodeManager/CIAO_Monitor.cpp: + * DAnCE/NodeManager/MonitorController.cpp: + + Cleaned up the code a little. + + * examples/space/descriptors/NodeManagerMap_1.dat: + * examples/space/descriptors/run_TM.sh: + + Modified these scripts. + Mon Jan 14 16:24:19 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 1785c719abe..cd3df0db16c 100644 --- a/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp +++ b/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp @@ -70,16 +70,15 @@ int CIAO::CIAO_Monitor::stop () // current_domain_->node[0].name.in ())); } - ACE_DEBUG ((LM_DEBUG , - "CIAO_Monitor::Inside the get_current_data of[%s]\n", - current_domain_->node[0].name.in ())); - CORBA::Double current_load = calculate_load (); CORBA::Any any; any <<= current_load; - ACE_DEBUG ((LM_DEBUG, "The current load is %f\n", 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/NodeManager/MonitorController.cpp b/CIAO/DAnCE/NodeManager/MonitorController.cpp index dea59b14609..752dd662bad 100644 --- a/CIAO/DAnCE/NodeManager/MonitorController.cpp +++ b/CIAO/DAnCE/NodeManager/MonitorController.cpp @@ -88,9 +88,6 @@ int CIAO::MonitorController::init () ::Deployment::Domain* CIAO::MonitorController::update_data_for_TM () { - ACE_DEBUG ((LM_DEBUG , "The list size is %d\n", - monitor_list_.size ())); - ::Deployment::Domain* domain = new ::Deployment::Domain (this->initial_domain_); @@ -447,11 +444,15 @@ void CIAO::MonitorController::upload_obj_ref () } catch (CosNaming::NamingContext::NotFound& ex) { - ex._tao_print_exception ("MonitorController::upload_obj_ref\t\n"); + ACE_DEBUG ((LM_DEBUG, "MonitorController:: namingcontext not " + "already registered with the naming service.\n" + "Now trying to rebind......")); + // ex._tao_print_exception ("MonitorController::upload_obj_ref\t\n"); try { naming_context->bind_new_context (name); + ACE_DEBUG ((LM_DEBUG, "done!\n")); } catch (CORBA::Exception & e) { diff --git a/CIAO/examples/space/descriptors/NodeManagerMap_1.dat b/CIAO/examples/space/descriptors/NodeManagerMap_1.dat index 2285f1790ba..dda931167d2 100644 --- a/CIAO/examples/space/descriptors/NodeManagerMap_1.dat +++ b/CIAO/examples/space/descriptors/NodeManagerMap_1.dat @@ -1 +1 @@ -blade39 corbaloc:iiop:pantera.dre.vanderbilt.edu:30000/NodeManager +blade36 corbaloc:iiop:pantera.dre.vanderbilt.edu:30000/NodeManager diff --git a/CIAO/examples/space/descriptors/run_TM.sh b/CIAO/examples/space/descriptors/run_TM.sh index ab8a5d92510..d5d1ffeeee3 100755 --- a/CIAO/examples/space/descriptors/run_TM.sh +++ b/CIAO/examples/space/descriptors/run_TM.sh @@ -1,2 +1,2 @@ #!/bin/bash -$CIAO_ROOT/DAnCE/TM_Daemon/TM_Daemon -ORBInitRef NameService=corbaloc:iiop:roon.dre.vanderbilt.edu:40000/NameService -k SPACE.cdp -m NodeManagerMap_2.dat -N CIAO_TM_Daemon -d Domain_2.cdd +$CIAO_ROOT/DAnCE/TM_Daemon/TM_Daemon -ORBInitRef NameService=corbaloc:iiop:roon.dre.vanderbilt.edu:40000/NameService -k SPACE.cdp -m NodeManagerMap_1.dat -N CIAO_TM_Daemon -d Domain_1.cdd |