diff options
Diffstat (limited to 'TAO')
29 files changed, 396 insertions, 167 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 4b11cb43479..4d4a9932373 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,37 @@ +Sun Jun 13 21:46:25 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tests/NestedUpcall/Triangle_Test/run_test.pl: + * tests/NestedUpcall/MT_Client_Test/run_test.pl: + More scripts changed to use timeouts. + + * tests/MT_Client/test.idl: + * tests/MT_Client/test_i.cpp: + * tests/MT_Client/test_i.h: + * tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp: + * tests/NestedUpcall/MT_Client_Test/MT_Object_i.h: + * tests/NestedUpcall/Reactor/Reactor.idl: + * tests/NestedUpcall/Reactor/eh_i.cpp: + * tests/NestedUpcall/Reactor/eh_i.h: + * tests/NestedUpcall/Reactor/reactor_i.cpp: + * tests/NestedUpcall/Reactor/reactor_i.h: + * tests/NestedUpcall/Triangle_Test/Initiator_i.cpp: + * tests/NestedUpcall/Triangle_Test/Initiator_i.h: + * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp: + * tests/NestedUpcall/Triangle_Test/Object_A_i.h: + * tests/NestedUpcall/Triangle_Test/Object_B_i.cpp: + * tests/NestedUpcall/Triangle_Test/Object_B_i.h: + * tests/Param_Test/param_test_i.cpp: + * tests/Param_Test/param_test_i.h: + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h: + * performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h: + * orbsvcs/Event_Service/Event_Service.cpp: + * orbsvcs/Event_Service/Event_Service.h: + * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer.h: + More throw specs added + Sun Jun 13 16:18:31 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * docs/releasenotes/orbcore.html: diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index 93118609611..1c6c3a6b62d 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -300,18 +300,21 @@ Event_Service::parse_args (int argc, char *argv []) RtecEventChannelAdmin::ConsumerAdmin_ptr Event_Service::for_consumers (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->ec_impl_->for_consumers (ACE_TRY_ENV); } RtecEventChannelAdmin::SupplierAdmin_ptr Event_Service::for_suppliers (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->ec_impl_->for_suppliers (ACE_TRY_ENV); } void Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->ec_impl_->destroy (ACE_TRY_ENV); ACE_CHECK; @@ -321,6 +324,10 @@ Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV) RtecEventChannelAdmin::Observer_Handle Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, + RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { return this->ec_impl_->append_observer (observer, ACE_TRY_ENV); } @@ -328,6 +335,10 @@ Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer, void Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, + RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { this->ec_impl_->remove_observer (handle, ACE_TRY_ENV); } diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h index b88ac45abe7..89de50f53be 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.h +++ b/TAO/orbsvcs/Event_Service/Event_Service.h @@ -42,15 +42,26 @@ public: // = The RtecEventChannelAdmin::Event_Channel methods virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (CORBA::Environment &); + for_consumers (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (CORBA::Environment &); - virtual void destroy (CORBA::Environment &); + for_suppliers (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC (( + CORBA::SystemException, + RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, + RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC (( + CORBA::SystemException, + RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, + RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); private: int parse_args (int argc, char* argv[]); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 235306bb1ca..d9b3c321ec2 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -122,6 +122,7 @@ Test_Consumer::accumulate (ECT_Driver::Latency_Stats& stats) const void Test_Consumer::push (const RtecEventComm::EventSet& events, CORBA::Environment &TAO_IN_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -180,6 +181,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events, void Test_Consumer::disconnect_push_consumer (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index e66f3185cbc..13b6eb2a249 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -59,8 +59,10 @@ public: // Add our latency statistics to <stats> virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env); - virtual void disconnect_push_consumer (CORBA::Environment &); + CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. private: diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp index 79c0f3dee3c..742d74ccb64 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp @@ -135,6 +135,7 @@ Cubit_Factory_i::~Cubit_Factory_i (void) Cubit_ptr Cubit_Factory_i::make_cubit (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->cubit_registered_ = 1; @@ -156,12 +157,14 @@ Cubit_i::~Cubit_i (void) void Cubit_i::cube_oneway (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START); } void Cubit_i::cube_void (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START); } @@ -171,6 +174,7 @@ Cubit_i::cube_void (CORBA::Environment &) CORBA::Octet Cubit_i::cube_octet (CORBA::Octet o, CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START); @@ -183,6 +187,7 @@ Cubit_i::cube_octet (CORBA::Octet o, CORBA::Short Cubit_i::cube_short (CORBA::Short s, CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START); @@ -195,6 +200,7 @@ Cubit_i::cube_short (CORBA::Short s, CORBA::Long Cubit_i::cube_long (CORBA::Long l, CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START); @@ -207,6 +213,7 @@ Cubit_i::cube_long (CORBA::Long l, Cubit::Many Cubit_i::cube_struct (const Cubit::Many &values, CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START); @@ -225,6 +232,7 @@ Cubit_i::cube_struct (const Cubit::Many &values, Cubit::oneof Cubit_i::cube_union (const Cubit::oneof &values, CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START); @@ -259,6 +267,7 @@ void Cubit_i::cube_long_sequence (const Cubit::long_seq &input, Cubit::long_seq_out output, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START); @@ -285,6 +294,7 @@ void Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input, Cubit::octet_seq_out output, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START); @@ -322,6 +332,7 @@ void Cubit_i::cube_many_sequence (const Cubit::many_seq & input, Cubit::many_seq_out output, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START); @@ -355,6 +366,7 @@ void Cubit_i::cube_rti_data (const Cubit::RtiPacket &input, Cubit::RtiPacket_out output, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START); @@ -384,6 +396,7 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input, // Shutdown. void Cubit_i::shutdown (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h index a1d1b3b2a0d..69e32a4badc 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h @@ -37,53 +37,65 @@ public: ~Cubit_i (void); // Destructor - virtual void cube_oneway (CORBA::Environment &env); + virtual void cube_oneway (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Test a oneway call. - virtual void cube_void (CORBA::Environment &env); + virtual void cube_void (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Test a twoway call. virtual CORBA::Octet cube_octet (CORBA::Octet o, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube an octet virtual CORBA::Short cube_short (CORBA::Short s, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a short virtual CORBA::Long cube_long (CORBA::Long l, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a long virtual Cubit::Many cube_struct (const Cubit::Many &values, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a struct. virtual Cubit::oneof cube_union (const Cubit::oneof &values, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a union. virtual void cube_long_sequence (const Cubit::long_seq &input, Cubit::long_seq_out output, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a sequence. virtual void cube_octet_sequence (const Cubit::octet_seq &input, Cubit::octet_seq_out output, - CORBA::Environment &_env); + CORBA::Environment &_env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube an octet sequence. virtual void cube_many_sequence (const Cubit::many_seq & input, Cubit::many_seq_out output, - CORBA::Environment &_tao_environment); + CORBA::Environment &_tao_environment) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube an Many sequence. virtual void cube_rti_data (const Cubit::RtiPacket &input, Cubit::RtiPacket_out output, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a sequence. - virtual void shutdown (CORBA::Environment &env); + virtual void shutdown (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown routine. protected: @@ -106,7 +118,8 @@ public: ~Cubit_Factory_i (void); // Destructor. - virtual Cubit_ptr make_cubit (CORBA::Environment &env); + virtual Cubit_ptr make_cubit (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Make a cubit object. private: diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp index 818fba8d284..f27c6c029f9 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp @@ -20,6 +20,7 @@ Cubit_i::~Cubit_i (void) CORBA::Octet Cubit_i::cube_octet (CORBA::Octet o, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return (CORBA::Octet) (o * o * o); } @@ -27,6 +28,7 @@ Cubit_i::cube_octet (CORBA::Octet o, CORBA::Short Cubit_i::cube_short (CORBA::Short s, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return (CORBA::Short) (s * s * s); } @@ -34,6 +36,7 @@ Cubit_i::cube_short (CORBA::Short s, CORBA::Long Cubit_i::cube_long (CORBA::Long l, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return (CORBA::Long) (l * l * l); } @@ -41,6 +44,7 @@ Cubit_i::cube_long (CORBA::Long l, Cubit::Many Cubit_i::cube_struct (const Cubit::Many &values, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Cubit::Many out_values; @@ -53,11 +57,13 @@ Cubit_i::cube_struct (const Cubit::Many &values, void Cubit_i::noop (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // does nothing. } void Cubit_i::shutdown (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%t) Calling orb ()->shutdown ()\n")); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h index 6ca11a8254f..1c8f2cad34d 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h @@ -30,20 +30,26 @@ public: ~Cubit_i (void); virtual CORBA::Octet cube_octet (CORBA::Octet o, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Short cube_short (CORBA::Short s, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Long cube_long (CORBA::Long l, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Cubit::Many cube_struct (const Cubit::Many &values, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void noop (CORBA::Environment &env); + virtual void noop (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &env); + virtual void shutdown (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &ACE_TRY_ENV); diff --git a/TAO/tests/MT_Client/test.idl b/TAO/tests/MT_Client/test.idl index 3b80a16e3c6..821dce7a628 100644 --- a/TAO/tests/MT_Client/test.idl +++ b/TAO/tests/MT_Client/test.idl @@ -8,5 +8,5 @@ interface Simple_Server long get_number (); - void shutdown (); + oneway void shutdown (); }; diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp index 90782ea5deb..6076a25954a 100644 --- a/TAO/tests/MT_Client/test_i.cpp +++ b/TAO/tests/MT_Client/test_i.cpp @@ -11,6 +11,7 @@ ACE_RCSID(MT_Client, test_i, "$Id$") void Simple_Server_i::test_method (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -19,6 +20,7 @@ Simple_Server_i::test_method (CORBA::Environment&) CORBA::Long Simple_Server_i::get_number (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -28,6 +30,7 @@ Simple_Server_i::get_number (CORBA::Environment&) void Simple_Server_i::shutdown (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h index 1507ff1a10b..337f9705e07 100644 --- a/TAO/tests/MT_Client/test_i.h +++ b/TAO/tests/MT_Client/test_i.h @@ -31,11 +31,14 @@ public: // ctor // = The Simple_Server methods. - void test_method (CORBA::Environment&); + void test_method (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long get_number (CORBA::Environment&); + CORBA::Long get_number (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&); + void shutdown (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp index 3a9c39cc188..abd189164d2 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -39,6 +39,7 @@ CORBA::Long MT_Object_i::yadda (CORBA::Long hop_count, MT_Object_ptr partner, CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) MT_Object_i::yadda () hop count = %d\n", diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h index d9b643a66ef..2421abb2dea 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -37,7 +37,8 @@ public: virtual CORBA::Long yadda (CORBA::Long hop_count, MT_Object_ptr partner, - CORBA::Environment &_tao_environment); + CORBA::Environment &_tao_environment) + ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl index 77ec0121e15..4b3ca7cc204 100755 --- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl @@ -19,21 +19,49 @@ unlink $ior2file; $SV1 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, " -o $ior1file "); +if (ACE::waitforfile_timed ($ior1file, 5) == -1) { + print STDERR "ERROR: cannot find file <$ior1file>\n"; + $SV1->Kill (); $SV1->TimedWait (1); + exit 1; +} + $SV2 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, " -o $ior2file "); -ACE::waitforfile ($ior1file); -ACE::waitforfile ($ior2file); +if (ACE::waitforfile_timed ($ior2file, 5) == -1) { + print STDERR "ERROR: cannot find file <$ior1file>\n"; + $SV2->Kill (); $SV2->TimedWait (1); + exit 1; +} + +$CL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT, + " -f $ior1file -g $ior2file -n 2 -i 10 -s 5"); -$status = system ($EXEPREFIX."client".$Process::EXE_EXT. - " -f $ior1file -g $ior2file -n 2 -i 10 -s 5"); +$client = $CL->TimedWait (60); +if ($client == -1) { + print STDERR "ERROR: client timedout\n"; + $CL->Kill (); $CL->TimedWait (1); +} -$SV1->Kill (); $SV1->Wait (); -$SV2->Kill (); $SV2->Wait (); +$SV1->Terminate (); $server1 = $SV1->TimedWait (5); +if ($server1 == -1) { + print STDERR "ERROR: cannot terminate server1\n"; + $SV1->Kill (); $SV1->TimedWait (1); + $SV2->Kill (); $SV2->TimedWait (1); +} -#clean up +$SV2->Terminate (); $server1 = $SV2->TimedWait (5); +if ($server2 == -1) { + print STDERR "ERROR: cannot terminate server2\n"; + $SV2->Kill (); $SV2->TimedWait (1); +} + +# Clean up unlink $ior1file; unlink $ior2file; -# @@ Capture any errors from the server too. -exit $status; +if ($client == -1 || $server1 == -1 || $server2 == -1) { + exit 1; +} + +exit 0; diff --git a/TAO/tests/NestedUpcall/Reactor/Reactor.idl b/TAO/tests/NestedUpcall/Reactor/Reactor.idl index ae70a317d8b..0ed94064d08 100644 --- a/TAO/tests/NestedUpcall/Reactor/Reactor.idl +++ b/TAO/tests/NestedUpcall/Reactor/Reactor.idl @@ -46,7 +46,7 @@ interface Reactor // Decrements <num> by invoking the <decrement> operation on <eh> // and returning that value, finally stopping when it gets to zero. - void stop (); + oneway void stop (); // Stops the reactor. }; diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp index edc59e21080..809325eb7d1 100644 --- a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp +++ b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp @@ -18,6 +18,7 @@ EventHandler_i::~EventHandler_i (void) // Return a long CORBA::Long EventHandler_i::peer (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Doesn't matter what value we return! CORBA::Long val = 6; @@ -31,8 +32,9 @@ EventHandler_i::peer (CORBA::Environment &) CORBA::UShort EventHandler_i::decrement (Reactor_ptr eh, - CORBA::UShort num, - CORBA::Environment &env) + CORBA::UShort num, + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) EventHandler::decrement (%d)%$", num)); diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h index c3b0a729696..b73247c9135 100644 --- a/TAO/tests/NestedUpcall/Reactor/eh_i.h +++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h @@ -17,13 +17,15 @@ public: virtual ~EventHandler_i (void); // Destructor. - virtual CORBA::Long peer (CORBA::Environment &env); + virtual CORBA::Long peer (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return some value...doesn't matter what. virtual CORBA::UShort decrement (Reactor_ptr eh, CORBA::UShort num, - CORBA::Environment &env); - // deccrement <num> by calling decrement thru <eh> until zero is + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); + // decrement <num> by calling decrement thru <eh> until zero is // reached, then return. }; diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp index fd1e86f26a1..94bf5b09d5b 100644 --- a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp +++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp @@ -19,6 +19,7 @@ Reactor_i::~Reactor_i (void) CORBA::Long Reactor_i::register_handler (EventHandler_ptr eh, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Reactor_i::register_handler ()\n")); @@ -47,6 +48,7 @@ Reactor_i::register_handler (EventHandler_ptr eh, void Reactor_i::set_value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) doing Reactor_i::set_value()\n")); @@ -56,6 +58,7 @@ CORBA::UShort Reactor_i::decrement (EventHandler_ptr eh, CORBA::UShort num, CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) Reactor::decrement (%d)%$", num)); @@ -74,7 +77,9 @@ Reactor_i::decrement (EventHandler_ptr eh, void Reactor_i::stop (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { + // @@ TODO Keep an ORB pointer around... ACE_DEBUG ((LM_DEBUG, "(%P|%t) stopping.\n")); TAO_ORB_Core_instance ()->orb ()->shutdown (); } diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h index bc7b11c391a..97e6759cf3c 100644 --- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h +++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h @@ -18,18 +18,22 @@ public: // Destructor. virtual CORBA::Long register_handler(EventHandler_ptr eh, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Register (with nothing...it's an example!) - virtual void set_value (CORBA::Environment &env); + virtual void set_value (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::UShort decrement (EventHandler_ptr eh, CORBA::UShort num, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // deccrement <num> by calling decrement thru <eh> until zero is // reached, then return. - virtual void stop (CORBA::Environment &env); + virtual void stop (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // Stops the reactor. }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index 013bb060b3f..3b3d4502647 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -35,10 +35,9 @@ Initiator_i::~Initiator_i (void) { } - - void Initiator_i::foo_object_B (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index 197b491070f..cd7cace945f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -35,7 +35,8 @@ public: virtual ~Initiator_i (void); // Destructor. - virtual void foo_object_B (CORBA::Environment &env); + virtual void foo_object_B (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); private: Object_A_var object_A_var_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 8328093e02a..7cd0173625f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -24,7 +24,7 @@ ACE_RCSID(Triangle_Test, Object_A_i, "$Id$") // CTOR Object_A_i::Object_A_i (void) -: finish_two_way_call_ (0) + : finish_two_way_call_ (0) { } @@ -38,6 +38,7 @@ Object_A_i::~Object_A_i (void) void Object_A_i::foo (Initiator_ptr initiator_ptr, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_A_i::foo ()\n")); @@ -62,6 +63,7 @@ Object_A_i::foo (Initiator_ptr initiator_ptr, void Object_A_i::finish (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_A_i::finish ()\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index 3f41df62c63..31695b5c779 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -35,9 +35,11 @@ public: // Destructor. virtual void foo (Initiator_ptr initiator_ptr, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void finish (CORBA::Environment &env); + virtual void finish (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); unsigned long finish_two_way_call_; }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 7405b816092..6384013e7c6 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -36,7 +36,8 @@ Object_B_i::~Object_B_i (void) void Object_B_i::foo (Object_A_ptr object_A_ptr, - CORBA::Environment &) + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_B_i::foo ()\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h index 01366ff476e..6cb4bc173a9 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -35,7 +35,8 @@ public: // Destructor. virtual void foo(Object_A_ptr object_A_ptr, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); }; #endif /* OBJECT_B_IMPL_H */ diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl index 424638f1951..77cb5613288 100755 --- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl @@ -19,21 +19,48 @@ unlink $ior2file; $SV1 = Process::Create ($EXEPREFIX."server_A".$Process::EXE_EXT, "-o $ior1file"); +if (ACE::waitforfile_timed ($ior1file, 5) == -1) { + print STDERR "ERROR: cannot find file <$ior1file>\n"; + $SV1->Kill (); $SV1->TimedWait (1); + exit 1; +} + $SV2 = Process::Create ($EXEPREFIX."server_B".$Process::EXE_EXT, "-o $ior2file"); -ACE::waitforfile ($ior1file); -ACE::waitforfile ($ior2file); +if (ACE::waitforfile_timed ($ior2file, 5) == -1) { + print STDERR "ERROR: cannot find file <$ior1file>\n"; + $SV2->Kill (); $SV2->TimedWait (1); + exit 1; +} + +$CL = Process::Create ($EXEPREFIX."initiator".$Process::EXE_EXT, + " -f $ior1file -g $ior2file"); -$status = system ($EXEPREFIX."initiator".$Process::EXE_EXT. - " -f $ior1file -g $ior2file"); +$client = $CL->TimedWait (60); +if ($client == -1) { + print STDERR "ERROR: client timedout\n"; + $CL->Kill (); $CL->TimedWait (1); +} -$SV1->Kill (); $SV1->Wait (); -$SV2->Kill (); $SV2->Wait (); +$SV1->Terminate (); $server1 = $SV1->TimedWait (5); +if ($server1 == -1) { + print STDERR "ERROR: cannot terminate server1\n"; + $SV1->Kill (); $SV1->TimedWait (1); +} + +$SV2->Terminate (); $server1 = $SV2->TimedWait (5); +if ($server2 == -1) { + print STDERR "ERROR: cannot terminate server2\n"; + $SV2->Kill (); $SV2->TimedWait (1); +} # Clean up unlink $ior1file; unlink $ior2file; -# @@ Capture any errors from the server too. -exit $status; +if ($client == -1 || $server1 == -1 || $server2 == -1) { + exit 1; +} + +exit 0; diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 42b1289a9e4..41809a4ee50 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -35,6 +35,7 @@ Coffee_i::~Coffee_i (void) // get attribute Coffee::Desc * Coffee_i::description (CORBA::Environment & /*env*/) + ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee::Desc *desc = new Coffee::Desc; desc->name = CORBA::string_dup (this->name_); @@ -45,6 +46,7 @@ Coffee_i::description (CORBA::Environment & /*env*/) void Coffee_i::description (const Coffee::Desc &description, CORBA::Environment & /*env*/) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (description.name); } @@ -73,6 +75,7 @@ Param_Test_i::test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1 * 2; s3 = s1 * 3; @@ -85,6 +88,7 @@ Param_Test_i::test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, CORBA::ULongLong_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1 * 2; s3 = s1 * 3; @@ -99,6 +103,7 @@ Param_Test_i::test_unbounded_string (const char *s1, char *&s2, CORBA::String_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); s3 = CORBA::string_dup (s1); @@ -117,6 +122,7 @@ Param_Test_i::test_bounded_string (const char *s1, char *&s2, CORBA::String_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); s3 = CORBA::string_dup (s1); @@ -133,6 +139,7 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, Param_Test::Fixed_Struct_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1; s3 = s1; @@ -141,12 +148,12 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, // = Sequences -Param_Test::Long_Seq * Param_Test_i::test_long_sequence ( - const Param_Test::Long_Seq & s1, - Param_Test::Long_Seq & s2, - Param_Test::Long_Seq_out s3, - CORBA::Environment & - ) +Param_Test::Long_Seq * +Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1, + Param_Test::Long_Seq & s2, + Param_Test::Long_Seq_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Long_Seq *ret = new Param_Test::Long_Seq, @@ -159,12 +166,12 @@ Param_Test::Long_Seq * Param_Test_i::test_long_sequence ( return ret; } -Param_Test::Short_Seq * Param_Test_i::test_short_sequence ( - const Param_Test::Short_Seq & s1, - Param_Test::Short_Seq & s2, - Param_Test::Short_Seq_out s3, - CORBA::Environment & - ) +Param_Test::Short_Seq * +Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1, + Param_Test::Short_Seq & s2, + Param_Test::Short_Seq_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Short_Seq *ret = new Param_Test::Short_Seq, @@ -177,12 +184,12 @@ Param_Test::Short_Seq * Param_Test_i::test_short_sequence ( return ret; } -Param_Test::Bounded_Short_Seq * Param_Test_i::test_bounded_short_sequence ( - const Param_Test::Bounded_Short_Seq & s1, - Param_Test::Bounded_Short_Seq & s2, - Param_Test::Bounded_Short_Seq_out s3, - CORBA::Environment & - ) +Param_Test::Bounded_Short_Seq * +Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1, + Param_Test::Bounded_Short_Seq & s2, + Param_Test::Bounded_Short_Seq_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Short_Seq *ret = new Param_Test::Bounded_Short_Seq, @@ -195,12 +202,12 @@ Param_Test::Bounded_Short_Seq * Param_Test_i::test_bounded_short_sequence ( return ret; } -Param_Test::Bounded_Long_Seq * Param_Test_i::test_bounded_long_sequence ( - const Param_Test::Bounded_Long_Seq & s1, - Param_Test::Bounded_Long_Seq & s2, - Param_Test::Bounded_Long_Seq_out s3, - CORBA::Environment & - ) +Param_Test::Bounded_Long_Seq * +Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1, + Param_Test::Bounded_Long_Seq & s2, + Param_Test::Bounded_Long_Seq_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Long_Seq *ret = new Param_Test::Bounded_Long_Seq, @@ -218,6 +225,7 @@ Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, Param_Test::StrSeq &s2, Param_Test::StrSeq_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -248,12 +256,12 @@ Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, return ret; } -Param_Test::Bounded_StrSeq * Param_Test_i::test_bounded_strseq ( - const Param_Test::Bounded_StrSeq & s1, - Param_Test::Bounded_StrSeq & s2, - Param_Test::Bounded_StrSeq_out s3, - CORBA::Environment & - ) +Param_Test::Bounded_StrSeq * +Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1, + Param_Test::Bounded_StrSeq & s2, + Param_Test::Bounded_StrSeq_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -275,6 +283,7 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::StructSeq &s2, Param_Test::StructSeq_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -291,12 +300,12 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, return ret; } -Param_Test::Bounded_StructSeq * Param_Test_i::test_bounded_struct_sequence ( - const Param_Test::Bounded_StructSeq & s1, - Param_Test::Bounded_StructSeq & s2, - Param_Test::Bounded_StructSeq_out s3, - CORBA::Environment & - ) +Param_Test::Bounded_StructSeq * +Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1, + Param_Test::Bounded_StructSeq & s2, + Param_Test::Bounded_StructSeq_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_StructSeq *ret = new Param_Test::Bounded_StructSeq, @@ -310,12 +319,12 @@ Param_Test::Bounded_StructSeq * Param_Test_i::test_bounded_struct_sequence ( } -Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence ( - const Param_Test::PathSpec & s1, - Param_Test::PathSpec & s2, - Param_Test::PathSpec_out s3, - CORBA::Environment & - ) +Param_Test::PathSpec * +Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, + Param_Test::PathSpec & s2, + Param_Test::PathSpec_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::PathSpec *ret = new Param_Test::PathSpec, @@ -342,12 +351,12 @@ Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence ( } -Param_Test::Coffee_Mix * Param_Test_i::test_coffe_mix ( - const Param_Test::Coffee_Mix & s1, - Param_Test::Coffee_Mix & s2, - Param_Test::Coffee_Mix_out s3, - CORBA::Environment & - ) +Param_Test::Coffee_Mix * +Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1, + Param_Test::Coffee_Mix & s2, + Param_Test::Coffee_Mix_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Coffee_Mix *ret = new Param_Test::Coffee_Mix, @@ -385,12 +394,12 @@ Param_Test::Coffee_Mix * Param_Test_i::test_coffe_mix ( return ret; } -Param_Test::Bounded_Coffee_Mix * Param_Test_i::test_bounded_coffe_mix ( - const Param_Test::Bounded_Coffee_Mix & s1, - Param_Test::Bounded_Coffee_Mix & s2, - Param_Test::Bounded_Coffee_Mix_out s3, - CORBA::Environment & - ) +Param_Test::Bounded_Coffee_Mix * +Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1, + Param_Test::Bounded_Coffee_Mix & s2, + Param_Test::Bounded_Coffee_Mix_out s3, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Coffee_Mix *ret = new Param_Test::Bounded_Coffee_Mix, @@ -433,6 +442,7 @@ Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1, Param_Test::AnySeq &s2, Param_Test::AnySeq_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -456,6 +466,7 @@ Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, Param_Test::Var_Struct_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -477,6 +488,7 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, Param_Test::Nested_Struct_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -498,6 +510,7 @@ Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1, Param_Test::Recursive_Struct &s2, Param_Test::Recursive_Struct_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" structs into all the inout, out and return sequences. @@ -518,6 +531,7 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, Param_Test::Objref_Struct_out s3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -536,6 +550,7 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, // make a Coffee object Coffee_ptr Param_Test_i::make_coffee (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->obj_._this (ACE_TRY_ENV); } @@ -546,6 +561,7 @@ Param_Test_i::test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee_ptr ret = Coffee::_nil (); @@ -590,6 +606,7 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &t2, CORBA::TypeCode_out t3, CORBA::Environment &/*env*/) + ACE_THROW_SPEC ((CORBA::SystemException)) { // we simply assign t1 to the others CORBA::TypeCode_ptr retval = CORBA::TypeCode::_duplicate (t1); @@ -604,6 +621,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any *ret; CORBA::Short short_in; @@ -743,6 +761,7 @@ Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, Param_Test::Fixed_Array_out a3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Fixed_Array_slice *ret; @@ -758,6 +777,7 @@ Param_Test_i::test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, Param_Test::Var_Array_out a3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Var_Array_slice *ret; @@ -772,6 +792,8 @@ Param_Test_i::test_exception (CORBA::ULong s1, CORBA::ULong& s2, CORBA::ULong_out s3, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + Param_Test::Ooops)) { int d = this->test_exception_count_ % 3; this->test_exception_count_++; @@ -791,6 +813,7 @@ Param_Test_i::test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, Param_Test::Big_Union_out u3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1)); u2 = u1; @@ -803,6 +826,7 @@ Param_Test_i::test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var ret (new CORBA::Any (a1)); a2 = a1; @@ -816,6 +840,7 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, Param_Test::Multdim_Array a2, Param_Test::Multdim_Array_out a3, CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Multdim_Array_slice *ret; @@ -829,6 +854,7 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, void Param_Test_i::shutdown (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index ee7ff1582b4..ce378a917b6 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -31,11 +31,13 @@ public: // =methods for the attribute - virtual Coffee::Desc * description (CORBA::Environment &env); + virtual Coffee::Desc * description (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // get attribute virtual void description (const Coffee::Desc &description, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // set attribute private: @@ -61,32 +63,37 @@ public: virtual CORBA::Short test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for shorts virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, CORBA::ULongLong_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for unsigned long long virtual char *test_unbounded_string (const char *s1, char *&s2, CORBA::String_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for unbounded strings virtual char *test_bounded_string (const char *s1, char *&s2, CORBA::String_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for bounded strings virtual Param_Test::Fixed_Struct test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, Param_Test::Fixed_Struct_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed structures // = Start of sequences tests... @@ -94,158 +101,172 @@ public: const Param_Test::Long_Seq & s1, Param_Test::Long_Seq & s2, Param_Test::Long_Seq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence ( const Param_Test::Bounded_Long_Seq & s1, Param_Test::Bounded_Long_Seq & s2, Param_Test::Bounded_Long_Seq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Short_Seq * test_short_sequence ( - const Param_Test::Short_Seq & s1, + const Param_Test::Short_Seq & s1, Param_Test::Short_Seq & s2, Param_Test::Short_Seq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence ( const Param_Test::Bounded_Short_Seq & s1, Param_Test::Bounded_Short_Seq & s2, Param_Test::Bounded_Short_Seq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::StrSeq * test_strseq ( const Param_Test::StrSeq & s1, Param_Test::StrSeq & s2, Param_Test::StrSeq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_StrSeq * test_bounded_strseq ( const Param_Test::Bounded_StrSeq & s1, Param_Test::Bounded_StrSeq & s2, Param_Test::Bounded_StrSeq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::StructSeq * test_struct_sequence ( const Param_Test::StructSeq & s1, Param_Test::StructSeq & s2, Param_Test::StructSeq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::PathSpec * test_unbounded_struct_sequence ( const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, Param_Test::PathSpec_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence ( const Param_Test::Bounded_StructSeq & s1, Param_Test::Bounded_StructSeq & s2, Param_Test::Bounded_StructSeq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Coffee_Mix * test_coffe_mix ( const Param_Test::Coffee_Mix & s1, Param_Test::Coffee_Mix & s2, Param_Test::Coffee_Mix_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix ( const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix & s2, Param_Test::Bounded_Coffee_Mix_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::AnySeq * test_anyseq ( const Param_Test::AnySeq & s1, Param_Test::AnySeq & s2, Param_Test::AnySeq_out s3, - CORBA::Environment &env - ); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // = End of sequences tests.... virtual Param_Test::Var_Struct * test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, Param_Test::Var_Struct_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for variable structs virtual Param_Test::Nested_Struct * test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, Param_Test::Nested_Struct_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for nested structs virtual Param_Test::Recursive_Struct * test_recursive_struct (const Param_Test::Recursive_Struct &rs1, Param_Test::Recursive_Struct &rs2, Param_Test::Recursive_Struct_out rs3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for recursive structs virtual Param_Test::Objref_Struct * test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, Param_Test::Objref_Struct_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Coffee_ptr - make_coffee (CORBA::Environment &env); + make_coffee (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // make a coffee object virtual Coffee_ptr test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for object references virtual CORBA::TypeCode_ptr test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &o2, CORBA::TypeCode_out o3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for typecodes virtual CORBA::Any * test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for Anys virtual Param_Test::Fixed_Array_slice * test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, Param_Test::Fixed_Array_out a3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for fixed size arrays virtual Param_Test::Var_Array_slice * test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, Param_Test::Var_Array_out a3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); // test for arrays of variable types virtual CORBA::ULong test_exception (CORBA::ULong s1, CORBA::ULong& s2, CORBA::ULong_out s3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException, + Param_Test::Ooops)); virtual Param_Test::Big_Union* test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, Param_Test::Big_Union_out u3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any* test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3, - CORBA::Environment &env); + CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); # if 0 // Test for multi dimensional arrays @@ -253,10 +274,12 @@ public: test_multdim_array (const Param_Test::Multdim_Array, Param_Test::Multdim_Array , Param_Test::Multdim_Array_out , - CORBA::Environment &); + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); #endif - void shutdown (CORBA::Environment &env); + void shutdown (CORBA::Environment &env) + ACE_THROW_SPEC ((CORBA::SystemException)); private: |