diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-06-01 11:12:36 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-06-01 11:12:36 +0000 |
| commit | c8eb134ca7a61208f1c5f0c038d1b9a412e96e25 (patch) | |
| tree | 2fc884eb26824382a96e12aa9a3f6befdc8f522f /DAnCE | |
| parent | cff99311a04d7aca8a5ca2b90ab5185f87651281 (diff) | |
| download | ATCD-c8eb134ca7a61208f1c5f0c038d1b9a412e96e25.tar.gz | |
Wed Jun 1 11:10:40 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/ExecutionManager/ExecutionManager_Module.cpp:
Emit the IOR/register with the naming service closer to ORB
activation to reduce the possibility of a race condition with
the plan_launcher.
Diffstat (limited to 'DAnCE')
| -rw-r--r-- | DAnCE/ChangeLog | 8 | ||||
| -rw-r--r-- | DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp | 34 |
2 files changed, 25 insertions, 17 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 2457cc2e086..fa6ad868d36 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 1 11:10:40 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/ExecutionManager/ExecutionManager_Module.cpp: + + Emit the IOR/register with the naming service closer to ORB + activation to reduce the possibility of a race condition with + the plan_launcher. + Wed Jun 1 10:14:38 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * docs/Error_Messages.txt: diff --git a/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp b/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp index 6008b824fd1..5b60883116c 100644 --- a/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp +++ b/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp @@ -316,23 +316,6 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb, // Binding ior to IOR Table adapter->bind ("ExecutionManager", em_ior.in ()); - // Saving execution manager ior - if (0 != this->options_.exec_mgr_file_) - { - DAnCE::ExecutionManager::write_IOR (this->options_.exec_mgr_file_, em_ior.in ()); - } - - // Binding execution manager to name service - if (!CORBA::is_nil (domain_nc.in ())) - { - DANCE_DEBUG (DANCE_LOG_MINOR_EVENT, - (LM_TRACE, DLINFO ACE_TEXT("Registering EM in NC.\n"))); - CosNaming::Name name (1); - name.length (1); - name[0].id = CORBA::string_dup ("ExecutionManager"); - domain_nc->rebind (name, em_daemon.in()); - } - // End ExecutionManager initialization part // Initializing NodeManagers @@ -378,6 +361,23 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb, mgr->activate (); + // Saving execution manager ior + if (0 != this->options_.exec_mgr_file_) + { + DAnCE::ExecutionManager::write_IOR (this->options_.exec_mgr_file_, em_ior.in ()); + } + + // Binding execution manager to name service + if (!CORBA::is_nil (domain_nc.in ())) + { + DANCE_DEBUG (DANCE_LOG_MINOR_EVENT, + (LM_TRACE, DLINFO ACE_TEXT("Registering EM in NC.\n"))); + CosNaming::Name name (1); + name.length (1); + name[0].id = CORBA::string_dup ("ExecutionManager"); + domain_nc->rebind (name, em_daemon.in()); + } + return em_obj._retn (); } catch (const CORBA::Exception& ex) |