summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp872
1 files changed, 436 insertions, 436 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index dcf151a4691..dbeb3e615f0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -20,7 +20,7 @@ static int resv_confirm = 0;
int
FillQoSParams (ACE_QoS_Params &qos_params,
- iovec* iov,
+ iovec* iov,
ACE_QoS* qos)
{
qos_params.callee_data (iov);
@@ -43,98 +43,98 @@ TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void)
int
TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec,
- TAO_AV_UDP_QoS_Flow_Handler *handler)
+ TAO_AV_UDP_QoS_Flow_Handler *handler)
{
ACE_QoS* ace_qos = 0;
ACE_NEW_RETURN (ace_qos,
- ACE_QoS,
- -1);
-
+ ACE_QoS,
+ -1);
+
Fill_ACE_QoS fill_ace_qos;
-
+
if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
{
if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos,
- &ace_flow_spec) !=0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to fill simplex sender qos (%N|%l)\n"),
- -1);
+ &ace_flow_spec) !=0)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Unable to fill simplex sender qos (%N|%l)\n"),
+ -1);
else
- if (TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "Filled up the Sender QoS parameters\n"));
+ if (TAO_debug_level > 0)
+ ACE_DEBUG ((LM_DEBUG,
+ "Filled up the Sender QoS parameters\n"));
}
else if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER)
{
if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos,
- &ace_flow_spec) !=0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to fill simplex receiver qos (%N|%l)\n"),
- -1);
+ &ace_flow_spec) !=0)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Unable to fill simplex receiver qos (%N|%l)\n"),
+ -1);
else
- if (TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "Filled up the Receiver QoS parameters\n"));
+ if (TAO_debug_level > 0)
+ ACE_DEBUG ((LM_DEBUG,
+ "Filled up the Receiver QoS parameters\n"));
}
-
+
ACE_QoS_Manager qos_manager = handler->get_socket ()->qos_manager ();
-
+
// Set the QoS for the session. Replaces the ioctl () call that
// was being made previously.
if (handler->qos_session ()->qos (handler->get_socket (),
- &qos_manager,
- *ace_qos) == -1)
+ &qos_manager,
+ *ace_qos) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to set QoS (%N|%l)\n"),
- -1);
+ "Unable to set QoS (%N|%l)\n"),
+ -1);
else
ACE_DEBUG ((LM_DEBUG,
- "Setting QOS succeeds\n"));
+ "Setting QOS succeeds\n"));
return 0;
}
ACE_QoS_Session *
TAO_AV_UDP_QoS_Session_Helper::open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *handler,
- ACE_INET_Addr &addr)
+ ACE_INET_Addr &addr)
{
ACE_QoS_Params qos_params;
-
+
ACE_QoS* ace_qos = 0;
-
- FillQoSParams (qos_params,
- 0,
- ace_qos);
-
-
+
+ FillQoSParams (qos_params,
+ 0,
+ ace_qos);
+
+
// Create a QoS Session Factory.
ACE_QoS_Session_Factory session_factory;
-
+
// Ask the factory to create a QoS session. This could be RAPI or
// GQoS based on the parameter passed.
-
+
//@@YAmuna : Later make this generic for GQoS
ACE_QoS_Session *qos_session = session_factory.create_session (ACE_QoS_Session_Factory::ACE_RAPI_SESSION);
-
+
// Create a destination address for the QoS session. The same
// address should be used for the subscribe call later. A copy
// is made below only to distinguish the two usages of the dest
// address.
ACE_INET_Addr dest_addr (addr);
-
+
// A QoS session is defined by the 3-tuple [DestAddr, DestPort,
// Protocol]. Initialize the QoS session.
if (qos_session->open (dest_addr,
- IPPROTO_UDP) == -1)
+ IPPROTO_UDP) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Error in opening the QoS session\n"),
- 0);
+ "Error in opening the QoS session\n"),
+ 0);
else
ACE_DEBUG ((LM_DEBUG,
- "QoS session opened successfully\n"));
-
+ "QoS session opened successfully\n"));
+
if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
{
// This is a sender
@@ -151,34 +151,34 @@ TAO_AV_UDP_QoS_Session_Helper::open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *ha
int
TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_session,
- TAO_AV_UDP_QoS_Flow_Handler *handler)
+ TAO_AV_UDP_QoS_Flow_Handler *handler)
{
ACE_QoS_Decorator* qos_decorator;
-
- // Decorate the above handler with QoS functionality.
+
+ // Decorate the above handler with QoS functionality.
ACE_NEW_RETURN (qos_decorator,
- ACE_QoS_Decorator (handler,
- qos_session,
- handler->av_core ()->reactor ()),
+ ACE_QoS_Decorator (handler,
+ qos_session,
+ handler->av_core ()->reactor ()),
-1);
-
+
// Initialize the Decorator.
if (qos_decorator->init () != 0)
ACE_ERROR_RETURN ((LM_ERROR,
- "QoS Decorator init () failed (%N|%l)\n"),
- -1);
-
+ "QoS Decorator init () failed (%N|%l)\n"),
+ -1);
+
// Register the decorated Event Handler with the Reactor.
int result = handler->av_core ()->reactor ()->register_handler (qos_decorator,
- ACE_Event_Handler::QOS_MASK |
- ACE_Event_Handler::READ_MASK);
+ ACE_Event_Handler::QOS_MASK |
+ ACE_Event_Handler::READ_MASK);
if (result == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Error in registering the Decorator with the Reactor (%N|%l)\n"),
- -1);
-
+ "Error in registering the Decorator with the Reactor (%N|%l)\n"),
+ -1);
+
return 0;
-
+
}
TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void)
@@ -207,7 +207,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_input (ACE_HANDLE /*fd*/)
int
TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_params,
- ACE_Flow_Spec *ace_flow_spec)
+ ACE_Flow_Spec *ace_flow_spec)
{
for (unsigned int i = 0;
i < qos_params.length ();
@@ -220,7 +220,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para
ace_flow_spec->service_type (type);
}
else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0)
- {
+ {
CORBA::ULong tok_rate;
qos_params [i].property_value >>= tok_rate;
ace_flow_spec->token_rate (tok_rate);
@@ -231,7 +231,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para
qos_params [i].property_value >>= tok_buck_size;
ace_flow_spec->token_bucket_size (tok_buck_size);
}
- else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)
+ else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)
{
CORBA::ULong peak_bw;
qos_params [i].property_value >>= peak_bw;
@@ -280,7 +280,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para
int
TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec,
- CosPropertyService::Properties &qos_params)
+ CosPropertyService::Properties &qos_params)
{
qos_params.length (9);
@@ -289,10 +289,10 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec,
qos_params [1].property_name = CORBA::string_dup ("Token_Rate");
qos_params [1].property_value <<= (CORBA::ULong) ace_flow_spec->token_rate ();
-
+
qos_params [2].property_name = CORBA::string_dup ("Token_Bucket_Size");
qos_params [2].property_value <<= (CORBA::ULong) ace_flow_spec->token_bucket_size ();
-
+
qos_params [3].property_name = CORBA::string_dup ("Peak_Bandwidth");
qos_params [3].property_value <<= (CORBA::ULong) ace_flow_spec->peak_bandwidth ();
@@ -301,10 +301,10 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec,
qos_params [5].property_name = CORBA::string_dup ("Delay_Variation");
qos_params [5].property_value <<= (CORBA::ULong) ace_flow_spec->delay_variation ();
-
+
qos_params [6].property_name = CORBA::string_dup ("Max_SDU_Size");
qos_params [6].property_value <<= (CORBA::ULong) ace_flow_spec->max_sdu_size ();
-
+
qos_params [7].property_name = CORBA::string_dup ("Minimum_Policed_Size");
qos_params [7].property_value <<= (CORBA::ULong) ace_flow_spec->minimum_policed_size ();
@@ -318,14 +318,14 @@ int
TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
{
- ACE_DECLARE_NEW_CORBA_ENV;
+ TAO_ENV_DECLARE_NEW_ENV;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
+ "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
if (this->qos_session_->update_qos () == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Error in updating QoS\n"),
+ "Error in updating QoS\n"),
-1);
else
{
@@ -349,51 +349,51 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
if (this->qos_session_->rsvp_event_type () == ACE_QoS_Session::RSVP_RESV_EVENT)
{
if( TAO_debug_level > 0 )
- {
- ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Resv Event Received\n"));
- }
- if (!CORBA::is_nil (this->negotiator_))
- {
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "(%N,%l) Resv Event Received\n"));
+ }
+ if (!CORBA::is_nil (this->negotiator_))
+ {
if( TAO_debug_level > 0 )
- {
- ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Negotiator Specified\n"));
- }
-
- AVStreams::streamQoS new_qos;
- ACE_Flow_Spec *ace_flow_spec =
- this->qos_session_->qos ().sending_flowspec ();
-
- if (ace_flow_spec != 0)
- {
- new_qos.length (1);
- this->translate (ace_flow_spec,
- new_qos [0].QoSParams);
- }
-
- AVStreams::Negotiator_var remote_negotiator;
- this->negotiator_->negotiate (remote_negotiator.in (),
- new_qos,
- ACE_TRY_ENV);
- }
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "(%N,%l) Negotiator Specified\n"));
+ }
+
+ AVStreams::streamQoS new_qos;
+ ACE_Flow_Spec *ace_flow_spec =
+ this->qos_session_->qos ().sending_flowspec ();
+
+ if (ace_flow_spec != 0)
+ {
+ new_qos.length (1);
+ this->translate (ace_flow_spec,
+ new_qos [0].QoSParams);
+ }
+
+ AVStreams::Negotiator_var remote_negotiator;
+ this->negotiator_->negotiate (remote_negotiator.in (),
+ new_qos
+ TAO_ENV_ARG_PARAMETER);
+ }
}
}
else if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_RECEIVER)
{
if (this->qos_session_->rsvp_event_type () == ACE_QoS_Session::RSVP_PATH_EVENT)
- {
- ACE_QoS_Manager qos_manager =
- this->get_socket ()->qos_manager ();
-
- ACE_QoS ace_qos = this->qos_session_->qos ();
-
- this->qos_session_->qos (this->get_socket (),
- &qos_manager,
- ace_qos);
- }
+ {
+ ACE_QoS_Manager qos_manager =
+ this->get_socket ()->qos_manager ();
+
+ ACE_QoS ace_qos = this->qos_session_->qos ();
+
+ this->qos_session_->qos (this->get_socket (),
+ &qos_manager,
+ ace_qos);
+ }
}
-
+
return 0;
}
@@ -403,74 +403,74 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos)
if( TAO_debug_level > 0 )
{
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::change_qos\n"));
+ "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::change_qos\n"));
}
ACE_QoS* ace_qos = 0;
ACE_NEW_RETURN (ace_qos,
- ACE_QoS,
- -1);
-
+ ACE_QoS,
+ -1);
+
if (new_qos.QoSParams.length () != 0)
{
ACE_DEBUG ((LM_DEBUG,
- "New QoS Params are not Empty\n"));
+ "New QoS Params are not Empty\n"));
ACE_Flow_Spec *ace_flow_spec;
-
+
ACE_NEW_RETURN (ace_flow_spec,
- ACE_Flow_Spec,
- -1);
-
+ ACE_Flow_Spec,
+ -1);
+
this->translate (new_qos.QoSParams,
- ace_flow_spec);
-
-
+ ace_flow_spec);
+
+
Fill_ACE_QoS fill_ace_qos;
if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_SENDER)
- {
- if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos,
- ace_flow_spec) !=0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to fill simplex sender qos\n"),
- -1);
- else
- {
- if( TAO_debug_level > 0 )
- ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Filled up the Sender QoS parameters\n"));
- }
- }
+ {
+ if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos,
+ ace_flow_spec) !=0)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Unable to fill simplex sender qos\n"),
+ -1);
+ else
+ {
+ if( TAO_debug_level > 0 )
+ ACE_DEBUG ((LM_DEBUG,
+ "(%N,%l) Filled up the Sender QoS parameters\n"));
+ }
+ }
else if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_RECEIVER)
- {
- if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos,
- ace_flow_spec) !=0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to fill simplex receiver qos\n"),
- -1);
- else
- {
- if( TAO_debug_level > 0 )
- ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Filled up the Receiver QoS parameters\n"));
- }
-
- }
-
+ {
+ if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos,
+ ace_flow_spec) !=0)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Unable to fill simplex receiver qos\n"),
+ -1);
+ else
+ {
+ if( TAO_debug_level > 0 )
+ ACE_DEBUG ((LM_DEBUG,
+ "(%N,%l) Filled up the Receiver QoS parameters\n"));
+ }
+
+ }
+
ACE_QoS_Params qos_params;
- FillQoSParams (qos_params,
- 0,
- ace_qos);
+ FillQoSParams (qos_params,
+ 0,
+ ace_qos);
}
ACE_QoS_Manager qos_manager =
this->get_socket ()->qos_manager ();
-
+
int result = this->qos_session_->qos (this->get_socket (),
- &qos_manager,
- *ace_qos);
+ &qos_manager,
+ *ace_qos);
if (result != 0)
return result;
@@ -478,7 +478,7 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos)
}
int
-TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
+TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
const void *arg)
{
return TAO_AV_Flow_Handler::handle_timeout (tv,arg);
@@ -487,41 +487,41 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
int
TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
{
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address\n"));
+ "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address\n"));
- ACE_INET_Addr *inet_addr =
+ ACE_INET_Addr *inet_addr =
ACE_dynamic_cast (ACE_INET_Addr*,address);
this->peer_addr_ = *inet_addr;
- TAO_AV_UDP_QoS_Transport *transport =
+ TAO_AV_UDP_QoS_Transport *transport =
ACE_dynamic_cast (TAO_AV_UDP_QoS_Transport*,this->transport_);
-
+
if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
{
TAO_AV_UDP_QoS_Session_Helper helper;
this->qos_session_ = helper.open_qos_session (this,
- *inet_addr);
-
+ *inet_addr);
+
if (this->qos_session_ == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "QoS Session Open Failed (%N|%l)\n"),
- -1);
-
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "QoS Session Open Failed (%N|%l)\n"),
+ -1);
+
ACE_INET_Addr local_addr;
this->get_socket ()->get_local_addr (local_addr);
this->qos_session_->source_port (local_addr.get_port_number ());
if (helper.activate_qos_handler (this->qos_session_,
- this) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Activating QoS Handler Failed (%N|%l)\n"),
- -1);
+ this) == -1)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Activating QoS Handler Failed (%N|%l)\n"),
+ -1);
}
return transport->set_remote_address (*inet_addr);
}
@@ -530,10 +530,10 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
ACE_HANDLE
TAO_AV_UDP_QoS_Flow_Handler::get_handle (void) const
{
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n",
- this->qos_sock_dgram_.get_handle ()));
+ "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n",
+ this->qos_sock_dgram_.get_handle ()));
return this->qos_sock_dgram_.get_handle () ;
}
@@ -589,8 +589,8 @@ TAO_AV_UDP_QoS_Transport::get_peer_addr (void)
}
ssize_t
-TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
- ACE_Time_Value *)
+TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
+ ACE_Time_Value *)
{
// For the most part this was copied from GIOP::send_request and
// friends.
@@ -617,34 +617,34 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
// the data into a buffer and call send_n(). In other cases
// there may be some limits on the size of the iovec, there
// we should set IOV_MAX to that limit.
-
- size_t bytes_sent = 0;
+
+ size_t bytes_sent = 0;
if (iovcnt == IOV_MAX)
{
if (this->handler_->get_socket ()->send (iov,
- 1,
- bytes_sent,
- 0,
- this->handler_->qos_session ()->dest_addr (),
- 0,
- 0) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Error in dgram_mcast.send () (%N|%l)\n"),
- -1);
- else
- if (TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "Using ACE_OS::sendto () : Bytes sent : %d",
- bytes_sent));
-
- if (n < 1)
+ 1,
+ bytes_sent,
+ 0,
+ this->handler_->qos_session ()->dest_addr (),
+ 0,
+ 0) == -1)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Error in dgram_mcast.send () (%N|%l)\n"),
+ -1);
+ else
+ if (TAO_debug_level > 0)
+ ACE_DEBUG ((LM_DEBUG,
+ "Using ACE_OS::sendto () : Bytes sent : %d",
+ bytes_sent));
+
+ if (n < 1)
return n;
-
- nbytes += bytes_sent;
- iovcnt = 0;
- }
- }
+
+ nbytes += bytes_sent;
+ iovcnt = 0;
+ }
+ }
}
size_t bytes_sent = 0;
@@ -653,21 +653,21 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
if (iovcnt != 0)
{
if (this->handler_->get_socket ()->send (iov,
- 1,
- bytes_sent,
- 0,
- this->handler_->qos_session ()->dest_addr (),
- 0,
- 0) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Error in dgram_mcast.send ()\n"),
- -1);
+ 1,
+ bytes_sent,
+ 0,
+ this->handler_->qos_session ()->dest_addr (),
+ 0,
+ 0) == -1)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Error in dgram_mcast.send ()\n"),
+ -1);
else
if( TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d",
- bytes_sent));
-
+ ACE_DEBUG ((LM_DEBUG,
+ "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d",
+ bytes_sent));
+
if (n < 1)
return n;
@@ -684,36 +684,36 @@ TAO_AV_UDP_QoS_Transport::send (const char *buf,
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) TAO_AV_UDP_QoS_Transport::send "));
+ "(%N,%l) TAO_AV_UDP_QoS_Transport::send "));
char addr [BUFSIZ];
this->peer_addr_.addr_to_string (addr,BUFSIZ);
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) to %s\n",
- addr));
+ "(%N,%l) to %s\n",
+ addr));
return this->handler_->get_socket ()->send (buf,
- len,
- this->handler_->qos_session ()->dest_addr (),
- 0,
- 0,
- 0);
+ len,
+ this->handler_->qos_session ()->dest_addr (),
+ 0,
+ 0,
+ 0);
}
ssize_t
TAO_AV_UDP_QoS_Transport::send (const iovec *iov,
- int /*iovcnt*/,
- ACE_Time_Value *)
+ int /*iovcnt*/,
+ ACE_Time_Value *)
{
size_t bytes_sent = 0;
if (this->handler_->get_socket ()->send (iov,
- 1,
- bytes_sent,
- 0,
- this->handler_->qos_session ()->dest_addr (),
- 0,
- 0) == -1)
+ 1,
+ bytes_sent,
+ 0,
+ this->handler_->qos_session ()->dest_addr (),
+ 0,
+ 0) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Error in dgram_mcast.send ()\n"),
-1);
@@ -722,10 +722,10 @@ TAO_AV_UDP_QoS_Transport::send (const iovec *iov,
if( TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
"(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d",
- bytes_sent));
+ bytes_sent));
}
-
+
return bytes_sent;
}
@@ -775,20 +775,20 @@ int
TAO_AV_UDP_QoS_Acceptor::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler)
{
int result = 0;
-
+
if (TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Acceptor Svc Handler QOS ENABLED \n"));
+ ACE_DEBUG ((LM_DEBUG,
+ "(%N,%l) Acceptor Svc Handler QOS ENABLED \n"));
TAO_AV_UDP_QoS_Session_Helper helper;
result = helper.activate_qos_handler (handler->qos_session (),
- handler);
+ handler);
if (result == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Error in registering the Decorator with the Reactor\n"),
- -1);
-
+ "Error in registering the Decorator with the Reactor\n"),
+ -1);
+
return result;
}
@@ -801,9 +801,9 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint,
{
ACE_UNUSED_ARG (flow_comp);
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open "));
+ "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open "));
this->av_core_ = av_core;
this->endpoint_ = endpoint;
@@ -818,10 +818,10 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint,
char buf[BUFSIZ];
inet_addr->addr_to_string (buf,
BUFSIZ);
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open: %s",
- buf));
+ "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open: %s",
+ buf));
int result = this->open_i (inet_addr);
@@ -847,7 +847,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
this->flowname_ = entry->flowname ();
char buf [BUFSIZ];
ACE_OS::hostname (buf,
- BUFSIZ);
+ BUFSIZ);
ACE_CString addr (buf);
addr += ":8000";
ACE_INET_Addr *address;
@@ -856,10 +856,10 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
-1);
address->addr_to_string (buf,
- BUFSIZ);
+ BUFSIZ);
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) ADDRESS IS %s\n",
- buf));
+ "(%N,%l) ADDRESS IS %s\n",
+ buf));
int result = this->open_i (address);
if (result < 0)
@@ -871,66 +871,66 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
int
TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
{
- ACE_DECLARE_NEW_CORBA_ENV;
+ TAO_ENV_DECLARE_NEW_ENV;
int result = 0;
-
- // TAO_AV_Callback *callback = 0;
+
+ // TAO_AV_Callback *callback = 0;
// this->endpoint_->get_callback (this->flowname_.c_str (),
// callback);
ACE_INET_Addr *local_addr;
ACE_NEW_RETURN (local_addr,
- ACE_INET_Addr (*inet_addr),
- -1);
+ ACE_INET_Addr (*inet_addr),
+ -1);
ACE_QoS_Params qos_params;
ACE_QoS* ace_qos = 0;
- FillQoSParams (qos_params,
- 0,
- ace_qos);
+ FillQoSParams (qos_params,
+ 0,
+ ace_qos);
+
-
TAO_AV_UDP_QoS_Flow_Handler* handler;
ACE_NEW_RETURN (handler,
- TAO_AV_UDP_QoS_Flow_Handler,
- -1);
-
-
+ TAO_AV_UDP_QoS_Flow_Handler,
+ -1);
+
+
TAO_AV_Flow_Handler *flow_handler = 0;
flow_handler = handler;
-
+
handler->endpoint (this->endpoint_);
handler->flowspec_entry (this->entry_);
handler->av_core (this->av_core_);
if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER)
{
-
+
TAO_AV_UDP_QoS_Session_Helper helper;
-
+
int result = handler->get_socket ()->open (*inet_addr,
- qos_params,
- AF_INET,
- 0,
- 0,
- 0,
- ACE_OVERLAPPED_SOCKET_FLAG
- | ACE_FLAG_MULTIPOINT_C_LEAF
- | ACE_FLAG_MULTIPOINT_D_LEAF,
- 1);
-
+ qos_params,
+ AF_INET,
+ 0,
+ 0,
+ 0,
+ ACE_OVERLAPPED_SOCKET_FLAG
+ | ACE_FLAG_MULTIPOINT_C_LEAF
+ | ACE_FLAG_MULTIPOINT_D_LEAF,
+ 1);
+
if (result < 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
- -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
+ -1);
result = handler->get_socket ()->get_local_addr (*local_addr);
if (result < 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Error in getting Local Address (%N|%l)\n"),
- -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Error in getting Local Address (%N|%l)\n"),
+ -1);
// Create a destination address for the QoS session. The same
// address should be used for the subscribe call later. A copy
@@ -938,89 +938,89 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
// address.
ACE_INET_Addr dest_addr;
dest_addr.set (local_addr->get_port_number (),
- local_addr->get_host_name ());
-
+ local_addr->get_host_name ());
+
char dest_buf [BUFSIZ];
dest_addr.addr_to_string (dest_buf,
- BUFSIZ);
+ BUFSIZ);
if (TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "Session Address is %s\n",
- dest_buf));
-
+ ACE_DEBUG ((LM_DEBUG,
+ "Session Address is %s\n",
+ dest_buf));
+
this->qos_session_ = helper.open_qos_session (handler,
- dest_addr);
+ dest_addr);
if (this->qos_session_ == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "QoS Session Open Failed (%N|%l)\n"),
- -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "QoS Session Open Failed (%N|%l)\n"),
+ -1);
handler->qos_session (this->qos_session_);
if (this->activate_svc_handler (handler) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Activate Svc Handler Failed (%N|%l)\n"),
- -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Activate Svc Handler Failed (%N|%l)\n"),
+ -1);
AVStreams::QoS qos;
- int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (),
- qos);
-
+ int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (),
+ qos);
+
if (qos_available == 0)
- {
-
- ACE_Flow_Spec *ace_flow_spec = 0;
- ACE_NEW_RETURN (ace_flow_spec,
- ACE_Flow_Spec,
- -1);
-
- handler->translate (qos.QoSParams,
- ace_flow_spec);
-
- if (helper.set_qos (*ace_flow_spec,
- handler) == -1)
-
- ACE_ERROR_RETURN ((LM_ERROR,
- "Set QoS Failed (%N|%l)\n"),
- -1);
- }
+ {
+
+ ACE_Flow_Spec *ace_flow_spec = 0;
+ ACE_NEW_RETURN (ace_flow_spec,
+ ACE_Flow_Spec,
+ -1);
+
+ handler->translate (qos.QoSParams,
+ ace_flow_spec);
+
+ if (helper.set_qos (*ace_flow_spec,
+ handler) == -1)
+
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Set QoS Failed (%N|%l)\n"),
+ -1);
+ }
}
else
{
-
+
int result = handler->get_socket ()->open (*inet_addr,
- qos_params,
- AF_INET,
- 0,
- 0,
- 0,
- ACE_OVERLAPPED_SOCKET_FLAG
- | ACE_FLAG_MULTIPOINT_C_LEAF
- | ACE_FLAG_MULTIPOINT_D_LEAF,
- 1);
+ qos_params,
+ AF_INET,
+ 0,
+ 0,
+ 0,
+ ACE_OVERLAPPED_SOCKET_FLAG
+ | ACE_FLAG_MULTIPOINT_C_LEAF
+ | ACE_FLAG_MULTIPOINT_D_LEAF,
+ 1);
if (result < 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
- -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
+ -1);
}
-
+
TAO_AV_Protocol_Object *object =
this->flow_protocol_factory_->make_protocol_object (this->entry_,
- this->endpoint_,
- flow_handler,
- flow_handler->transport ());
+ this->endpoint_,
+ flow_handler,
+ flow_handler->transport ());
flow_handler->protocol_object (object);
-
+
AVStreams::Negotiator_ptr negotiator;
-
+
ACE_TRY_EX (negotiator)
{
CORBA::Any_ptr negotiator_any =
- this->endpoint_->get_property_value ("Negotiator",
- ACE_TRY_ENV);
+ this->endpoint_->get_property_value ("Negotiator"
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (negotiator);
*negotiator_any >>= negotiator;
@@ -1029,34 +1029,34 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
ACE_CATCHANY
{
ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Negotiator Not Found \n"));
+ "(%N,%l) Negotiator Not Found \n"));
}
ACE_ENDTRY;
-
+
this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler);
this->entry_->protocol_object (object);
-
+
result = handler->get_socket ()->get_local_addr (*local_addr);
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result);
local_addr->set (local_addr->get_port_number (),
- local_addr->get_host_name ());
+ local_addr->get_host_name ());
if (TAO_debug_level > 0)
{
char buf [BUFSIZ];
local_addr->addr_to_string (buf,
- BUFSIZ);
+ BUFSIZ);
ACE_DEBUG ((LM_DEBUG,
- "Local Address is %s\n",
- buf));
+ "Local Address is %s\n",
+ buf));
}
this->entry_->set_local_addr (local_addr);
this->entry_->handler (flow_handler);
-
+
return 0;
-
+
}
int
@@ -1080,11 +1080,11 @@ int
TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
TAO_AV_Core *av_core,
TAO_AV_Flow_Protocol_Factory *factory)
-
+
{
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "TAO_AV_UDP_QoS_Connector::open "));
+ "TAO_AV_UDP_QoS_Connector::open "));
this->endpoint_ = endpoint;
this->av_core_ = av_core;
@@ -1094,7 +1094,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
// int
// TAO_AV_UDP_QoS_Connector::translate (CosPropertyService::Properties &qos_params,
-// ACE_Flow_Spec *ace_flow_spec)
+// ACE_Flow_Spec *ace_flow_spec)
// {
// for (unsigned int i = 0;
// i < qos_params.length ();
@@ -1107,7 +1107,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
// ace_flow_spec->service_type (type);
// }
// else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0)
-// {
+// {
// CORBA::ULong tok_rate;
// qos_params [i].property_value >>= tok_rate;
// ace_flow_spec->token_rate (tok_rate);
@@ -1118,7 +1118,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
// qos_params [i].property_value >>= tok_buck_size;
// ace_flow_spec->token_bucket_size (tok_buck_size);
// }
-// else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)
+// else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)
// {
// CORBA::ULong peak_bw;
// qos_params [i].property_value >>= peak_bw;
@@ -1138,7 +1138,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
// }
// }
-
+
// return 0;
// }
@@ -1157,77 +1157,77 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
ACE_INET_Addr *local_addr;
ACE_NEW_RETURN (local_addr,
- ACE_INET_Addr ("0"),
- -1);
-
+ ACE_INET_Addr ("0"),
+ -1);
+
TAO_AV_Flow_Handler *flow_handler = 0;
-
+
TAO_AV_UDP_QoS_Flow_Handler *handler;
ACE_NEW_RETURN (handler,
TAO_AV_UDP_QoS_Flow_Handler,
-1);
-
+
flow_handler = handler;
handler->endpoint (this->endpoint_);
handler->flowspec_entry (this->entry_);
handler->av_core (this->av_core_);
-
+
ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,
entry->address ());
ACE_QoS_Params qos_params;
-
+
ACE_QoS* ace_qos = 0;
-
- FillQoSParams (qos_params,
- 0,
- ace_qos);
-
+
+ FillQoSParams (qos_params,
+ 0,
+ ace_qos);
+
result = handler->get_socket ()->open (*local_addr,
- qos_params,
- AF_INET,
- 0,
- 0,
- 0,
- ACE_OVERLAPPED_SOCKET_FLAG
- | ACE_FLAG_MULTIPOINT_C_LEAF
- | ACE_FLAG_MULTIPOINT_D_LEAF,
- 1);
+ qos_params,
+ AF_INET,
+ 0,
+ 0,
+ 0,
+ ACE_OVERLAPPED_SOCKET_FLAG
+ | ACE_FLAG_MULTIPOINT_C_LEAF
+ | ACE_FLAG_MULTIPOINT_D_LEAF,
+ 1);
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
- "Data socket open failed (%N|%l)\n"),
- -1);
-
+ "Data socket open failed (%N|%l)\n"),
+ -1);
+
result = handler->get_socket ()->get_local_addr (*local_addr);
-
+
ACE_INET_Addr *session_addr = 0;
if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER)
{
ACE_NEW_RETURN (session_addr,
- ACE_INET_Addr,
- -1);
-
+ ACE_INET_Addr,
+ -1);
+
session_addr->set (local_addr->get_port_number (),
- local_addr->get_host_name ());
-
+ local_addr->get_host_name ());
+
}
- else
+ else
{
session_addr = inet_addr;
}
-
+
char sess_buf [BUFSIZ];
session_addr->addr_to_string (sess_buf,
- BUFSIZ);
+ BUFSIZ);
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "Session Address is %s\n",
- sess_buf));
+ "Session Address is %s\n",
+ sess_buf));
// Create a destination address for the QoS session. The same
// address should be used for the subscribe call later. A copy
@@ -1238,54 +1238,54 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
TAO_AV_UDP_QoS_Session_Helper helper;
this->qos_session_ = helper.open_qos_session (handler,
- *session_addr);
+ *session_addr);
if (this->qos_session_ == 0)
ACE_ERROR_RETURN ((LM_ERROR,
- "QoS Session Open Failed (%N|%l)\n"),
- -1);
+ "QoS Session Open Failed (%N|%l)\n"),
+ -1);
else
ACE_DEBUG ((LM_DEBUG,
"QoS session opened successfully\n"));
-
+
if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
{
this->qos_session_->source_port (local_addr->get_port_number ());
}
handler->qos_session (this->qos_session_);
-
- this->qos_manager_ =
+
+ this->qos_manager_ =
handler->get_socket ()->qos_manager ();
AVStreams::QoS qos;
- int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (),
- qos);
+ int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (),
+ qos);
if (qos_available == 0)
{
ACE_Flow_Spec* ace_flow_spec;
ACE_NEW_RETURN (ace_flow_spec,
- ACE_Flow_Spec,
- -1);
-
- handler->translate (qos.QoSParams,
- ace_flow_spec);
-
+ ACE_Flow_Spec,
+ -1);
+
+ handler->translate (qos.QoSParams,
+ ace_flow_spec);
+
if (helper.set_qos (*ace_flow_spec,
- handler) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to set QoS (%N|%l)\n"),
- -1);
+ handler) == -1)
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "Unable to set QoS (%N|%l)\n"),
+ -1);
else
{
if( TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "(%N,%l) Setting QOS succeeds.\n"));
+ ACE_DEBUG ((LM_DEBUG,
+ "(%N,%l) Setting QOS succeeds.\n"));
}
}
-
+
TAO_AV_Protocol_Object *object =
this->flow_protocol_factory_->make_protocol_object (this->entry_,
this->endpoint_,
@@ -1297,50 +1297,50 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
ACE_TRY_EX (negotiator)
{
CORBA::Any_ptr negotiator_any =
- this->endpoint_->get_property_value ("Negotiator",
- ACE_TRY_ENV);
+ this->endpoint_->get_property_value ("Negotiator"
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (negotiator);
-
+
*negotiator_any >>= negotiator;
handler->negotiator (negotiator);
}
ACE_CATCHANY
{
ACE_DEBUG ((LM_DEBUG,
- "Negotiator not found for flow %s\n",
- this->entry_->flowname ()));
+ "Negotiator not found for flow %s\n",
+ this->entry_->flowname ()));
}
ACE_ENDTRY;
-
+
flow_handler->protocol_object (object);
this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler);
this->entry_->protocol_object (object);
-
+
result = handler->get_socket ()->get_local_addr (*local_addr);
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
- "Get local addr failed (%N|%l)\n"),
- result);
+ "Get local addr failed (%N|%l)\n"),
+ result);
local_addr->set (local_addr->get_port_number (),
- local_addr->get_host_name ());
+ local_addr->get_host_name ());
if (TAO_debug_level > 0)
{
- char buf[BUFSIZ];
+ char buf[BUFSIZ];
local_addr->addr_to_string (buf,
- BUFSIZ);
-
+ BUFSIZ);
+
ACE_DEBUG ((LM_DEBUG,
- "Local Address is %s\n",
- buf));
+ "Local Address is %s\n",
+ buf));
}
-
+
entry->set_local_addr (local_addr);
entry->handler (flow_handler);
transport = flow_handler->transport ();
-
+
// call activate svc handler.
return this->activate_svc_handler (handler);
}
@@ -1351,15 +1351,15 @@ TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *han
int result = 0;
TAO_AV_UDP_QoS_Session_Helper helper;
-
+
result = helper.activate_qos_handler (this->qos_session_,
- handler);
+ handler);
if (result == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "(%N,%l) Error in registering the Decorator with the Reactor\n"),
- -1);
-
+ "(%N,%l) Error in registering the Decorator with the Reactor\n"),
+ -1);
+
return result;
}
@@ -1377,7 +1377,7 @@ TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void)
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n"));
+ "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n"));
}
TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory (void)
@@ -1389,8 +1389,8 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string)
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "TAO_AV_UDP_QoS_Factory::match_protocol\n"));
-
+ "TAO_AV_UDP_QoS_Factory::match_protocol\n"));
+
if (ACE_OS::strcasecmp (protocol_string,"QoS_UDP") == 0)
return 1;
return 0;
@@ -1399,9 +1399,9 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string)
TAO_AV_Acceptor*
TAO_AV_UDP_QoS_Factory::make_acceptor (void)
{
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "TAO_AV_UDP_QoS_Factory::make_acceptor "));
+ "TAO_AV_UDP_QoS_Factory::make_acceptor "));
TAO_AV_Acceptor *acceptor = 0;
ACE_NEW_RETURN (acceptor,
@@ -1413,9 +1413,9 @@ TAO_AV_UDP_QoS_Factory::make_acceptor (void)
TAO_AV_Connector*
TAO_AV_UDP_QoS_Factory::make_connector (void)
{
- if (TAO_debug_level > 0)
+ if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "TAO_AV_UDP_QoS_Factory::make_connector "));
+ "TAO_AV_UDP_QoS_Factory::make_connector "));
TAO_AV_Connector *connector = 0;
ACE_NEW_RETURN (connector,
@@ -1439,7 +1439,7 @@ TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void)
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
- "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n"));
+ "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n"));
}
TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory (void)
View Lorry Controller Status