printf STOP now, so you know when you've got a good segfault; updated Reactor_Task reactor to use Dispatch_Deferrer's singleton

4 files changed, 24 insertions, 17 deletions

diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Consumer_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Consumer_EC.cpp
index fdc2c23c8f9..a41603f7160 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Consumer_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Consumer_EC.cpp
@@ -32,7 +32,7 @@ namespace
   ACE_CString sched_type ="rms";
   FILE * ior_output_file;
 }
-
+/*
 class Once_Handler: public Service_Handler
 {
 public:
@@ -106,7 +106,7 @@ private:
   long timer_handle_;
 
 };
-
+*/
 class Consumer_EC : public Kokyu_EC
 {
 public:
@@ -261,7 +261,7 @@ main (int argc, char* argv[])
 #ifdef ACE_HAS_DSUI
       //@BT
       //DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
-      ACE_DEBUG((LM_DEBUG,"Consumer_EC thread %t STOP at %u\n",ACE_OS::gettimeofday().msec()));
+      ACE_OS::printf("Consumer_EC STOP at %u\n",ACE_OS::gettimeofday().msec());
       DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
 #endif //ACE_HAS_DSUI
 
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Kokyu_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Kokyu_EC.cpp
index 5f935031ed0..c596ee9c8b1 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Kokyu_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Kokyu_EC.cpp
@@ -1,16 +1,19 @@
 // $Id$
 
+#include "orbsvcs/Sched/Reconfig_Scheduler.h"
+#include "orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Kokyu_Factory.h"
+#include "ace/OS_NS_strings.h" //for ACE_OS::strcasecmp
+#include "ace/OS_NS_sys_time.h" // for ACE_OS::gettimeofday
+
+#include "Kokyu/Dispatch_Deferrer.h"
+
 #include "Kokyu_EC.h"
-#include <orbsvcs/Sched/Reconfig_Scheduler.h>
-#include <orbsvcs/Runtime_Scheduler.h>
-#include <orbsvcs/Event_Service_Constants.h>
-#include <orbsvcs/Event_Utilities.h>
-#include <orbsvcs/Scheduler_Factory.h>
-#include <orbsvcs/Event/EC_Event_Channel.h>
-#include <orbsvcs/Event/EC_Default_Factory.h>
-#include <orbsvcs/Event/EC_Kokyu_Factory.h>
-#include <ace/OS_NS_strings.h> //for ACE_OS::strcasecmp
-#include <ace/OS_NS_sys_time.h> // for ACE_OS::gettimeofday
 
 namespace {
 
@@ -482,12 +485,14 @@ Reactor_Task::initialize(void)
   ACE_NEW_RETURN(reactor,
                  ACE_Reactor,
                  -1);
-  reactor->open(ACE_Select_Reactor_Impl::DEFAULT_SIZE);
+  //assume reactor is already opened!
   ACE_Reactor::instance(reactor);
 
   this->react_ = reactor;
   */
-  this->react_ = ACE_Reactor::instance();
+  //this->react_ = ACE_Reactor::instance();
+  this->react_ = Kokyu::Dispatch_Deferrer::Singleton_Reactor::instance();
+  //assume reactor is already opened!
 
   this->initialized_ = 1;
 
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Supplier_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Supplier_EC.cpp
index d205866fef5..67bd7cd130a 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Supplier_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/Supplier_EC.cpp
@@ -310,7 +310,7 @@ main (int argc, char* argv[])
 #ifdef ACE_HAS_DSUI
       //@BT
       //DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
-      ACE_DEBUG((LM_DEBUG,"Supplier_EC thread %t STOP at %u\n",ACE_OS::gettimeofday().msec()));
+      ACE_OS::printf("Supplier_EC STOP at %u\n",ACE_OS::gettimeofday().msec());
       DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 1, 0, NULL);
 #endif //ACE_HAS_DSUI
       // ****************************************************************
@@ -322,7 +322,7 @@ main (int argc, char* argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier_EC");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/fan_test.mpc b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/fan_test.mpc
index 0eb2279bc23..b70e477e173 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/fan_test.mpc
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/fan_test/fan_test.mpc
@@ -3,6 +3,7 @@ project(Consumer_Fan): orbsvcsexe, rtevent, rtsched, rtschedevent, rtrgkokyueven
   idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
   libs += wrappers
   includes += $(TAO_ROOT)/orbsvcs
+  macros += KOKYU_HAS_RELEASE_GUARD
 
   Source_Files {
     Kokyu_EC.cpp
@@ -18,6 +19,7 @@ project(Supplier_Fan): orbsvcsexe, rtevent, rtsched, rtschedevent, rtrgkokyueven
   idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
   libs += wrappers
   includes += $(TAO_ROOT)/orbsvcs
+  macros += KOKYU_HAS_RELEASE_GUARD
 
   Source_Files {
     Consumer.cpp