diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-05 14:33:21 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-05 14:33:21 +0000 |
| commit | 4c18ca794bf29f5a0db81c1132be5f7ac305466f (patch) | |
| tree | b615191b7183fd54c6eaad37ec8d228fa16790ea | |
| parent | 3b27b03a9d15faad50fa1d6d32ad1c02fb5efa75 (diff) | |
| download | ATCD-4c18ca794bf29f5a0db81c1132be5f7ac305466f.tar.gz | |
Wed Oct 5 14:32:32 UTC 2011 William R. Otte <wotte@dre.vanderbit.edu>
* dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
* dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
Fuzz.
| -rw-r--r-- | DAnCE/ChangeLog | 7 | ||||
| -rw-r--r-- | DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp | 32 | ||||
| -rw-r--r-- | DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp | 6 |
3 files changed, 26 insertions, 19 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 07d8aafbe43..3cee6d99127 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 5 14:32:32 UTC 2011 William R. Otte <wotte@dre.vanderbit.edu> + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp: + + Fuzz. + Tue Oct 4 19:42:56 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * dance/LocalityManager/Daemon/Locality_Manager_Impl.h: diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp index 127b32eed0b..851253e5d90 100644 --- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp +++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp @@ -50,13 +50,13 @@ namespace DAnCE DANCE_TRACE ("LocalityManager_i::init"); DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, - (LM_DEBUG, DLINFO - ACE_TEXT ("LocalityManager_i::init - ") - ACE_TEXT ("Received %u properties from init\n"), - props.length ())); - + (LM_DEBUG, DLINFO + ACE_TEXT ("LocalityManager_i::init - ") + ACE_TEXT ("Received %u properties from init\n"), + props.length ())); + PLUGIN_MANAGER::instance ()->set_configuration (props); - + PLUGIN_MANAGER::instance ()->set_orb (this->orb_.in ()); Plugin_Configurator config; @@ -91,13 +91,13 @@ namespace DAnCE ACE_TEXT ("Using provided spawn delay %u\n"), this->spawn_delay_)); } - - DANCE_DEBUG (DANCE_LOG_TRACE, - (LM_DEBUG, DLINFO - ACE_TEXT ("LocalityManager_i::init - ") - ACE_TEXT ("Number of LM configuration properties: %u\n"), - props.length ())); - + + DANCE_DEBUG (DANCE_LOG_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("LocalityManager_i::init - ") + ACE_TEXT ("Number of LM configuration properties: %u\n"), + props.length ())); + for (CORBA::ULong i = 0; i < props.length (); ++i) { DANCE_DEBUG (DANCE_LOG_TRACE, @@ -122,9 +122,9 @@ namespace DAnCE } else { - DANCE_ERROR (DANCE_LOG_MAJOR_DEBUG_INFO, - (LM_WARNING, DLINFO - ACE_TEXT ("Warning: No configuration properties\n"))); + DANCE_ERROR (DANCE_LOG_MAJOR_DEBUG_INFO, + (LM_WARNING, DLINFO + ACE_TEXT ("Warning: No configuration properties\n"))); } } diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp index 7bbd41cfda0..0403b7af748 100644 --- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp +++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp @@ -62,11 +62,11 @@ namespace DAnCE PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in ()); - + { PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - + poa_manager->activate (); DANCE_DEBUG (DANCE_LOG_TRACE, @@ -152,7 +152,7 @@ namespace DAnCE sa->locality_manager_callback (lm.in (), ACE_TEXT_ALWAYS_CHAR (this->uuid_.c_str ()), this->config_.out ()); - + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_TRACE, DLINFO ACE_TEXT ("LocalityManager_Task::svc - ") |