ChangeLogTag: Tue Nov 19 15:16:56 2002 Pradeep Gore <pradeep@oomworks.com>

9 files changed, 36 insertions, 26 deletions

diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.dsp b/TAO/orbsvcs/Notify_Service/Notify_Service.dsp
index 40c2af89151..f99617c0798 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.dsp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

+# PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 817c22d2f5f..d2c836538e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -4,6 +4,8 @@
 
 #include "Service.h"
 #include "ace/Dynamic_Service.h"
+#include "tao/PortableServer/POA.h"
+#include "tao/ORB_Core.h"
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
 TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL)
@@ -18,6 +20,16 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
     return notify_factory._retn ();
   }
 
+  TAO_POA *poa = default_POA->_tao_poa_downcast();
+
+  if (poa == 0)
+    return notify_factory._retn ();
+
+  CORBA::ORB_ptr orb = poa->orb_core ().orb () ;
+
+  notify_service->init (orb ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (notify_factory._retn ());
+
   notify_factory = notify_service->create (default_POA ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (notify_factory._retn ());
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
index 4872f4ad804..11adf4f3a6d 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -14,12 +14,6 @@ $notifyior = PerlACE::LocalFile ("notify.ior");
 $namingior = PerlACE::LocalFile ("naming.ior");
 $status = 0;
 
-unlink $notifyior;
-unlink $namingior;
-
-$Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
-                                "-o $namingior");
-
 @tests =
   (
    "AdminProperties",
@@ -33,12 +27,25 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
    "Updates",
   );
 
-@test_configs =
+@default_test_configs =
   (
-   "notify.mt.conf",
    "notify.reactive.conf",
+   "notify.mt.conf",
    );
 
+if ($#ARGV == -1)
+  {
+    @test_configs = @default_test_configs;
+  }
+else
+  {
+    @test_configs = @ARGV;
+  }
+
+$Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
+                                "-o $namingior");
+unlink $namingior;
+
 $Naming->Spawn ();
 
 if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) {
@@ -55,6 +62,7 @@ for $config (@test_configs)
                                           "-ORBInitRef NameService=file://$namingior " .
                                           "-IORoutput $notifyior " .
                                           "-ORBSvcConf $config");
+    unlink $notifyior;
     $Notification->Spawn ();
     
     if (PerlACE::waitforfile_timed ($notifyior, $startup_timeout) == -1) {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
index f485b07e570..d378a2c236c 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
@@ -3,7 +3,7 @@
 # Makefile for building the orbsvcs notify Structured_Filter constumer test
 #
 
-NAME = Consumer
+NAME = Structured_Consumer
 
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor
index e56e4be1f1b..2374ec6cb1b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor
@@ -3,7 +3,7 @@
 # Makefile for building the orbsvcs notify Structured_Filter supplier test
 #
 
-NAME = Supplier
+NAME = Structured_Supplier
 
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor
index 08d59c2b6ff..efb72208cc1 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor
@@ -4,7 +4,7 @@
 # test
 #
 
-NAME = Consumer
+NAME = Structured_Consumer
 
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor
index f8a7dc125a4..011ca3400d0 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor
@@ -4,7 +4,7 @@
 # test
 #
 
-NAME = Supplier
+NAME = Structured_Supplier
 
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 06a3ee44548..fd7af8d1cd2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -687,7 +687,6 @@ RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
 //*****************************************************************
 
 Worker::Worker (void)
-  : done_ (0)
 {
 }
 
@@ -700,19 +699,13 @@ Worker::orb (CORBA::ORB_ptr orb)
 void
 Worker::done (void)
 {
-  done_ = 1;
+  this->orb_->shutdown ();
 }
 
 int
 Worker::svc (void)
 {
-  while (!this->done_)
-    {
-      if (this->orb_->work_pending ())
-        {
-          this->orb_->perform_work ();
-        }
-    }
+  this->orb_->run ();
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index c73333c8fd5..a6d83524294 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -52,15 +52,12 @@ public:
   virtual int svc (void);
   // The thread entry point.
 
+  // Shutdown ORB
   void done (void);
-  // Set done flag.
 
 private:
   CORBA::ORB_var orb_;
   // The orb
-
-  CORBA::Boolean done_;
-  // Flag to tell that we're done servicing.
 };
 
 class RedGreen_Test