summaryrefslogtreecommitdiff
path: root/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp')
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp137
1 files changed, 47 insertions, 90 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 43dac21d14a..73a767d6413 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -24,21 +24,21 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
}
MIF_Scheduling::SchedulingParameter
-MIF_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MIF_Sched_Param_Policy::value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->value_;
}
void
-MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->value_ = value;
}
CORBA::Policy_ptr
-MIF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Sched_Param_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
MIF_Sched_Param_Policy* tmp = 0;
@@ -46,13 +46,12 @@ MIF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
MIF_Sched_Param_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
void
-MIF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MIF_Sched_Param_Policy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -66,7 +65,6 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
ace_sched_policy_ (ace_sched_policy),
ace_sched_scope_ (ace_sched_scope)
{
- ACE_DECLARE_NEW_ENV;
Kokyu::DSRT_ConfigInfo config;
@@ -80,17 +78,13 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
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);
+ CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory");
if (CORBA::is_nil(obj.in ()))
{
@@ -122,7 +116,7 @@ MIF_Scheduler::shutdown (void)
}
MIF_Scheduling::SchedulingParameterPolicy_ptr
-MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value ACE_ENV_ARG_DECL)
+MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value)
ACE_THROW_SPEC ((CORBA::SystemException))
{
MIF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy;
@@ -144,8 +138,7 @@ void
MIF_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))
{
@@ -181,25 +174,21 @@ void
MIF_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
MIF_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))
{
@@ -229,8 +218,7 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
void
MIF_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
@@ -248,8 +236,7 @@ void
MIF_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))
{
@@ -257,15 +244,13 @@ MIF_Scheduler::end_nested_scheduling_segment (
void
-MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+MIF_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,
@@ -279,8 +264,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
sc.context_id = Client_Interceptor::SchedulingInfo;
CORBA::Policy_ptr sched_policy =
- this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->current_->scheduling_parameter();
/*
int guid;
ACE_OS::memcpy (&guid,
@@ -326,8 +310,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
#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);
}
@@ -352,8 +335,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
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))
{
@@ -365,8 +347,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
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,
@@ -382,9 +363,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
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);
CORBA::Short importance;
@@ -439,15 +418,13 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
}
void
-MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Short importance = 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,
@@ -460,8 +437,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
sc.context_id = Server_Interceptor::SchedulingInfo;
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))
{
@@ -496,8 +472,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
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"));
@@ -513,46 +488,38 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
}
void
-MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- send_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ send_reply (ri);
}
void
-MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
void
-MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- send_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ send_reply (ri);
}
void
-MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
ACE_THROW_SPEC ((CORBA::SystemException))
{
RTScheduling::Current::IdType guid;
CORBA::Short importance=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
@@ -565,9 +532,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
// 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)
{
@@ -603,56 +568,50 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
}
void
-MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+MIF_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
-MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
- ACE_ENV_ARG_DECL)
+MIF_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
-MIF_Scheduler::cancel (const RTScheduling::Current::IdType &
- ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Scheduler::scheduling_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
void
-MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &
- ACE_ENV_ARG_DECL)
+MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_THROW (CORBA::NO_IMPLEMENT ());
+ throw CORBA::NO_IMPLEMENT ();
}
CORBA::PolicyList*
-MIF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Scheduler::poa_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
char *
-MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Scheduler::scheduling_discipline_name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -660,8 +619,7 @@ MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
RTScheduling::ResourceManager_ptr
MIF_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);
@@ -670,10 +628,9 @@ MIF_Scheduler::create_resource_manager (const char *,
void
MIF_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