summaryrefslogtreecommitdiff
path: root/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp')
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp134
1 files changed, 45 insertions, 89 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 911fc6abf7d..fed6b3777bc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -25,7 +25,6 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
FP_Scheduling::SegmentSchedulingParameter
FP_Segment_Sched_Param_Policy::value (
- ACE_ENV_SINGLE_ARG_DECL_NOT_USED
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -37,7 +36,6 @@ FP_Segment_Sched_Param_Policy::value (
void
FP_Segment_Sched_Param_Policy::value (
const FP_Scheduling::SegmentSchedulingParameter & value
- ACE_ENV_ARG_DECL_NOT_USED
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -47,20 +45,19 @@ FP_Segment_Sched_Param_Policy::value (
}
CORBA::Policy_ptr
-FP_Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+FP_Segment_Sched_Param_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FP_Segment_Sched_Param_Policy* tmp;
ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
void
-FP_Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FP_Segment_Sched_Param_Policy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -75,7 +72,6 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
ace_sched_policy_ (ace_sched_policy),
ace_sched_scope_ (ace_sched_scope)
{
- ACE_DECLARE_NEW_ENV;
Kokyu::DSRT_ConfigInfo config;
@@ -89,19 +85,14 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
kokyu_dispatcher_ = tmp;
CORBA::Object_var object =
- orb->resolve_initial_references ("RTScheduler_Current"
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ orb->resolve_initial_references ("RTScheduler_Current");
this->current_ =
- RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ RTScheduling::Current::_narrow (object.in ());
IOP::CodecFactory_var codec_factory;
CORBA::Object_var obj =
- orb->resolve_initial_references ("CodecFactory"
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ orb->resolve_initial_references ("CodecFactory");
if (CORBA::is_nil(obj.in ()))
{
@@ -135,7 +126,6 @@ Fixed_Priority_Scheduler::shutdown (void)
FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
Fixed_Priority_Scheduler::create_segment_scheduling_parameter (
const FP_Scheduling::SegmentSchedulingParameter & value
- ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -161,8 +151,7 @@ void
Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType& guid,
const char *,
CORBA::Policy_ptr sched_policy,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
@@ -198,25 +187,21 @@ void
Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
const char *name,
CORBA::Policy_ptr sched_param,
- CORBA::Policy_ptr implicit_sched_param
- ACE_ENV_ARG_DECL)
+ CORBA::Policy_ptr implicit_sched_param)
ACE_THROW_SPEC ((CORBA::SystemException,
RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
this->begin_new_scheduling_segment (guid,
name,
sched_param,
- implicit_sched_param
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ implicit_sched_param);
}
void
Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &guid,
const char* name,
CORBA::Policy_ptr sched_policy,
- CORBA::Policy_ptr implicit_sched_param
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr implicit_sched_param)
ACE_THROW_SPEC ((CORBA::SystemException,
RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
@@ -247,8 +232,7 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
void
Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
- const char *
- ACE_ENV_ARG_DECL_NOT_USED)
+ const char *)
ACE_THROW_SPEC ((CORBA::SystemException))
{
#ifdef KOKYU_DSRT_LOGGING
@@ -265,8 +249,7 @@ Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::I
void
Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
const char *,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -274,15 +257,13 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
void
-Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
- CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var operation = ri->operation ();
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG,
@@ -295,7 +276,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
sc.context_id = Client_Interceptor::SchedulingInfo;
CORBA::Policy_ptr sched_policy =
- this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->current_->scheduling_parameter();
/*
int guid;
ACE_OS::memcpy (&guid,
@@ -343,8 +324,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
#endif
// Add this context to the service context list.
- ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ri->add_request_service_context (sc, 0);
}
@@ -369,8 +349,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
RTScheduling::Current::IdType_out guid_out,
CORBA::String_out /*name*/,
CORBA::Policy_out sched_param_out,
- CORBA::Policy_out /*implicit_sched_param_out*/
- ACE_ENV_ARG_DECL)
+ CORBA::Policy_out /*implicit_sched_param_out*/)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
@@ -382,8 +361,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
RTScheduling::Current::IdType guid;
- CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var operation = ri->operation ();
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG,
@@ -399,9 +377,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
return;
IOP::ServiceContext_var sc =
- ri->get_request_service_context (Server_Interceptor::SchedulingInfo
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ri->get_request_service_context (Server_Interceptor::SchedulingInfo);
RTCORBA::Priority desired_priority;
@@ -457,23 +433,20 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
}
void
-Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
void
-Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException))
{
RTCORBA::Priority desired_priority = 0;
Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
- CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var operation = ri->operation ();
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG,
@@ -487,8 +460,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
ACE_DEBUG ((LM_DEBUG, "in send_reply: before accessing current_->sched_param\n"));
CORBA::Policy_ptr sched_policy =
- this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->current_->scheduling_parameter();
if (CORBA::is_nil (sched_policy))
{
@@ -517,8 +489,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
sc.context_data = reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
// Add this context to the service context list.
- ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ri->add_reply_service_context (sc, 1);
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG, "(%t|%T):reply sc added\n"));
@@ -534,36 +505,31 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
}
void
-Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- send_reply (ri ACE_ENV_ARG_PARAMETER);
+ send_reply (ri);
}
void
-Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- send_reply (ri ACE_ENV_ARG_PARAMETER);
+ send_reply (ri);
}
void
-Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException))
{
RTScheduling::Current::IdType guid;
RTCORBA::Priority desired_priority=0;
- CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var operation = ri->operation ();
- CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::Object_var target = ri->target ();
ACE_CString opname = operation.in ();
#ifdef KOKYU_DSRT_LOGGING
@@ -576,9 +542,7 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
// Check that the reply service context was received as
// expected.
IOP::ServiceContext_var sc =
- ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ri->get_reply_service_context (Client_Interceptor::SchedulingInfo);
if (sc.ptr () == 0)
{
@@ -615,57 +579,51 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
}
void
-Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- receive_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ receive_reply (ri);
}
void
-Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- receive_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ receive_reply (ri);
}
void
-Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW (CORBA::NO_IMPLEMENT ());
+ throw CORBA::NO_IMPLEMENT ();
}
CORBA::PolicyList*
-Fixed_Priority_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
+Fixed_Priority_Scheduler::scheduling_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
void
-Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &
- ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW (CORBA::NO_IMPLEMENT ());
+ throw CORBA::NO_IMPLEMENT ();
}
CORBA::PolicyList*
-Fixed_Priority_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
+Fixed_Priority_Scheduler::poa_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
char *
-Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
+Fixed_Priority_Scheduler::scheduling_discipline_name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -673,8 +631,7 @@ Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
RTScheduling::ResourceManager_ptr
Fixed_Priority_Scheduler::create_resource_manager (const char *,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -683,10 +640,9 @@ Fixed_Priority_Scheduler::create_resource_manager (const char *,
void
Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
const char *,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW (CORBA::NO_IMPLEMENT ());
+ throw CORBA::NO_IMPLEMENT ();
}
View Lorry Controller Status