summaryrefslogtreecommitdiff
path: root/TAO/tests/RTScheduling/Scheduler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/RTScheduling/Scheduler.cpp')
-rw-r--r--TAO/tests/RTScheduling/Scheduler.cpp82
1 files changed, 28 insertions, 54 deletions
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index 885e7ba2fd7..b6bf436b6fd 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -5,16 +5,12 @@
#include "ace/Atomic_Op.h"
#include "tao/RTScheduling/Request_Interceptor.h"
-TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb)
{
CORBA::Object_var current_obj =
- orb->resolve_initial_references ("RTScheduler_Current"
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ orb->resolve_initial_references ("RTScheduler_Current");
- current_ = RTScheduling::Current::_narrow (current_obj.in ()
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ current_ = RTScheduling::Current::_narrow (current_obj.in ());
}
TAO_Scheduler::~TAO_Scheduler (void)
@@ -22,28 +18,27 @@ TAO_Scheduler::~TAO_Scheduler (void)
}
CORBA::PolicyList*
-TAO_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Scheduler::scheduling_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
}
void
-TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
CORBA::PolicyList*
-TAO_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Scheduler::poa_policies (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
}
char *
-TAO_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Scheduler::scheduling_discipline_name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
@@ -51,8 +46,7 @@ TAO_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
RTScheduling::ResourceManager_ptr
TAO_Scheduler::create_resource_manager (const char *,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
@@ -61,8 +55,7 @@ TAO_Scheduler::create_resource_manager (const char *,
void
TAO_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
const char *,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -71,8 +64,7 @@ void
TAO_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &,
const char *,
CORBA::Policy_ptr,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
@@ -82,8 +74,7 @@ void
TAO_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &,
const char *,
CORBA::Policy_ptr,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
@@ -93,8 +84,7 @@ void
TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &,
const char *,
CORBA::Policy_ptr,
- CORBA::Policy_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+ CORBA::Policy_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
{
@@ -102,8 +92,7 @@ TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &,
void
TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
- const char *
- ACE_ENV_ARG_DECL_NOT_USED)
+ const char *)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -111,16 +100,14 @@ TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
void
TAO_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))
{
}
void
-TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info
- ACE_ENV_ARG_DECL)
+TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
@@ -128,9 +115,8 @@ TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
srv_con->context_id = Client_Interceptor::SchedulingInfo;
srv_con->context_data.length (sizeof (size_t));
ACE_OS::memcpy (srv_con->context_data.get_buffer (),
- current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
+ current_->id ()->get_buffer (),
sizeof (size_t));
- ACE_CHECK;
request_info->add_request_service_context (*srv_con,
0);
}
@@ -140,18 +126,15 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
RTScheduling::Current::IdType_out guid_out,
CORBA::String_out /*name*/,
CORBA::Policy_out /*sched_param*/,
- CORBA::Policy_out /*implicit_sched_param*/
- ACE_ENV_ARG_DECL)
+ CORBA::Policy_out /*implicit_sched_param*/)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
IOP::ServiceContext_var serv_cxt;
- ACE_TRY
+ try
{
- serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo);
size_t gu_id;
ACE_OS::memcpy (&gu_id,
@@ -173,71 +156,62 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
guid_out.ptr () = guid;
}
- ACE_CATCHANY
+ catch (const CORBA::Exception&)
{
ACE_DEBUG ((LM_DEBUG,
"Invalid Service Context\n"));
}
- ACE_ENDTRY;
}
void
-TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
void
-TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
void
-TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
void
-TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
void
-TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
void
-TAO_Scheduler::cancel (const RTScheduling::Current::IdType &
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::cancel (const RTScheduling::Current::IdType &)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
View Lorry Controller Status