Repo restructuring

4 files changed, 414 insertions, 0 deletions

diff --git a/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc b/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
new file mode 100644
index 00000000000..f362da7ae93
--- /dev/null
+++ b/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project(*server) : taoserver, amh {
+  source_files {
+    server.cpp
+  }
+}
diff --git a/TAO/tests/Bug_2319_Regression/Test.idl b/TAO/tests/Bug_2319_Regression/Test.idl
new file mode 100644
index 00000000000..ef304de303a
--- /dev/null
+++ b/TAO/tests/Bug_2319_Regression/Test.idl
@@ -0,0 +1,17 @@
+//
+// $Id$
+//
+
+/// A simple module to avoid namespace pollution
+module Test
+{
+
+  /// Use a timestamp to measure the roundtrip delay
+  typedef unsigned long long Timestamp;
+
+  /// Measure roundtrip Delay
+  interface Roundtrip
+  {
+    oneway void test_method (in Timestamp send_time);
+  };
+};
diff --git a/TAO/tests/Bug_2319_Regression/run_test.pl b/TAO/tests/Bug_2319_Regression/run_test.pl
new file mode 100755
index 00000000000..1c118935b70
--- /dev/null
+++ b/TAO/tests/Bug_2319_Regression/run_test.pl
@@ -0,0 +1,24 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+# This is a Perl script that tests AMH exceptions
+
+use lib "../../../bin";
+use PerlACE::Run_Test;
+
+$AMH = new PerlACE::Process ("server", "");
+
+# Run the AMH server.
+$AMH->Spawn ();
+
+$amhserver= $AMH->WaitKill (60);
+if ($amhserver != 0) {
+    print STDERR "ERROR: AMH Server returned $amhserver\n";
+    $status = 1;
+}
+
+exit $status;
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
new file mode 100644
index 00000000000..8bf1e026102
--- /dev/null
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -0,0 +1,365 @@
+
+// $Id$
+
+#include "ace/Thread_Manager.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Get_Opt.h"
+
+#include "TestS.h"
+#include "TestC.h"
+
+int num_calls = 10; // total calls client is going to make
+const int sleep_time = 1; // sleep for  1 sec on each call
+
+// This should equal num_calls within 'sleep * num_calls' seconds
+int calls_received = 0;
+
+const char *ior      = "file://test.ior";
+const char *ior_file = "test.ior";
+
+
+
+/***************************/
+/*** Servant Declaration ***/
+/***************************/
+
+class ST_AMH_Servant
+  	: public virtual POA_Test::AMH_Roundtrip
+    {
+    public:
+
+      	ST_AMH_Servant (CORBA::ORB_ptr orb);
+
+     	void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
+                        Test::Timestamp send_time
+                        ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+    protected:
+      	CORBA::ORB_ptr orb_;
+    };
+
+
+
+/****************************/
+/**** Server Declaration ****/
+/****************************/
+
+/**
+ Class that performs all 'dirty' initialisation work that is common to
+ all the AMH servers and 'hides' all the common ORB functions.
+ */
+class ST_AMH_Server
+    {
+    public:
+      ST_AMH_Server (int *argc, char **argv);
+      virtual ~ST_AMH_Server ();
+
+      /// ORB inititalisation stuff
+      int start_orb_and_poa (const CORBA::ORB_var &_orb);
+
+      /// register the servant with the poa
+      virtual void register_servant (ST_AMH_Servant *servant);
+
+      /// orb-perform_work () abstraction
+      virtual void run_event_loop ();
+
+    public:
+
+    protected:
+      int *argc_;
+      char **argv_;
+      char *ior_output_file_;
+      CORBA::ORB_ptr orb_;
+      PortableServer::POA_var root_poa_;
+
+    private:
+      /// Write servant IOR to file specified with the '-o' option
+      int write_ior_to_file (CORBA::String_var ior);
+    };
+
+
+
+// ------------------------------------------------------------------------
+// ------------------------------------------------------------------------
+// ------------------------------------------------------------------------
+
+
+
+// ------------------------------------------------------------------------
+//
+int parse_args (int argc, char *argv[])
+{
+ACE_Get_Opt get_opts (argc, argv, "n:");
+int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'n':
+        num_calls = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+      default:
+        break;
+      }
+  return 0;
+}
+
+
+
+
+/***************************/
+/*** Servant Definition ***/
+/***************************/
+
+// ------------------------------------------------------------------------
+//
+ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
+  : orb_(CORBA::ORB::_duplicate(orb))
+{
+}
+
+// ------------------------------------------------------------------------
+//
+void
+ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
+                             Test::Timestamp send_time
+                             ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  	printf("Recieved Timestamp # %d \n", calls_received);
+  	ACE_OS::sleep(1);
+  	calls_received++;
+
+  	ACE_UNUSED_ARG (send_time);
+  	ACE_UNUSED_ARG (_tao_rh);
+
+  // When _tao_rh destructor is called, it shouldn't send anything to
+  // the client as well
+}
+
+
+
+
+
+/*** Server Declaration ***/
+
+// ------------------------------------------------------------------------
+//
+ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
+  : argc_ (argc), argv_ (argv)
+{
+  this->ior_output_file_ = const_cast<char*>(ior_file);
+}
+
+// ------------------------------------------------------------------------
+//
+ST_AMH_Server::~ST_AMH_Server ()
+{
+  	ACE_TRY_NEW_ENV
+    	{
+      	this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      	ACE_TRY_CHECK;
+    	}
+  	ACE_CATCHANY
+    	{
+      	ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+    	}
+  	ACE_ENDTRY;
+
+}
+
+// ------------------------------------------------------------------------
+//
+int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb)
+{
+  ACE_TRY_NEW_ENV
+    {
+      this->orb_ = CORBA::ORB::_duplicate(_orb.in ());
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// ------------------------------------------------------------------------
+//
+void ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
+{
+  ACE_TRY_NEW_ENV
+    {
+      Test::Roundtrip_var roundtrip = servant->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var iorstr = this->orb_->object_to_string(roundtrip.in ());
+      ACE_TRY_CHECK;
+
+      (void) this->write_ior_to_file(iorstr);
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+    }
+  ACE_ENDTRY;
+}
+
+// ------------------------------------------------------------------------
+//
+void ST_AMH_Server::run_event_loop ()
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      ACE_Time_Value period (1, 0);
+      while (1)
+            {
+          this->orb_->perform_work (&period);
+          ACE_TRY_CHECK;
+
+          // when all calls from client have been recieved, exit
+          if (calls_received == num_calls )
+            return;
+        }
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {}
+  ACE_ENDTRY;
+}
+
+// ------------------------------------------------------------------------
+//
+int
+ST_AMH_Server::write_ior_to_file (CORBA::String_var iorstr)
+{
+  // If the ior_output_file exists, output the ior to it
+  FILE *output_file= ACE_OS::fopen (ST_AMH_Server::ior_output_file_, "w");
+  if (output_file == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "Cannot open output file for writing IOR: %s",
+                  ST_AMH_Server::ior_output_file_));
+      return -1;
+    }
+
+  ACE_OS::fprintf (output_file, "%s", iorstr.in ());
+  ACE_OS::fclose (output_file);
+  return 0;
+}
+
+
+// ------------------------------------------------------------------------
+//
+static ACE_THR_FUNC_RETURN start_server(void* _arg)
+{
+ST_AMH_Server *amh_server = static_cast<ST_AMH_Server*>(_arg);
+	amh_server->run_event_loop();
+	return 0;
+}
+
+// ------------------------------------------------------------------------
+//
+static ACE_THR_FUNC_RETURN start_client(void* _arg)
+{
+Test::Roundtrip_var roundtrip(static_cast<Test::Roundtrip_ptr>(_arg));
+
+      // Do a couple of calls on the server. If the sever is trying to
+      // do something stupid like sending an exception to us, then it
+      // won't be able to handle more than 1 request from us.
+Test::Timestamp time = 10;
+
+    for (int i = 0; i < num_calls; i++)
+        {
+        roundtrip->test_method(time);
+        ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
+        ACE_TRY_CHECK;
+        }
+
+	return 0;
+}
+
+
+// ------------------------------------------------------------------------
+//
+int main (int argc, char *argv[])
+{
+  	if (parse_args (argc, argv) != 0)
+    	return 1;
+
+ST_AMH_Server amh_server (&argc, argv);
+CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
+
+      ACE_TRY_CHECK;
+
+  	amh_server.start_orb_and_poa(orb);
+
+ST_AMH_Servant servant(orb.in());
+
+  	amh_server.register_servant(&servant);
+
+    CORBA::Object_var object =  orb->string_to_object(ior);
+    ACE_TRY_CHECK;
+
+    Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow(object.in ());
+    ACE_TRY_CHECK;
+
+    if (CORBA::is_nil(roundtrip.in()))
+      	{
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil Test::Roundtrip reference <%s>\n",
+                           ior),
+                          1);
+      	}
+
+    ACE_thread_t serverThr;
+    ACE_thread_t clientThr;
+
+    ACE_Thread_Manager::instance()->spawn(start_server,
+                                          (void*)&amh_server,
+                                          THR_NEW_LWP | THR_JOINABLE,
+                                          &serverThr
+                                          );
+
+    ACE_Thread_Manager::instance()->spawn(start_client,
+                                          (void*)roundtrip.in (),
+                                          THR_NEW_LWP | THR_JOINABLE,
+                                          &clientThr
+                                          );
+
+    ACE_Thread_Manager::instance()->join(clientThr);
+    printf("End client\n");
+    ACE_Thread_Manager::instance()->join(serverThr);
+    printf("End server\n");
+
+   	orb->destroy();
+   	ACE_TRY_CHECK;
+
+    return 0;
+}