ChangeLogTag:Sat May 17 16:29:35 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

9 files changed, 49 insertions, 13 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 85c956809f9..f4f6734737d 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Sat May 17 16:29:35 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* examples/handcrafted/BasicSP/descriptors/test.dat
+	* examples/handcrafted/BasicSP/BMClosedED/BMClosedED_exec.cpp
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h
+	* examples/handcrafted/BasicSP/BMDisplay/BMDisplay_exec.cpp
+	* examples/handcrafted/BasicSP/EC/EC_exec.cpp
+	* examples/handcrafted/BasicSP/EC/EC_svnt.cpp
+	* examples/handcrafted/BasicSP/EC/controller.cpp: Now the demo
+	  works! Fixed a few problems and made debug statements to be more
+	  meaningful. Now that teh CIDL compiler is also ready, we are
+	  ready to storm KSU :-)
+
 Sat May 17 12:40:44 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt.cpp
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED_exec.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED_exec.cpp
index cf71d9a325f..ac80e1b9fb1 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -37,20 +37,28 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
 
   // Refresh position
   BasicSP::ReadData_var dat
-    = this->context_->get_connection_datain (ACE_ENV_ARG_PARAMETER);
+    = this->context_->get_connection_datain (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (dat.in ()))
+  {
     ACE_THROW (CORBA::BAD_INV_ORDER ());
+  }
 
-  this->str_ =
-    dat->get_data ();
+  char *str =
+    dat->get_data (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "BMDisplay - Display data is [%s] \n",
-              this->str_.in ()));
+              "BMClosedED - Display data is [%s] \n",
+               str));
+
+  if (ACE_OS::strcmp (str, "BM DEVICE DATA") == 0)
+    {	  
+      this->str_ = CORBA::string_dup ("BM CLOSED ED DATA");	   
+    }
 
-  // Nitify others
+  // Notify others
   BasicSP::DataAvailable_var event =
     new OBV_BasicSP::DataAvailable;
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp
index a20b7a24d24..04ca0b4fa27 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -7,7 +7,7 @@
 
 /// Default constructor.
 MyImpl::BMDevice_exec_i::BMDevice_exec_i (void)
-  : str_ ("starting_data")
+  : str_ ("BM DEVICE DATA")
 {
 
 }
@@ -32,6 +32,9 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *
   // Nitify others
   BasicSP::DataAvailable_var event = new OBV_BasicSP::DataAvailable;
 
+  ACE_DEBUG ((LM_DEBUG,
+              "BMDevice, received a timeout from EC \n"));
+
   this->context_->push_data_available (event
                                        ACE_ENV_ARG_PARAMETER);
 }
@@ -43,6 +46,13 @@ MyImpl::BMDevice_exec_i::data_read (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return this->str_;
 }
 
+char *
+MyImpl::BMDevice_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->data_read (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
 // Operations from Components::SessionComponent
 void
 MyImpl::BMDevice_exec_i::set_session_context (Components::SessionContext_ptr ctx
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h
index 55576bc3966..d65cbca8b9b 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h
@@ -53,6 +53,10 @@ namespace MyImpl
     data_read (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    virtual char *
+    get_data (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
     // Operations from Components::SessionComponent
 
     virtual void
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay_exec.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay_exec.cpp
index 1067316acee..f7ac0de4c4a 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -27,7 +27,7 @@ MyImpl::BMDisplay_exec_impl::push_data_ready (
               "BMDisplay - Doing computations \n"));
 
   ACE_DEBUG ((LM_DEBUG,
-              "BMDisplay - Doing data fecth \n"));
+              "BMDisplay - Doing data fetch \n"));
 
   // Refresh position
   BasicSP::ReadData_var dat
@@ -38,7 +38,8 @@ MyImpl::BMDisplay_exec_impl::push_data_ready (
     ACE_THROW (CORBA::BAD_INV_ORDER ());
 
   char *str =
-    dat->get_data ();
+    dat->get_data (ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
               "BMDisplay - Display data is [%s] \n",
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp
index f7cad77e676..8897776433d 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp
@@ -152,7 +152,6 @@ void
 MyImpl::EC_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  cout << "Amba " << endl;
   if (this->hertz_ == 0 || this->pulser_.active())
     ACE_THROW (CORBA::BAD_INV_ORDER ());
 
@@ -269,7 +268,6 @@ MyImpl::ECHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  cout << "Got here" << endl;
   return new MyImpl::EC_exec_i ();
 }
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp
index c7d1cb86168..46238c55671 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp
@@ -640,7 +640,6 @@ void
 CIAO_GLUE_BasicSP::EC_Servant::start (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  cout << "Amba Here ?? " << endl;
   // Simply relay to executor.  May not need to return the result...
   this->executor_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp
index 8bc5076710b..0d6a328b217 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp
@@ -54,7 +54,7 @@ parse_args (int argc, char *argv[])
       }
 
   if (rategen_ior_ == 0)
-    rategen_ior_ = "file://rategen.ior";
+    rategen_ior_ = "file://ec.ior";
 
   if (rate == 0)
     rate = 3;
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/test.dat b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/test.dat
new file mode 100644
index 00000000000..d26b3d4e070
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/test.dat
@@ -0,0 +1,2 @@
+Default corbaloc:iiop:localhost:10000/ServerActivator
+Remote  corbaloc:iiop:localhost:12000/ServerActivator
\ No newline at end of file