diff options
6 files changed, 49 insertions, 16 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 05c9df98c7e..7392ba0d033 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,21 @@ +Sat Nov 02 18:10:44 2002 Pradeep Gore <pradeep@oomworks.com> + + * orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp: + Inserted missing , in constructor. + + * orbscvs/orbsvcs/Notify/Notify_Service.cpp: + Removed ACE_DEFAULT_THREAD_PRIORITY to threadpool task. Thanks + to Bala for suggesting a fix. + + * orbscvs/orbsvcs/Notify/Thread_Pool_Task.cpp: + Modified call to <activate> to use ACE_DEFAULT_THREAD_PRIORITY. + + * orbsvcs\Logging_Service\Notify_Logging_Service\Notify_Logging_Service.cpp: + Changed code to obtain the notify service. + + * orbsvcs\Logging_Service\Notify_Logging_Service\svc.conf: + Modified the .conf file to use the revised Notify Service directive. + Sat Nov 2 10:48:46 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tao/Utils/Servant_Var.h: @@ -30,9 +48,12 @@ Fri Nov 01 20:09:44 2002 Pradeep Gore <pradeep@oomworks.com> In method <run_test> removed duplicate call to Sequence Consumer. * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: - Changed code to obtain the notify service for colocation. + * orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp: + Changed the default values used when the test is run without any + parameters. + * orbsvcs/tests/Notify/Blocking/notify.conf: * orbsvcs/tests/Notify/Discarding/notify.conf: * orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf: diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index f5c11d7cda3..183fa36e9da 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -1,9 +1,11 @@ #include "Notify_Logging_Service.h" -#include "tao/debug.h" -#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h" -#include "tao/IORTable/IORTable.h" + +#include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "tao/debug.h" +#include "tao/IORTable/IORTable.h" +#include "orbsvcs/Notify/Service.h" ACE_RCSID (Notify_Logging_Service, Notify_Logging_Service, @@ -74,21 +76,28 @@ Notify_Logging_Service::init (int argc, char *argv[] ACE_DEBUG ((LM_DEBUG, "\nStarting up the Notification Logging Service...\n")); + TAO_NS_Service* notify_service = ACE_Dynamic_Service<TAO_NS_Service>::instance (TAO_NS_COS_NOTIFICATION_SERVICE_NAME); + + if (notify_service == 0) + { + ACE_DEBUG ((LM_DEBUG, "Notify Service not found! check conf. file\n")); + return -1; + } + // Activate the factory this->notify_factory_ = - TAO_Notify_EventChannelFactory_i::create (this->poa_.in () - ACE_ENV_ARG_PARAMETER); + notify_service->create (this->poa_.in () + ACE_ENV_ARG_PARAMETER); ACE_NEW_THROW_EX (this->notify_log_factory_, NotifyLogFactory_i (this->notify_factory_.in ()), CORBA::NO_MEMORY ()); - - DsNotifyLogAdmin::NotifyLogFactory_var obj = + + DsNotifyLogAdmin::NotifyLogFactory_var obj = notify_log_factory_->activate (this->poa_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - // Register the Factory ACE_ASSERT (!CORBA::is_nil (this->naming_.in ())); @@ -181,4 +190,3 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) /*****************************************************************/ - diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf index 4e5403f39ac..509c0ee230f 100755 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf @@ -1 +1,5 @@ -static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1" +##$Id$ + +## Load the static Cos Notification Service +static TAO_NS_CosNotification_Service "-DispatchingThreads 1" + diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Service.cpp index 034c45981d0..9a0b2c686e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Service.cpp @@ -59,8 +59,8 @@ TAO_NS_Notify_Service::init (int argc, char *argv[]) if (dispatching_threads > 0) { - NotifyExt::ThreadPoolParams tp_params = - {0, (unsigned)dispatching_threads, 0, ACE_DEFAULT_THREAD_PRIORITY, 0, 0, 0 }; + NotifyExt::ThreadPoolParams tp_params = + {0, (unsigned)dispatching_threads, 0, 0, 0, 0, 0 }; CosNotification::QoSProperties ec_qos; ec_qos.length (1); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index fc4a5bd9cb3..9b605767204 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -29,7 +29,7 @@ TAO_NS_ThreadPool_Task::init (int argc, char **argv) return this->ACE_Task<ACE_SYNCH>::init (argc, argv); } -void +void TAO_NS_ThreadPool_Task::init (TAO_NS_AdminProperties& admin_properties) { TAO_NS_Worker_Task::init (admin_properties); @@ -48,7 +48,7 @@ TAO_NS_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_ if (this->ACE_Task <ACE_SYNCH>::activate (flags, tp_params.static_threads, 0, - tp_params.default_priority) == -1) + ACE_DEFAULT_THREAD_PRIORITY) == -1) { if (TAO_debug_level > 0) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp index eba4b666468..692db5da607 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp @@ -11,7 +11,7 @@ AdminProperties_Test::AdminProperties_Test (void) max_consumers_ (5), max_suppliers_ (5), reject_new_events_ (0), - consumers_ (3) + consumers_ (3), suppliers_ (3), event_count_ (30) { |