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.cpp41
1 files changed, 11 insertions, 30 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index eeb9a9846c4..eb2251382d6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -15,7 +15,7 @@
using namespace std;
EDF_Scheduling::SchedulingParameter
-EDF_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EDF_Sched_Param_Policy::value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->value_;
@@ -55,17 +55,14 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb,
CORBA::Object_var object =
orb->resolve_initial_references ("RTScheduler_Current"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->current_ =
RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
IOP::CodecFactory_var codec_factory;
CORBA::Object_var obj =
orb->resolve_initial_references ("CodecFactory"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil(obj.in ()))
{
@@ -179,7 +176,6 @@ EDF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
sched_param,
implicit_sched_param
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -264,8 +260,7 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_CLIENT_SCHED_TIME, int_guid, 0, NULL);
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 +274,7 @@ EDF_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();
CORBA::Long importance;
TimeBase::TimeT deadline;
@@ -335,7 +329,6 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
// Add this context to the service context list.
ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#ifdef KOKYU_DSRT_LOGGING
@@ -383,8 +376,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
#endif
- 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,
@@ -402,7 +394,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
IOP::ServiceContext_var sc =
ri->get_request_service_context (Server_Interceptor::SchedulingInfo
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Long importance;
TimeBase::TimeT deadline;
@@ -522,8 +513,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
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,
@@ -540,8 +530,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
TimeBase::TimeT deadline;
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))
{
@@ -584,7 +573,6 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
// Add this context to the service context list.
ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#ifdef KOKYU_DSRT_LOGGING
ACE_DEBUG ((LM_DEBUG, "(%t|%T):reply sc added\n"));
@@ -613,7 +601,6 @@ EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
DSUI_EVENT_LOG (EDF_SCHED_FAM, SEND_EXCEPTION, int_guid, 0, NULL);
send_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -629,7 +616,6 @@ EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
DSUI_EVENT_LOG (EDF_SCHED_FAM, SEND_OTHER, int_guid, 0, NULL);
send_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -643,11 +629,9 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_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 ();
- 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
@@ -663,7 +647,6 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
IOP::ServiceContext_var sc =
ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Long importance;
TimeBase::TimeT deadline;
@@ -721,7 +704,6 @@ EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_EXCEPTION, 0, 0, NULL);
receive_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -735,7 +717,6 @@ EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
//Otherwise Segmentation fault when oneway call happens.
/* receive_reply (ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*/
}
@@ -748,7 +729,7 @@ EDF_Scheduler::cancel (const RTScheduling::Current::IdType &
}
CORBA::PolicyList*
-EDF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
+EDF_Scheduler::scheduling_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -763,14 +744,14 @@ EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &
}
CORBA::PolicyList*
-EDF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
+EDF_Scheduler::poa_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
char *
-EDF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
+EDF_Scheduler::scheduling_discipline_name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
View Lorry Controller Status