diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp | 544 |
1 files changed, 222 insertions, 322 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 56f02d1fad8..5d262e6f616 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -26,104 +26,84 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { - this->activate_stream_endpoint (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->activate_stream_endpoint (TAO_TRY_ENV); + TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n")); - this->activate_vdev (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->activate_vdev (TAO_TRY_ENV); + TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n")); - this->activate_mediactrl (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->activate_mediactrl (TAO_TRY_ENV); + TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n")); } - ACE_CATCHANY + TAO_CATCHANY { - ACE_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate"); + TAO_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + TAO_ENDTRY; return 0; } // Activate VDev into the POA template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (CORBA::Environment &env) { - ACE_TRY - { - // Bridge pattern. Allow subclasses to override this behavior - T_VDev *vdev = 0; - if (this->make_vdev (vdev) == -1) - return -1; - - // Activate the object under the root poa. - CORBA::String_var vdev_ior = this->orb_manager_->activate (vdev, - ACE_TRY_ENV); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n", - vdev_ior. in ())); - - // Save the object reference, so that create_A can return it - this->vdev_ = vdev->_this (ACE_TRY_ENV); - ACE_TRY_CHECK; - vdev->_remove_ref (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_vdev"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + // Bridge pattern. Allow subclasses to override this behavior + T_VDev *vdev = 0; + if (this->make_vdev (vdev) == -1) + return -1; + + // Put the object in the POA + CORBA::String_var vdev_ior = this->orb_manager_->activate (vdev, + env); + TAO_CHECK_ENV_RETURN (env, -1); + ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n", + vdev_ior. in ())); + + // Save the object reference, so that create_A can return it + this->vdev_ = vdev->_this (env); + TAO_CHECK_ENV_RETURN (env, -1); + + return 0; } // Activate the media_controller template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (CORBA::Environment &env) { - ACE_TRY - { - // Bridge pattern. Subclasses can override this - T_MediaCtrl *media_ctrl = 0; - if (this->make_mediactrl (media_ctrl) == -1) - return -1; - - // Activate the mediactrl object under the root poa. - CORBA::String_var mediactrl_ior = this->orb_manager_->activate (media_ctrl, - ACE_TRY_ENV); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n", - mediactrl_ior.in ())); - - - // Associate the media controller object reference with the vdev, as per the OMG spec - CORBA::Any anyval; - anyval <<= this->orb_manager_->orb ()->object_to_string (media_ctrl->_this (ACE_TRY_ENV), - ACE_TRY_ENV); - ACE_TRY_CHECK; - - this->vdev_->define_property ("Related_MediaCtrl", - anyval, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + // Bridge pattern. Subclasses can override this + T_MediaCtrl *media_ctrl = 0; + if (this->make_mediactrl (media_ctrl) == -1) + return -1; + + // Put the object in the POA + CORBA::String_var mediactrl_ior = this->orb_manager_->activate (media_ctrl, + env); + TAO_CHECK_ENV_RETURN (env, -1); + ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n", + mediactrl_ior.in ())); + + + // Associate the media controller object reference with the vdev, as per the OMG spec + CORBA::Any anyval; + anyval <<= this->orb_manager_->orb ()->object_to_string (media_ctrl->_this (env), + env); + TAO_CHECK_ENV_RETURN (env, -1); + + this->vdev_->define_property ("Related_MediaCtrl", + anyval, + env); + + TAO_CHECK_ENV_RETURN (env, -1); + return 0; } @@ -134,6 +114,7 @@ TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_s { ACE_NEW_RETURN (stream_endpoint, T_StreamEndpoint, + -1); return 0; } @@ -185,7 +166,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &env) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -201,34 +182,23 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea // Put the stream_endpoint into the POA template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &env) { - ACE_TRY - { - T_StreamEndpoint *stream_endpoint_a = 0; - - // Use the bridge method - if (this->make_stream_endpoint (stream_endpoint_a) == -1) - return -1; - - CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_a, - ACE_TRY_ENV); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); - - // Save the object references, so that create_a can return them - this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_TRY_ENV); - ACE_TRY_CHECK; - stream_endpoint_a->_remove_ref (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + T_StreamEndpoint *stream_endpoint_a = 0; + + // Use the bridge method + if (this->make_stream_endpoint (stream_endpoint_a) == -1) + return -1; + + CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_a, + env); + TAO_CHECK_ENV_RETURN (env, -1); + ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); + + // Save the object references, so that create_a can return them + this->stream_endpoint_a_ = stream_endpoint_a->_this (env); + TAO_CHECK_ENV_RETURN (env, -1); + return 0; } @@ -252,31 +222,20 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TA // Activate stream_endpoint template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &env) { - ACE_TRY - { - T_StreamEndpoint *stream_endpoint_b = 0; - - if (this->make_stream_endpoint (stream_endpoint_b) == -1) - return -1; - CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_b, - ACE_TRY_ENV); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); - - this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_TRY_ENV); - ACE_TRY_CHECK; - stream_endpoint_b->_remove_ref (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + T_StreamEndpoint *stream_endpoint_b = 0; + + if (this->make_stream_endpoint (stream_endpoint_b) == -1) + return -1; + CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_b, + env); + TAO_CHECK_ENV_RETURN (env, -1); + ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); + + this->stream_endpoint_b_ = stream_endpoint_b->_this (env); + TAO_CHECK_ENV_RETURN (env, -1); + return 0; } @@ -285,7 +244,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &env) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -320,33 +279,32 @@ template <class T_StreamEndpoint_B, class T_VDev , class T_MediaCtrl> int TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { // create the objects and activate them in the poa this->activate_objects (argc, argv, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; // Get ourselves a naming_service object reference - this->bind_to_naming_service (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->bind_to_naming_service (TAO_TRY_ENV); + TAO_CHECK_ENV; // Register the vdev with the naming service - this->register_vdev (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->register_vdev (TAO_TRY_ENV); + TAO_CHECK_ENV; // register the stream_endpoing with the naming_service - this->register_stream_endpoint (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->register_stream_endpoint (TAO_TRY_ENV); + TAO_CHECK_ENV; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_TRY_ENV.print_exception ("TAO_Child_Process"); + TAO_TRY_ENV.print_exception ("TAO_Child_Process"); return -1; } - ACE_ENDTRY; + TAO_ENDTRY; // release the semaphore the parent is waiting on if (this->release_semaphore () == -1) @@ -362,155 +320,112 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int argc, char **argv, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &env) { - ACE_TRY - { - // initialize the orb - this->orb_manager_.init (argc, - argv, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - // bridge method to make a new stream endpoint - if (this->make_stream_endpoint (this->stream_endpoint_) == -1) - return -1; - - // bridge method to make a new vdev - if (this->make_vdev (this->vdev_) == -1) - return -1; - - // bridge method to make a new media controller - if (this->make_mediactrl (this->media_ctrl_) == -1) - return -1; - - // activate the stream_endpoint - CORBA::String_var stream_endpoint_ior = this->orb_manager_.activate (this->stream_endpoint_, - ACE_TRY_ENV); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",stream_endpoint_ior.in ())); - - // activate the vdev - CORBA::String_var vdev_ior = this->orb_manager_.activate (this->vdev_, - ACE_TRY_ENV); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",vdev_ior.in ())); - - // activate the media controller - CORBA::String_var media_ctrl_ior = this->orb_manager_.activate (this->media_ctrl_, - ACE_TRY_ENV); - - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ())); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::init "); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + // initialize the orb + this->orb_manager_.init (argc, + argv, + env); + TAO_CHECK_ENV_RETURN (env, -1); + + // bridge method to make a new stream endpoint + if (this->make_stream_endpoint (this->stream_endpoint_) == -1) + return -1; + + // bridge method to make a new vdev + if (this->make_vdev (this->vdev_) == -1) + return -1; + + // bridge method to make a new media controller + if (this->make_mediactrl (this->media_ctrl_) == -1) + return -1; + + // activate the stream_endpoint + CORBA::String_var stream_endpoint_ior = this->orb_manager_.activate (this->stream_endpoint_, + env); + TAO_CHECK_ENV_RETURN (env, -1); + ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",stream_endpoint_ior.in ())); + + // activate the vdev + CORBA::String_var vdev_ior = this->orb_manager_.activate (this->vdev_, + env); + TAO_CHECK_ENV_RETURN (env, -1); + ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",vdev_ior.in ())); + + // activate the media controller + CORBA::String_var media_ctrl_ior = this->orb_manager_.activate (this->media_ctrl_, + env); + + TAO_CHECK_ENV_RETURN (env, -1); + ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ())); + return 0; + } // Bind to the namingservice template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (CORBA::Environment &env) { - ACE_TRY - { - CORBA::Object_var naming_obj = - this->orb_manager_.orb ()->resolve_initial_references ("NameService"); - if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to resolve the Name Service.\n"), - -1); - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); - this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::bind_to_naming_service"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + CORBA::Object_var naming_obj = + this->orb_manager_.orb ()->resolve_initial_references ("NameService"); + if (CORBA::is_nil (naming_obj.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Unable to resolve the Name Service.\n"), + -1); + // ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); + this->naming_context_ = + CosNaming::NamingContext::_narrow (naming_obj.in (), + env); + TAO_CHECK_ENV_RETURN (env, + -1); + return 0; } // register the vdev with the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CORBA::Environment &env) { - CORBA::Object_ptr vdev_obj; - ACE_TRY - { - char vdev_name [BUFSIZ]; - ACE_OS::sprintf (vdev_name, - "%s:%s:%d", - "VDev", - this->host_, - this->pid_); - - ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name)); - // create the name - this->vdev_name_.length (1); - this->vdev_name_ [0].id = CORBA::string_dup (vdev_name); - - // make the media controller a property of the vdev - CORBA::Any media_ctrl_property; - CORBA::Object_var media_ctrl_obj = - this->media_ctrl_->_this (ACE_TRY_ENV); - ACE_TRY_CHECK; - media_ctrl_property <<= this->orb_manager_.orb ()->object_to_string (media_ctrl_obj.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; - this->vdev_->define_property ("Related_MediaCtrl", - media_ctrl_property, - ACE_TRY_ENV); - ACE_TRY_CHECK; - - vdev_obj = this->vdev_->_this (ACE_TRY_ENV); - ACE_TRY_CHECK; - this->vdev_->_remove_ref (ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - ACE_TRY_EX (bind) - { - // Register the vdev with the naming server. - this->naming_context_->bind (this->vdev_name_, - vdev_obj, - ACE_TRY_ENV); - ACE_TRY_CHECK_EX (bind); - } - ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) + char vdev_name [BUFSIZ]; + ACE_OS::sprintf (vdev_name, + "%s:%s:%d", + "VDev", + this->host_, + this->pid_); + + ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name)); + // create the name + this->vdev_name_.length (1); + this->vdev_name_ [0].id = CORBA::string_dup (vdev_name); + + // make the media controller a property of the vdev + CORBA::Any media_ctrl_property; + media_ctrl_property <<= this->orb_manager_.orb ()->object_to_string (this->media_ctrl_->_this (env), + env); + this->vdev_->define_property ("Related_MediaCtrl", + media_ctrl_property, + env); + TAO_CHECK_ENV_RETURN (env,-1); + + // Register the vdev with the naming server. + this->naming_context_->bind (this->vdev_name_, + this->vdev_->_this (env), + env); + + // If the object was already there, replace the older reference + // with this one + if (env.exception () != 0) { - // If the object was already there, replace the older reference - // with this one + env.clear (); this->naming_context_->rebind (this->vdev_name_, - vdev_obj, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev"); - return -1; + this->vdev_->_this (env), + env); + TAO_CHECK_ENV_RETURN (env, -1); } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + return 0; } @@ -520,18 +435,17 @@ int TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_Value *tv) { int result; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { - result = this->orb_manager_.run (ACE_TRY_ENV,tv); - ACE_TRY_CHECK; + result = this->orb_manager_.run (TAO_TRY_ENV,tv); + TAO_CHECK_ENV; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_TRY_ENV.print_exception ("orb_manager_.run ()"); + TAO_TRY_ENV.print_exception ("orb_manager_.run ()"); return -1; } - ACE_ENDTRY; + TAO_ENDTRY; return result; } @@ -543,7 +457,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho char sem_str [BUFSIZ]; sprintf (sem_str, - "%s:%s:%ld", + "%s:%s:%d", "TAO_AV_Process_Semaphore", this->host_, this->pid_); @@ -570,39 +484,26 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho // register the stream_endpoint with the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) -{ - CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil (); - ACE_TRY - { - stream_endpoint_obj = this->stream_endpoint_->_this (ACE_TRY_ENV); - ACE_TRY_CHECK; - this->stream_endpoint_->_remove_ref (ACE_TRY_ENV); - ACE_TRY_CHECK; - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); - // Create a name for the video control object - // subclasses can define their own name for the streamendpoint - // Register the stream endpoint object with the naming server. - this->naming_context_->bind (this->stream_endpoint_name_, - stream_endpoint_obj, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (CORBA::Environment &env) +{ + // ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); + // Create a name for the video control object + // subclasses can define their own name for the streamendpoint + // Register the stream endpoint object with the naming server. + this->naming_context_->bind (this->stream_endpoint_name_, + this->stream_endpoint_->_this (env), + env); + + // if the name was already there, replace the reference with the new one + if (env.exception () != 0) { - // if the name was already there, replace the reference with the new one + env.clear (); this->naming_context_->rebind (this->stream_endpoint_name_, - stream_endpoint_obj, - ACE_TRY_ENV); - ACE_TRY_CHECK; + this->stream_endpoint_->_this (env), + env); + TAO_CHECK_ENV_RETURN (env, -1); } - ACE_CATCHANY - { - ACE_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate"); - return -1; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); + return 0; } @@ -646,27 +547,26 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_mediactrl (T_M // For now, we dont delete the objects, since they exist for the // lifetime of the process anyway template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> -TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process () +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process () { // Remove the names from the naming service if (CORBA::is_nil (this->naming_context_.in ()) == 0) return; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { this->naming_context_->unbind (this->stream_endpoint_name_, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; this->naming_context_->unbind (this->vdev_name_, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_TRY_ENV.print_exception ("TAO_Endpoint_Process_Strategy::activate"); + TAO_TRY_ENV.print_exception ("TAO_Endpoint_Process_Strategy::activate"); } - ACE_ENDTRY; + TAO_ENDTRY; // if (this->stream_endpoint_ != 0) // delete this->stream_endpoint_; @@ -683,7 +583,7 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Proce // Define the name of the stream_endpoint, as used to register with // the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> -TAO_AV_Child_Process_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_A () +TAO_AV_Child_Process_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_A () { char stream_endpoint_name[BUFSIZ]; ACE_OS::sprintf (stream_endpoint_name, @@ -709,7 +609,7 @@ TAO_AV_Child_Process_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_P // Define the name of the stream_endpoint, as used to register with // the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> -TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_B () +TAO_AV_Child_Process_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_B () { char stream_endpoint_name[BUFSIZ]; ACE_OS::sprintf (stream_endpoint_name, @@ -724,7 +624,7 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc } template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> -TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process_B () +TAO_AV_Child_Process_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process_B () { } |