summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-11-04 12:10:25 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-11-04 12:10:25 +0000
commit5671caf5b4206871b0f7c2333bd0b8f3f74b497b (patch)
treef67454e4d94d4051b75956635f265e7e97907b5f
parentaba44ab1695c4e1e2ae785bc0d9223413ef639f8 (diff)
downloadATCD-5671caf5b4206871b0f7c2333bd0b8f3f74b497b.tar.gz
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp513
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h138
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.inl8
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/RT/RTNA_Configurator_Export.h58
-rw-r--r--CIAO/ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc11
5 files changed, 0 insertions, 728 deletions
diff --git a/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp b/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp
deleted file mode 100644
index 6619a445db1..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-// $Id$
-
-#include "RTConfig_Manager.h"
-#include "ciao/CIAO_common.h"
-#include "ace/SString.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RTConfig_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
-void
-CIAO::Deployment::RTResource_Config_Manager::init (CORBA::ORB_ptr orb)
-{
- CORBA::Object_var object =
- orb->resolve_initial_references ("RTORB");
- this->rtorb_ = RTCORBA::RTORB::_narrow (object.in ());
-}
-
-int
-CIAO::Deployment::RTResource_Config_Manager::pre_orb_initialize (void)
-{
- return 0;
-}
-
-int
-CIAO::Deployment::RTResource_Config_Manager::post_orb_initialize (CORBA::ORB_ptr)
-{
- return 0;
-}
-
-void
-CIAO::Deployment::RTResource_Config_Manager::print_resources
-(const ServerResource &server_resource)
-{
- const ORBResource &orb_resource
- = server_resource.orb_config.orb_resources[0];
-
- CORBA::ULong i;
-
- // Creating and binding name with RT Threadpool
- for (i = 0; i < orb_resource.threadpool_list.length (); ++i)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "-RTResource_Config_Manager::print_resource threadpool: %C\n"
- "\tStack size: %d\n"
- "\tStatic: %d\n"
- "\tDynamic %d\n"
- "\tDefault Prio: %d\n"
- "\tBuffering %C\n"
- "\tMax Buffered: %d\n"
- "\tBuffer Size %d\n",
- orb_resource.threadpool_list[i].Id.in (),
- orb_resource.threadpool_list[i].stacksize,
- orb_resource.threadpool_list[i].static_threads,
- orb_resource.threadpool_list[i].dynamic_threads,
- orb_resource.threadpool_list[i].default_priority,
- (orb_resource.threadpool_list[i].allow_request_buffering ? "Y" : "N"),
- orb_resource.threadpool_list[i].max_buffered_requests,
- orb_resource.threadpool_list[i].max_request_buffer_size));
- }
-
- for (i = 0; i < orb_resource.threadpool_with_lanes_list.length (); ++i)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "-RTResource_Config_Manager::print_resource threadpool_with %d, lanes: %C\n",
- orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length (),
- orb_resource.threadpool_with_lanes_list[i].Id.in ()));
-
- for (CORBA::ULong l = 0;
- l < orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ();
- ++l)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "\tLane %d:\n"
- "\t\tPriority: %d\n"
- "\t\tStatic: %d\n"
- "\t\tDynamic: %d\n",
- l,
- orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].lane_priority,
- orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].static_threads,
- orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].dynamic_threads));
- }
- CIAO_DEBUG ((LM_DEBUG,
- "\tStack size: %d\n"
- "\tBorrowing: %C\n"
- "\tBuffering %C\n"
- "\tMax Buffered: %d\n"
- "\tBuffer Size %d\n",
- orb_resource.threadpool_with_lanes_list[i].stacksize,
- (orb_resource.threadpool_with_lanes_list[i].allow_borrowing ? "Y" : "N"),
- (orb_resource.threadpool_with_lanes_list[i].allow_request_buffering ? "Y" : "N"),
- orb_resource.threadpool_with_lanes_list[i].max_buffered_requests,
- orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size));
- }
-
- for (i = 0; i < orb_resource.connection_bands_list.length (); ++i)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "-RTResource_Config_Manager::print_resource connection %d bands: %C\n",
- orb_resource.connection_bands_list[i].bands.length (),
- orb_resource.connection_bands_list[i].Id.in ()));
-
- for (CORBA::ULong l = 0;
- l < orb_resource.connection_bands_list[i].bands.length ();
- ++l)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "\tBand %d Prio: %d -- %d\n",
- l,
- orb_resource.connection_bands_list[i].bands[l].low,
- orb_resource.connection_bands_list[i].bands[l].high));
- }
- }
-}
-
-void
-CIAO::Deployment::RTResource_Config_Manager::init_resources
-(const ServerResource &server_resource)
-{
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource.\n"));
-
- if (CORBA::is_nil (this->rtorb_.in()))
- {
- CIAO_ERROR ((LM_ERROR,
- "RTResource_Config_Manager has not been properly initialized.\n"));
- throw CORBA::INTERNAL ();
- }
-
- this->print_resources (server_resource);
- // return;
-
- const ORBResource &orb_resource
- = server_resource.orb_config.orb_resources[0];
-
- CORBA::ULong i;
-
- // Creating and binding name with RT Threadpool
- for (i = 0; i < orb_resource.threadpool_list.length (); ++i)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource threadpool: %C\n",
- orb_resource.threadpool_list[i].Id.in ()));
- RTCORBA::ThreadpoolId thr_id =
- this->rtorb_->create_threadpool
- (orb_resource.threadpool_list[i].stacksize,
- orb_resource.threadpool_list[i].static_threads,
- orb_resource.threadpool_list[i].dynamic_threads,
- orb_resource.threadpool_list[i].default_priority,
- orb_resource.threadpool_list[i].allow_request_buffering,
- orb_resource.threadpool_list[i].max_buffered_requests,
- orb_resource.threadpool_list[i].max_request_buffer_size);
- // Simply pass back the exception here
- // for now. We need to have a better way
- // to handle execption here.
- if (this->threadpool_map_.bind (orb_resource.threadpool_list[i].Id.in (),
- thr_id) != 0)
- {
- CIAO_ERROR ((LM_ERROR, "Error binding thread pool Id: %C to map when initializing RTNodeApplication resources.\n", orb_resource.threadpool_list[i].Id.in ()));
- throw CORBA::INTERNAL ();
- }
- else
- {
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource added thread pool: %C\n",
- orb_resource.threadpool_list[i].Id.in ()));
- }
- }
-
- for (i = 0; i < orb_resource.threadpool_with_lanes_list.length (); ++i)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource threadpool_with %d, lanes: %C\n",
- orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length (),
- orb_resource.threadpool_with_lanes_list[i].Id.in ()));
-
- // Duplicate RTCORBA lanes
- RTCORBA::ThreadpoolLanes lanes
- (orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ());
- lanes.length (orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ());
-
- for (CORBA::ULong l = 0;
- l < orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ();
- ++l)
- {
- lanes[l].lane_priority
- = orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].lane_priority;
- lanes[l].static_threads
- = orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].static_threads;
- lanes[l].dynamic_threads
- = orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].dynamic_threads;
- }
-
- RTCORBA::ThreadpoolId thr_id =
- this->rtorb_->create_threadpool_with_lanes
- (orb_resource.threadpool_with_lanes_list[i].stacksize,
- lanes,
- orb_resource.threadpool_with_lanes_list[i].allow_borrowing,
- orb_resource.threadpool_with_lanes_list[i].allow_request_buffering,
- orb_resource.threadpool_with_lanes_list[i].max_buffered_requests,
- orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size);
- // Simply pass back the exception here
- // for now. We need to have a better way
- // to handle execption here.
-
- if (this->threadpool_map_.bind (orb_resource.threadpool_with_lanes_list[i].Id.in (),
- thr_id) != 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Error binding thread pool name: %C to map when "
- "initializing RTNodeApplication resources.\n",
- orb_resource.threadpool_with_lanes_list[i].Id.in ()));
- throw CORBA::INTERNAL ();
- }
-
- else
- {
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource added thread pool with lanes: %C\n",
- orb_resource.threadpool_with_lanes_list[i].Id.in ()));
- }
- }
-
- for (i = 0; i < orb_resource.connection_bands_list.length (); ++i)
- {
- RTCORBA::PriorityBands
- safebands(orb_resource.connection_bands_list[i].bands.length ());
- safebands.length (orb_resource.connection_bands_list[i].bands.length ());
-
- for (CORBA::ULong l = 0;
- l < orb_resource.connection_bands_list[i].bands.length ();
- ++l)
- {
- safebands[l].low = orb_resource.connection_bands_list[i].bands[l].low;
- safebands[l].high = orb_resource.connection_bands_list[i].bands[l].high;
- }
-
- if (this->priority_bands_map_.bind (orb_resource.connection_bands_list[i].Id.in (),
- safebands) != 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Error binding priority bands name: %C to map "
- "when initializing RTNodeApplication resources.\n",
- orb_resource.connection_bands_list[i].Id.in ()));
- throw CORBA::INTERNAL ();
- }
- else
- {
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource added connection bands: %C\n",
- orb_resource.connection_bands_list[i].Id.in ()));
- }
- }
-
- // now initialize the policy set part of it.
- // server_resource.orb_config.policy_set
- const PolicySets &sets = server_resource.orb_config.policy_set;
- for (CORBA::ULong i = 0; i < sets.length (); ++i)
- {
- CORBA::ULong const np = sets[i].policies.length ();
- if (np == 0)
- continue;
-
- CORBA::PolicyList_var policy_list = new CORBA::PolicyList (np);
- policy_list->length (np);
- CORBA::ULong index = 0;
- CORBA::ULong array_index = np;
-
- // Create a list of policies
- for (CORBA::ULong pc = 0; pc < np; ++pc)
- {
- CORBA::Policy_var temp_policy =
- this->create_single_policy (sets[i].policies[pc]);
- if (CORBA::is_nil (temp_policy.in ()))
- {
- array_index = array_index - 1;
- policy_list->length (array_index);
- }
- else
- {
- policy_list[index] = CORBA::Policy::_duplicate (temp_policy.in ());
- index = index + 1;
- }
- }
-
- // Bind the policy list to the name. The bind operation should
- // surrender the ownership of the newly created PolicyList
- // sequence to the map.
- if (array_index != 0)
- {
- if (this->policy_map_.bind (sets[i].Id.in (),
- policy_list._retn ()) != 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Error binding Policy_Set with name: %C\n",
- sets[i].Id.in ()));
- throw CORBA::INTERNAL ();
- }
- else
- {
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource "
- "added policy set: %C with %d policies\n",
- sets[i].Id.in (), array_index));
- }
- }
- else
- {
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::init_resource "
- "added policy set: %C with %d policies\n",
- sets[i].Id.in (), array_index));
- }
- }
-}
-
-void
-CIAO::Deployment::RTResource_Config_Manager::fini ()
-{
- TP_MAP::ITERATOR iter = this->threadpool_map_.begin ();
- TP_MAP::ITERATOR end = this->threadpool_map_.end ();
-
- for (; iter != end; ++iter)
- {
- this->rtorb_->destroy_threadpool ((*iter).int_id_);
- }
-
-}
-
-RTCORBA::ThreadpoolId
-CIAO::Deployment::RTResource_Config_Manager::find_threadpool_by_name (const char *name)
-{
- if (name == 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Invalid name string found in \"find_threadpool_by_name\"\n"));
- throw CORBA::BAD_PARAM ();
- }
-
-
- RTCORBA::ThreadpoolId ret_id = 0; // return id
-
- if (this->threadpool_map_.find (name, ret_id) != 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Unable to find a threadpool named %C\n",
- name));
- throw CORBA::INTERNAL ();
- }
-
- return ret_id;
-}
-
-RTCORBA::PriorityBands *
-CIAO::Deployment::RTResource_Config_Manager::find_priority_bands_by_name (const char *name)
-{
- if (name == 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Invalid name string found in \"find_priority_bands_by_name\"\n"));
- throw CORBA::BAD_PARAM ();
- }
-
- PB_MAP::ENTRY *entry = 0;
-
- if (this->priority_bands_map_.find (name, entry) != 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Unable to find a connection bands named %C\n",
- name));
- throw CORBA::INTERNAL ();
- }
-
- RTCORBA::PriorityBands_var retv = new RTCORBA::PriorityBands;
- (*retv.ptr ()) = (*entry->int_id_.ptr ());
- return retv._retn ();
-}
-
-bool
-CIAO::Deployment::RTResource_Config_Manager::policy_exists (const char *name)
-{
- if (name == 0)
- {
- CIAO_DEBUG ((LM_DEBUG,
- "Invalid name string found in "
- "CIAO::Deployment::NAResource_Config_Manager::policy_exists\n"));
- throw CORBA::INTERNAL ();
- }
-
- POLICY_MAP::ENTRY *entry = 0;
-
- if (this->policy_map_.find (name, entry) != 0)
- {
- return false;
- }
-
- return true;
-}
-
-CORBA::PolicyList *
-CIAO::Deployment::RTResource_Config_Manager::find_policies_by_name (const char *name)
-{
- if (name == 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Invalid name string found in \"find_policies_by_name\"\n"));
- throw CORBA::BAD_PARAM ();
- }
-
-
- CIAO_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name: %C\n",
- name));
-
- POLICY_MAP::ENTRY *entry = 0;
-
- if (this->policy_map_.find (name, entry) != 0)
- {
- CIAO_ERROR ((LM_ERROR,
- "Unable to find a PolicyList named %C\n",
- name));
- throw CORBA::INTERNAL ();
- }
-
- // duplicate the sequence PolicyList.
- CORBA::PolicyList_var retv =
- new CORBA::PolicyList (entry->int_id_.in ());
-
- CIAO_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name ok.\n"));
-
- return retv._retn ();
-}
-
-CORBA::Policy_ptr
-CIAO::Deployment::RTResource_Config_Manager::create_single_policy
-(const PolicyDef &policy_def)
-{
- // if (CIAO::Deployment::debug_level () > 9)
- CIAO_DEBUG ((LM_DEBUG,
- "RTResource_Config_Manager::create_single_policy: %d\n",
- policy_def._d ()));
-
- CORBA::Policy_var retv;
-
- switch (policy_def._d ())
- {
- case RTCORBA::PRIORITY_MODEL_POLICY_TYPE:
- {
- const PriorityModelPolicyDef &tmp
- = policy_def.PriorityModelDef ();
-
- retv = this->rtorb_->create_priority_model_policy ((RTCORBA::PriorityModel) tmp.priority_model,
- tmp.server_priority);
-
- if (! CORBA::is_nil (retv.in ()))
- CIAO_DEBUG ((LM_DEBUG,
- "Create PriorityModel policy: %d - %d\n",
- tmp.priority_model, tmp.server_priority));
- }
- break;
-
- case RTCORBA::THREADPOOL_POLICY_TYPE:
- {
- RTCORBA::ThreadpoolId tpid =
- this->find_threadpool_by_name (policy_def.ThreadpoolDef().Id.in ());
-
- retv = this->rtorb_->create_threadpool_policy (tpid);
-
- if (! CORBA::is_nil (retv.in ()))
- CIAO_DEBUG ((LM_DEBUG,
- "Create Threadpool policy: %C, TPid: %d\n",
- policy_def.ThreadpoolDef().Id.in (), tpid));
- }
- break;
-
- case RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
- {
- RTCORBA::PriorityBands_var bands =
- this->find_priority_bands_by_name (policy_def.PriorityBandedConnectionDef().Id.in ());
-
- retv =
- this->rtorb_->create_priority_banded_connection_policy (bands.in ());
-
- if (! CORBA::is_nil (retv.in ()))
- {
- CIAO_DEBUG ((LM_DEBUG,
- "Created Banded Connection policy: %C\n",
- policy_def.PriorityBandedConnectionDef().Id.in ()));
- }
- }
- break;
-
- default:
- retv = 0;
- }
-
- return retv._retn ();
-}
-
-CIAO::Deployment::RTResource_Config_Manager::~RTResource_Config_Manager ()
-{
- this->fini ();
-}
-
-extern "C" CIAO_RTNA_Configurator_Export CIAO::Deployment::Config_Manager
-*create_rt_config_manager (void);
-
-CIAO::Deployment::Config_Manager *
-create_rt_config_manager (void)
-{
- CIAO::Deployment::RTResource_Config_Manager *config;
- ACE_NEW_RETURN (config, CIAO::Deployment::RTResource_Config_Manager, 0);
- return config;
-}
diff --git a/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h b/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h
deleted file mode 100644
index 071536a5fc6..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file RTConfig_Manager.h
- *
- * $Id$
- *
- * This file contains classes that manage name to configuration
- * mapping info in a RTComponentServer.
- *
- * @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef CIAO_RTCONFIG_MANAGER_H
-#define CIAO_RTCONFIG_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Null_Mutex.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "tao/RTCORBA/RTCORBA.h"
-#include "ciao/ComponentServer/CIAO_ServerResourcesC.h"
-
-#include "ciao/ComponentServer/Configurators/Config_Manager.h"
-#include "RTNA_Configurator_Export.h"
-
-namespace CIAO
-{
- namespace Deployment
- {
- /**
- * @brief RTResource_Config_Manager maintains a collection of
- * RTCORBA related resources.
- *
- * This class is responsible to create and manage a list of RTCORBA
- * related resources that are global to an RT ComponentServer. The
- * information required to create and configure these resources are
- * passed in via the @a info argument in the @c init method. These
- * resources are identified by names and can be used to associate
- * these resources with related RTPolicies. These resources are
- * destoryed along with this class.
- *
- * Currently, the only resources supported (and managed) by this
- * class are Threadpool and Threadpool_with_Lanes.
- */
- class RTResource_Config_Manager : public Config_Manager
- {
- public:
- RTResource_Config_Manager (void);
- ~RTResource_Config_Manager (void);
-
- virtual void init (CORBA::ORB_ptr orb);
-
- virtual int pre_orb_initialize (void);
-
- virtual int post_orb_initialize (CORBA::ORB_ptr o);
-
- /// Initializing the RTResource_Config_Manager
- virtual void init_resources (const ServerResource &info);
-
- /// Finalizing the RTResource_Config_Manager and the resources it
- /// manages.
- void fini ();
-
- /// Query a policy set by name
- virtual CORBA::PolicyList *find_policies_by_name (const char *name);
-
- virtual bool policy_exists (const char *name);
-
- protected:
- void print_resources (const ServerResource &info);
-
- /// Query a thread pool by name.
- RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name);
-
-
- /// Query a priority bands info by name.
- RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name);
-
- private:
- /// Cached an ORB reference.
- CORBA::ORB_var orb_;
-
- // Cached an RTORB reference.
- RTCORBA::RTORB_var rtorb_;
-
- /// Hash_Map stuff.
- typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
- RTCORBA::ThreadpoolId,
- ACE_Hash<ACE_CString>,
- ACE_Equal_To<ACE_CString>,
- ACE_Null_Mutex> TP_MAP;
-
- typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
- RTCORBA::PriorityBands_var,
- ACE_Hash<ACE_CString>,
- ACE_Equal_To<ACE_CString>,
- ACE_Null_Mutex> PB_MAP;
-
- /// Internal TP name to id map.
- TP_MAP threadpool_map_;
-
- /// Internal PB name to priority bands map.
- PB_MAP priority_bands_map_;
-
- /// create a single policy
- CORBA::Policy_ptr create_single_policy
- (const PolicyDef &policy_def);
-
- /// Hash_Map stuff.
- typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
- CORBA::PolicyList_var,
- ACE_Hash<ACE_CString>,
- ACE_Equal_To<ACE_CString>,
- ACE_Null_Mutex> POLICY_MAP;
-
- /// Internal TP names to id map.
- POLICY_MAP policy_map_;
-};
-}
-}
-
-#if defined (__ACE_INLINE__)
-# include "RTConfig_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_RTCONFIG_MANAGER_H */
-
diff --git a/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.inl b/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.inl
deleted file mode 100644
index 08aaef9f6ad..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.inl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-
-ACE_INLINE
-CIAO::Deployment::RTResource_Config_Manager::RTResource_Config_Manager ()
-{
-}
-
diff --git a/CIAO/ciao/ComponentServer/Configurators/RT/RTNA_Configurator_Export.h b/CIAO/ciao/ComponentServer/Configurators/RT/RTNA_Configurator_Export.h
deleted file mode 100644
index 689a871c7e5..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/RT/RTNA_Configurator_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CIAO_RTNA_Configurator
-// ------------------------------
-#ifndef CIAO_RTNA_CONFIGURATOR_EXPORT_H
-#define CIAO_RTNA_CONFIGURATOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_RTNA_CONFIGURATOR_HAS_DLL)
-# define CIAO_RTNA_CONFIGURATOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAO_RTNA_CONFIGURATOR_HAS_DLL */
-
-#if !defined (CIAO_RTNA_CONFIGURATOR_HAS_DLL)
-# define CIAO_RTNA_CONFIGURATOR_HAS_DLL 1
-#endif /* ! CIAO_RTNA_CONFIGURATOR_HAS_DLL */
-
-#if defined (CIAO_RTNA_CONFIGURATOR_HAS_DLL) && (CIAO_RTNA_CONFIGURATOR_HAS_DLL == 1)
-# if defined (CIAO_RTNA_CONFIGURATOR_BUILD_DLL)
-# define CIAO_RTNA_Configurator_Export ACE_Proper_Export_Flag
-# define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else /* CIAO_RTNA_CONFIGURATOR_BUILD_DLL */
-# define CIAO_RTNA_Configurator_Export ACE_Proper_Import_Flag
-# define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* CIAO_RTNA_CONFIGURATOR_BUILD_DLL */
-#else /* CIAO_RTNA_CONFIGURATOR_HAS_DLL == 1 */
-# define CIAO_RTNA_Configurator_Export
-# define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARATION(T)
-# define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_RTNA_CONFIGURATOR_HAS_DLL == 1 */
-
-// Set CIAO_RTNA_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_RTNA_CONFIGURATOR_NTRACE)
-# if (ACE_NTRACE == 1)
-# define CIAO_RTNA_CONFIGURATOR_NTRACE 1
-# else /* (ACE_NTRACE == 1) */
-# define CIAO_RTNA_CONFIGURATOR_NTRACE 0
-# endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_RTNA_CONFIGURATOR_NTRACE */
-
-#if (CIAO_RTNA_CONFIGURATOR_NTRACE == 1)
-# define CIAO_RTNA_CONFIGURATOR_TRACE(X)
-#else /* (CIAO_RTNA_CONFIGURATOR_NTRACE == 1) */
-# if !defined (ACE_HAS_TRACE)
-# define ACE_HAS_TRACE
-# endif /* ACE_HAS_TRACE */
-# define CIAO_RTNA_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
-# include "ace/Trace.h"
-#endif /* (CIAO_RTNA_CONFIGURATOR_NTRACE == 1) */
-
-#endif /* CIAO_RTNA_CONFIGURATOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc b/CIAO/ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc
deleted file mode 100644
index 59722cf7d90..00000000000
--- a/CIAO/ciao/ComponentServer/Configurators/RT/RT_Configurator.mpc
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-project(RT_Configurator) : ccm_stub, ciao_componentserver_stub, ciao_lib {
- after += CIAO_Basic_Configurator
- libs += CIAO_Basic_Configurator
- dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
- Source_Files {
- RTConfig_Manager.cpp
- }
-}
-
-