summaryrefslogtreecommitdiff
path: root/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp')
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp42
1 files changed, 4 insertions, 38 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 30b2df14acd..5730aaacbf4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -16,14 +16,12 @@ using namespace std;
EDF_Scheduling::SchedulingParameter
EDF_Sched_Param_Policy::value (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->value_;
}
void
EDF_Sched_Param_Policy::value (const EDF_Scheduling::SchedulingParameter& value)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->value_ = value;
}
@@ -92,7 +90,6 @@ EDF_Scheduler::shutdown (void)
EDF_Scheduling::SchedulingParameterPolicy_ptr
EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
/* MEASURE: Time to create scheduling parameter */
DSUI_EVENT_LOG (EDF_SCHED_FAM, CREATE_SCHED_PARAM, 0, 0, NULL);
@@ -117,8 +114,6 @@ EDF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
const char *,
CORBA::Policy_ptr sched_policy,
CORBA::Policy_ptr)
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG,
@@ -158,8 +153,6 @@ EDF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
const char *name,
CORBA::Policy_ptr sched_param,
CORBA::Policy_ptr implicit_sched_param)
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
int int_guid;
ACE_OS::memcpy (&int_guid,
@@ -177,8 +170,6 @@ EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
const char* name,
CORBA::Policy_ptr sched_policy,
CORBA::Policy_ptr implicit_sched_param)
- ACE_THROW_SPEC ((CORBA::SystemException,
- RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
ACE_UNUSED_ARG ((name));
ACE_UNUSED_ARG ((implicit_sched_param));
@@ -208,7 +199,6 @@ EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
void
EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
const char *)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
int int_guid;
@@ -227,7 +217,6 @@ void
EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
const char *,
CORBA::Policy_ptr)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
int int_guid;
ACE_OS::memcpy (&int_guid,
@@ -239,8 +228,6 @@ EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdTyp
void
EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::ForwardRequest))
{
int int_guid;
ACE_OS::memcpy (&int_guid,
@@ -348,8 +335,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
CORBA::String_out /*name*/,
CORBA::Policy_out sched_param_out,
CORBA::Policy_out /*implicit_sched_param_out*/)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::ForwardRequest))
{
Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
@@ -477,8 +462,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
void
EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::ForwardRequest))
{
int int_guid;
ACE_OS::memcpy (&int_guid,
@@ -489,7 +472,6 @@ EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
void
EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
int int_guid;
ACE_OS::memcpy (&int_guid,
@@ -576,8 +558,6 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
void
EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::ForwardRequest))
{
int int_guid;
ACE_OS::memcpy (&int_guid,
@@ -590,8 +570,6 @@ EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
void
EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::ForwardRequest))
{
int int_guid;
ACE_OS::memcpy (&int_guid,
@@ -604,7 +582,6 @@ EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
void
EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
int int_guid;
@@ -679,8 +656,6 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
void
EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::ForwardRequest))
{
DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_EXCEPTION, 0, 0, NULL);
@@ -689,8 +664,6 @@ EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
void
EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::ForwardRequest))
{
DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_OTHER, 0, 0, NULL);
@@ -702,52 +675,45 @@ EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
void
EDF_Scheduler::cancel (const RTScheduling::Current::IdType &)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
throw CORBA::NO_IMPLEMENT ();
}
CORBA::PolicyList*
EDF_Scheduler::scheduling_policies (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+ throw CORBA::NO_IMPLEMENT ();
}
void
EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
throw CORBA::NO_IMPLEMENT ();
}
CORBA::PolicyList*
EDF_Scheduler::poa_policies (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+ throw CORBA::NO_IMPLEMENT ();
}
char *
EDF_Scheduler::scheduling_discipline_name (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+ throw CORBA::NO_IMPLEMENT ();
}
RTScheduling::ResourceManager_ptr
EDF_Scheduler::create_resource_manager (const char *,
CORBA::Policy_ptr)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+ throw CORBA::NO_IMPLEMENT ();
}
void
EDF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
const char *,
CORBA::Policy_ptr)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
throw CORBA::NO_IMPLEMENT ();
}
View Lorry Controller Status