Repo restructuring

97 files changed, 0 insertions, 9347 deletions

diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
deleted file mode 100644
index 0e91b45fcb8..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
+++ /dev/null
@@ -1,126 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Threaded_AMH_Sequence_Idl.am
-
-if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Single_Threaded_AMH_Sequence_Client.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Single_Threaded_AMH_Sequence_Server.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/README b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/README
deleted file mode 100644
index 781f8ffb321..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/README
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
-
-@page AMH Sequence Latency Test README File
-
-	This test tries to estimate the minimum latency for a AMH
-request. The test uses a single threaded client and server, and
-this test uses sequence of various data types.
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful, and prints
-out the performance numbers.
-
-*/
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
deleted file mode 100644
index f7be48d6140..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-Roundtrip::test_octet_method (
-                Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                const Test::octet_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //ACE_DEBUG ((LM_DEBUG, "Test_Octet_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_octet_method (send_time ACE_ENV_ARG_PARAMETER);
-  //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
-}
-
-void
-Roundtrip::test_long_method (
-                Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                const Test::long_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //ACE_DEBUG ((LM_DEBUG, "Test_Long_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_long_method (send_time ACE_ENV_ARG_PARAMETER);
-  //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
-}
-
-void
-Roundtrip::test_short_method (
-                Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                const Test::short_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //ACE_DEBUG ((LM_DEBUG, "Test_Short_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_short_method (send_time ACE_ENV_ARG_PARAMETER);
-  //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
-}
-
-void
-Roundtrip::test_char_method (
-                Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                const Test::char_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //ACE_DEBUG ((LM_DEBUG, "Test_Char_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_char_method (send_time ACE_ENV_ARG_PARAMETER);
-  //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
-}
-
-
-void
-Roundtrip::test_longlong_method (
-                Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                const Test::longlong_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //ACE_DEBUG ((LM_DEBUG, "Test_Longlong_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_longlong_method (send_time ACE_ENV_ARG_PARAMETER);
-  //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
-}
-
-void
-Roundtrip::test_double_method (
-                Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                const Test::double_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //ACE_DEBUG ((LM_DEBUG, "Test_Double_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_double_method (send_time ACE_ENV_ARG_PARAMETER);
-  //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
-}
-
-void
-Roundtrip::shutdown (
-       Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-       ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
deleted file mode 100644
index 967b876ff5d..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::AMH_Roundtrip
-{
- public:
-    /// Constructor
-    Roundtrip (CORBA::ORB_ptr orb);
-
-    // = The skeleton methods
-    void test_octet_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-		                    const Test::octet_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    void test_long_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-		                    const Test::long_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void test_short_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-		                    const Test::short_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    void test_char_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-		                    const Test::char_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void test_longlong_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-		                    const Test::longlong_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    void test_double_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-		                    const Test::double_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-
-    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                   ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
- private:
-    /// Use an ORB reference to conver strings to objects and shutdown
-    /// the application.
-    CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
deleted file mode 100644
index d92af709ed0..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*AMH_sequence_idl): taoidldefaults, amh {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*AMH sequence server): taoserver, strategies, valuetype, amh {
-  after += *AMH_sequence_idl
-  Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
-    TestC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*AMH sequence client): taoclient, strategies, valuetype, amh {
-  after += *AMH_sequence_idl
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl
deleted file mode 100644
index 8589f1e7a79..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
deleted file mode 100644
index 18946dca23f..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(AMH_Single_Threaded_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-int sz = 512;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-	  
-	  case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-						   "-t <datatype> "
-						   "-s <size> "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "-h (dump history) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-void
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::octet_load ol (sz);
-  ol.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::long_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::short_load sl (sz);
-  sl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::char_load cl (sz);
-  cl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::longlong_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::double_load dl (sz);
-  dl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-	  Test::octet_load oc;	
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (ACE_OS::strcmp (data_type, "octet") == 0 )
-        {
-          test_octet_seq (roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "char") == 0)
-        {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "long") == 0)
-        {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "short") == 0)
-        {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "double") == 0)
-        {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "longlong") == 0)
-        {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/run_test.pl b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/run_test.pl
deleted file mode 100755
index e95653a41be..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/run_test.pl
+++ /dev/null
@@ -1,66 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-print STDERR "=============== AMH Single-threaded Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for Performance Test\n\n";
-        print "run_test  [-t type] \n";
-        print "\n";
-        print "-t type             -- runs only one type of param test\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 50000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (40);
-
-unlink $iorfile;
-
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
deleted file mode 100644
index a76449261c5..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
deleted file mode 100644
index b851295dfa3..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
+++ /dev/null
@@ -1,136 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.ami_sequence_idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.ami_sequence_client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Roundtrip_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Roundtrip_Handler.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.ami_sequence_server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  Server_Task.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h \
-  Server_Task.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/README b/TAO/performance-tests/Sequence_Latency/AMI/README
deleted file mode 100644
index d8ca3e7a1a1..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/README
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-
-@page AMI Latency Test README File
-
-	This test tries to estimate the minimum latency for a AMI
-request.  The test uses a single threaded client and server, and
-configures the ORB to eliminate common sources of overhead, such as
-locking. This test uses sequence of various data types.
-
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful, and prints
-out the performance numbers.
-
-*/
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
deleted file mode 100644
index 2d9c8233557..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-
-Test::Timestamp
-Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
deleted file mode 100644
index a2c066ceda6..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-{
-public:
-
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
deleted file mode 100644
index cbd5f79b272..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip_Handler.h"
-#include "ace/OS_NS_time.h"
-
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
-Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks)
-  : pending_callbacks_ (expected_callbacks)
-{
-}
-
-int
-Roundtrip_Handler::pending_callbacks (void) const
-{
-  return this->pending_callbacks_;
-}
-
-void
-Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
-{
-  this->latency_stats_.dump_results ("AMI Latency", gsf);
-}
-
-// = The skeleton methods for test octet load
-
-void
-Roundtrip_Handler::test_octet_method (Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  --this->pending_callbacks_;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_octet_method_excep (::Messaging::ExceptionHolder *holder
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_octet_method:");
-    }
-  ACE_ENDTRY;
-}
-
-// = The skeleton methods for test char load
-
-void
-Roundtrip_Handler::test_char_method (Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  --this->pending_callbacks_;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_char_method_excep (::Messaging::ExceptionHolder *holder
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_char_method:");
-    }
-  ACE_ENDTRY;
-}
-
-// = The skeleton methods for test long load
-
-void
-Roundtrip_Handler::test_long_method (Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  --this->pending_callbacks_;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_long_method_excep (::Messaging::ExceptionHolder *holder
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_long_method:");
-    }
-  ACE_ENDTRY;
-}
-
-// = The skeleton methods for test short load
-
-void
-Roundtrip_Handler::test_short_method (Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  --this->pending_callbacks_;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_short_method_excep (::Messaging::ExceptionHolder *holder
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_short_method:");
-    }
-  ACE_ENDTRY;
-}
-
-// = The skeleton methods for test double load
-
-void
-Roundtrip_Handler::test_double_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  --this->pending_callbacks_;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_double_method_excep (::Messaging::ExceptionHolder *holder
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_double_method:");
-    }
-  ACE_ENDTRY;
-}
-
-// = The skeleton methods for test longlong load
-
-void
-Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time
-                                         ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  --this->pending_callbacks_;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *holder
-                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_longlong_method:");
-    }
-  ACE_ENDTRY;
-}
-
-
-// = Other methods
-
-void
-Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown:");
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
deleted file mode 100644
index dd3b92aaf7d..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_HANDLER_H
-#define ROUNDTRIP_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-#include "ace/Basic_Stats.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip_Handler
-  : public virtual POA_Test::AMI_RoundtripHandler
-{
-public:
-  /// Constructor
-  Roundtrip_Handler (int expected_callbacks);
-
-  /// Return the number of pending callbacks
-  int pending_callbacks (void) const;
-
-  /// Dump the results
-  void dump_results (ACE_UINT32 gsf);
-
-  // = The skeleton methods for test octet load
-  virtual void test_octet_method (Test::Timestamp send_time
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void test_octet_method_excep (::Messaging::ExceptionHolder *holder
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // = The skeleton methods for test char load
-  virtual void test_char_method (Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_char_method_excep (::Messaging::ExceptionHolder *holder
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // = The skeleton methods for test long load
-  virtual void test_long_method  (Test::Timestamp send_time
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_long_method_excep (::Messaging::ExceptionHolder *holder
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // = The skeleton methods for test short load
-  virtual void test_short_method (Test::Timestamp send_time
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_short_method_excep (::Messaging::ExceptionHolder *holder
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // = The skeleton methods for test longlong load
-  virtual void test_longlong_method (Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_longlong_method_excep (::Messaging::ExceptionHolder *holder
-                                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // = The skeleton methods for test double load
-  virtual void test_double_method (Test::Timestamp send_time
-                                   ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_double_method_excep (::Messaging::ExceptionHolder *holder
-                                         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // = Other methods
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
-                               ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// The number of callbacks not received yet
-  int pending_callbacks_;
-
-  /// Collect the latency results
-  ACE_Basic_Stats latency_stats_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
deleted file mode 100644
index 6df92f32a3f..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-#include "Server_Task.h"
-
-ACE_RCSID(AMI_Latency, Server_Task, "$Id$")
-
-Server_Task::Server_Task (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Server_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY {} ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
deleted file mode 100644
index dcb06d9030c..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef SERVER_TASK_H
-#define SERVER_TASK_H
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB.h"
-#include "ace/Task.h"
-
-/// Implement a simple ACE_Task to run the ORB event loop
-/**
- * This class is used to implement a simple thread pool.
- */
-class Server_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Server_Task (CORBA::ORB_ptr orb);
-
-  /// The thread entry point
-  virtual int svc (void);
-
-private:
-  /// Keep a reference to the ORB
-  CORBA::ORB_var orb_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* SERVER_TASK_H */
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Test.idl b/TAO/performance-tests/Sequence_Latency/AMI/Test.idl
deleted file mode 100644
index 8589f1e7a79..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
deleted file mode 100644
index d9fde7e7816..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*sequence_idl): taoidldefaults, ami {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*sequence server): taoserver, messaging, strategies, ami {
-  after += *sequence_idl
-  Source_Files {
-    Roundtrip.cpp
-    Server_Task.cpp
-    TestS.cpp
-    TestC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*sequence client): taoclient, messaging, strategies, ami {
-  after += *sequence_idl
-  Source_Files {
-    Roundtrip_Handler.cpp
-    TestS.cpp
-    TestC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
deleted file mode 100644
index c1343244eab..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-// $Id$
-
-#include "Roundtrip_Handler.h"
-#include "tao/debug.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
-
-const char *ior = "file://test.ior";
-
-ACE_hrtime_t throughput_base;
-
-int niterations = 1000;
-int sz = 512;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:s:k:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-
-          case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-          case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-t <datatype> "
-                           "-s <size> "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-p <period (msecs)> "
-                           "-b <burst size> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-void test_octet_seq (Test::Roundtrip_ptr roundtrip,
-                     CORBA::ORB_ptr orb,
-                     Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
-{
-  Test::octet_load ol (sz);
-  ol.length (sz);
-
-  Test::AMI_RoundtripHandler_var rth =
-          Test::AMI_RoundtripHandler::_duplicate (roundtrip_handler);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_octet_method (rth.in (),
-                                               ol,
-                                               ACE_OS::gethrtime ()
-                                               ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_CHECK;
-         }
-
-  ACE_Time_Value tv (0, 2000);
-
-  while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
-         }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  roundtrip_handler_impl->dump_results (gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         niterations);
-}
-
-
-void test_char_seq  (Test::Roundtrip_ptr roundtrip,
-                     CORBA::ORB_ptr orb,
-                     Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
-{
-  Test::char_load cl (sz);
-  cl.length (sz);
-
-  Test::AMI_RoundtripHandler_var rth =
-          Test::AMI_RoundtripHandler::_duplicate (roundtrip_handler);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_char_method  (rth.in (),
-                                               cl,
-                                               ACE_OS::gethrtime ()
-                                               ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_CHECK;
-         }
-
-  ACE_Time_Value tv (0, 2000);
-
-  while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
-         }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  roundtrip_handler_impl->dump_results (gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         niterations);
-}
-
-
-void test_long_seq  (Test::Roundtrip_ptr roundtrip,
-                     CORBA::ORB_ptr orb,
-                     Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
-{
-  Test::long_load ll (sz);
-  ll.length (sz);
-
-  Test::AMI_RoundtripHandler_var rth =
-          Test::AMI_RoundtripHandler::_duplicate (roundtrip_handler);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_long_method (rth.in (),
-                                              ll,
-                                              ACE_OS::gethrtime ()
-                                              ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_CHECK;
-         }
-
-  ACE_Time_Value tv (0, 2000);
-
-  while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
-         }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  roundtrip_handler_impl->dump_results (gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         niterations);
-}
-
-
-void test_short_seq (Test::Roundtrip_ptr roundtrip,
-                     CORBA::ORB_ptr orb,
-                     Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
-{
-  Test::short_load sl (sz);
-  sl.length (sz);
-
-  Test::AMI_RoundtripHandler_var rth =
-          Test::AMI_RoundtripHandler::_duplicate (roundtrip_handler);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_short_method (rth.in (),
-                                               sl,
-                                               ACE_OS::gethrtime ()
-                                               ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_CHECK;
-         }
-
-  ACE_Time_Value tv (0, 2000);
-
-  while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
-         }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  roundtrip_handler_impl->dump_results (gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         niterations);
-}
-
-
-void test_double_seq (Test::Roundtrip_ptr roundtrip,
-                      CORBA::ORB_ptr orb,
-                      Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                      Roundtrip_Handler *roundtrip_handler_impl
-                      ACE_ENV_ARG_DECL)
-{
-  Test::double_load dl (sz);
-  dl.length (sz);
-
-  Test::AMI_RoundtripHandler_var rth =
-          Test::AMI_RoundtripHandler::_duplicate (roundtrip_handler);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_double_method (rth.in (),
-                                                dl,
-                                                ACE_OS::gethrtime ()
-                                                ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_CHECK;
-         }
-
-  ACE_Time_Value tv (0, 2000);
-
-  while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
-         }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  roundtrip_handler_impl->dump_results (gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         niterations);
-}
-
-
-void test_longlong_seq (Test::Roundtrip_ptr roundtrip,
-                        CORBA::ORB_ptr orb,
-                        Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                        Roundtrip_Handler *roundtrip_handler_impl
-                        ACE_ENV_ARG_DECL)
-{
-  Test::longlong_load ll (sz);
-  ll.length (sz);
-
-  Test::AMI_RoundtripHandler_var rth =
-          Test::AMI_RoundtripHandler::_duplicate (roundtrip_handler);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_longlong_method (rth.in (),
-                                                  ll,
-                                                  ACE_OS::gethrtime ()
-                                                  ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_CHECK;
-         }
-
-  ACE_Time_Value tv (0, 2000);
-
-  while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
-         }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  roundtrip_handler_impl->dump_results (gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         niterations);
-}
-
-
-// Main function starts below
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Nil Test::Roundtrip reference <%s>\n",
-                           ior),
-                          1);
-
-          Test::octet_load oc;
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      Roundtrip_Handler *roundtrip_handler_impl;
-      ACE_NEW_RETURN (roundtrip_handler_impl,
-                      Roundtrip_Handler (niterations),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
-
-      Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ACE_OS::strcmp (data_type, "octet") == 0 )
-        {
-          test_octet_seq (roundtrip.in (),
-                          orb.in (),
-                          roundtrip_handler.in (),
-                          roundtrip_handler_impl
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "char") == 0)
-        {
-          test_char_seq (roundtrip.in (),
-                         orb.in (),
-                         roundtrip_handler.in (),
-                         roundtrip_handler_impl
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "long") == 0)
-        {
-          test_long_seq (roundtrip.in (),
-                         orb.in (),
-                         roundtrip_handler.in (),
-                         roundtrip_handler_impl
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "short") == 0)
-        {
-          test_short_seq (roundtrip.in (),
-                          orb.in (),
-                          roundtrip_handler.in (),
-                          roundtrip_handler_impl
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "double") == 0)
-        {
-          test_double_seq (roundtrip.in (),
-                           orb.in (),
-                           roundtrip_handler.in (),
-                           roundtrip_handler_impl
-                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "longlong") == 0)
-        {
-          test_longlong_seq (roundtrip.in (),
-                             orb.in (),
-                             roundtrip_handler.in (),
-                             roundtrip_handler_impl
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught: ");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/run_test.pl b/TAO/performance-tests/Sequence_Latency/AMI/run_test.pl
deleted file mode 100755
index 448b896a9ae..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/run_test.pl
+++ /dev/null
@@ -1,66 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-print STDERR "================ Thread AMI Latency Test\n";
-
-unlink $iorfile;
-
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for Performance Test\n\n";
-        print "run_test  [-t type] \n";
-        print "\n";
-        print "-t type             -- runs only one type of param test\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 150000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (20);
-
-unlink $iorfile;
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
deleted file mode 100644
index 9aefa38f531..00000000000
--- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "Server_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(AMI_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-int nthreads = 4;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile> "
-                           "-n <nthreads> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
-
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Server_Task server_task (orb.in ());
-      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate server threads\n"),
-                          1);
-
-      server_task.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
deleted file mode 100644
index 2a49e587b0a..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*sequence_idl): taoidldefaults, strategies, minimum_corba {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*sequence server): taoserver, strategies, minimum_corba {
-  after += *sequence_idl
-
-  exename = server
-  Source_Files {
-    Roundtrip.cpp
-    server.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
-  after += *sequence_idl
-
-  exename = client
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
deleted file mode 100644
index 3ac424d40e4..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DII_Sequence_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.DII_Sequence_Client.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.DII_Sequence_Server.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/DII/README b/TAO/performance-tests/Sequence_Latency/DII/README
deleted file mode 100644
index 7cabdf8ff6f..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/README
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-
-@page DII Latency Test README File
-
-	This test tries to estimate the minimum latency for a DII twoway
-request.  The test uses a single threaded client and server, and
-configures the ORB to eliminate common sources of overhead, such as
-locking. This test uses sequence of various data types.
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful, and prints
-out the performance numbers.
-
-*/
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
deleted file mode 100644
index 86f6ade0015..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(DII_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-
-Test::Timestamp
-Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
deleted file mode 100644
index a2c066ceda6..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-{
-public:
-
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Test.idl b/TAO/performance-tests/Sequence_Latency/DII/Test.idl
deleted file mode 100644
index 8589f1e7a79..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
deleted file mode 100644
index 624c7ddfb6b..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-// $Id$
-
-#include "tao/DynamicInterface/Request.h"
-#include "tao/Strategies/advanced_resource.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
-
-#include "TestC.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-#include "ace/OS_NS_errno.h"
-
-
-ACE_RCSID (DII,
-           client,
-           "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-int sz = 512;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-
-	  case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-t <datatype> "
-						   "-s <size> "
-						   "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-void
-test_octet_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::octet_load ol (sz);
-  ol.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-      Test::Timestamp start_time = static_cast <Test::Timestamp> (start);
-
-      CORBA::Request_var request =
-        object->_request ("test_octet_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->add_in_arg("octet_load") <<= ol;
-      request->add_in_arg("send_time") <<= start_time;
-
-      request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_long_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::long_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      CORBA::Request_var request =
-        object->_request ("test_long_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->add_in_arg("long_load") <<= ll;
-      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
-
-      request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_short_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::short_load sl (sz);
-  sl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      CORBA::Request_var request =
-        object->_request ("test_short_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->add_in_arg("short_load") <<= sl;
-      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
-
-      request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_char_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::char_load cl (sz);
-  cl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      CORBA::Request_var request =
-        object->_request ("test_char_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->add_in_arg("char_load") <<= cl;
-      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
-
-      request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_double_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::double_load dl (sz);
-  dl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      CORBA::Request_var request =
-        object->_request ("test_double_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->add_in_arg("double_load") <<= dl;
-      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
-
-      request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_longlong_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::longlong_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      CORBA::Request_var request =
-        object->_request ("test_longlong_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->add_in_arg("longlong_load") <<= ll;
-      request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
-
-      request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-// The main() function starts here
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (object.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil CORBA::Object reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-	  Test::octet_load oc;
-
-      for (int j = 0; j < 100; ++j)
-        {
-          CORBA::Request_var request =
-            object->_request ("test_octet_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          Test::Timestamp dummy = 0;
-          request->add_in_arg("octet_load") <<= oc;
-          request->add_in_arg("send_time") <<= dummy;
-
-          request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-	  // Test various sequence types
-
-	  if (ACE_OS::strcmp (data_type, "octet") == 0 )
-        {
-          test_octet_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "char") == 0)
-        {
-          test_char_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "long") == 0)
-        {
-          test_long_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "short") == 0)
-        {
-          test_short_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "double") == 0)
-        {
-          test_double_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "longlong") == 0)
-        {
-          test_longlong_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-
-      if (do_shutdown)
-        {
-          CORBA::Request_var request =
-            object->_request ("shutdown" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DII/run_test.pl b/TAO/performance-tests/Sequence_Latency/DII/run_test.pl
deleted file mode 100755
index e0522f673be..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/run_test.pl
+++ /dev/null
@@ -1,66 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-print STDERR "================ DII Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for Performance Test\n\n";
-        print "run_test  [-t type] \n";
-        print "\n";
-        print "-t type             -- runs only one type of param test\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 150000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (40);
-
-unlink $iorfile;
-
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
deleted file mode 100644
index f7ce55b8577..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(DII_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DII/svc.conf b/TAO/performance-tests/Sequence_Latency/DII/svc.conf
deleted file mode 100644
index 557c16b5caf..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/svc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
deleted file mode 100644
index 7188391fbb8..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Latency/DII/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
-</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
deleted file mode 100644
index 09868b8bab8..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults, strategies, minimum_corba {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_corba {
-  after += *idl
-  Source_Files {
-    Roundtrip.cpp
-    server.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-project(*sequence client): taoclient, strategies, minimum_corba {
-  after += *idl
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
deleted file mode 100644
index bc8f4387742..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.DSI_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.DSI_Sequence_Client.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.DSI_Sequence_Server.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/README b/TAO/performance-tests/Sequence_Latency/DSI/README
deleted file mode 100644
index e82f52701ad..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/README
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-
-@page Single Threaded Performance Test README File
-
-	This test tries to estimate the minimum latency for a twoway
-request.  The test uses a single threaded client and server, and
-configures the ORB to eliminate common sources of overhead, such as
-locking. This test uses sequence of various data types.
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful, and prints
-out the performance numbers.
-
-*/
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
deleted file mode 100644
index 7fbe1b7db19..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-// $Id$
-//
-
-#include "TestC.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/NVList.h"
-#include "tao/AnyTypeCode/SystemExceptionA.h"
-#include "Roundtrip.h"
-#include "tao/DynamicInterface/Server_Request.h"
-
-ACE_RCSID(DSI_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
-{
-  if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
-    {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Any type_id;
-      type_id._tao_set_typecode (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      const char *arg;
-      *(nv->value ()) >>= arg;
-
-      CORBA::Boolean type_matches = 0;
-      if (ACE_OS::strcmp (arg, "IDL:Test/Roundtrip:1.0") == 0
-          || ACE_OS::strcmp (arg, "IDL:omg.org/CORBA/Object:1.0") == 0
-          || ACE_OS::strcmp (arg, "") == 0)
-        type_matches = 1;
-
-      CORBA::Any result;
-      result <<= CORBA::Any::from_boolean (type_matches);
-
-      request->set_result (result ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_octet_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-		  // Set up the argument list
-
-	    CORBA::Any octet_load;
-      octet_load._tao_set_typecode (Test::_tc_octet_load);
-	    list->add_value ("octet_load", octet_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-
-	    CORBA::Any send_time;
-      send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-	    // Set up the return value
-
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_long_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-		  // Set up the argument list
-
-	    CORBA::Any long_load;
-      long_load._tao_set_typecode (Test::_tc_long_load);
-	    list->add_value ("long_load", long_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-	    CORBA::Any send_time;
-      send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-	    // Set up the return value
-
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_short_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-		  // Set up the argument list
-
-	    CORBA::Any short_load;
-      short_load._tao_set_typecode (Test::_tc_short_load);
-	    list->add_value ("short_load", short_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-	    CORBA::Any send_time;
-      send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-	    // Set up the return value
-
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_char_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-		  // Set up the argument list
-
-	    CORBA::Any char_load;
-      char_load._tao_set_typecode (Test::_tc_char_load);
-	    list->add_value ("char_load", char_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-	    CORBA::Any send_time;
-      send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-	    // Set up the return value
-
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_longlong_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-		
-		  // Set up the argument list
-
-	    CORBA::Any longlong_load;
-      longlong_load._tao_set_typecode (Test::_tc_longlong_load);
-	    list->add_value ("longlong_load", longlong_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-		  
-	    CORBA::Any send_time;
-      send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-	    // Set up the return value
-
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_double_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-		
-		  // Set up the argument list
-
-	    CORBA::Any double_load;
-      double_load._tao_set_typecode (Test::_tc_double_load);
-	    list->add_value ("double_load", double_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-		  
-	    CORBA::Any send_time;
-      send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-	    // Set up the return value
-
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  CORBA::Any bad_operation;
-  CORBA::BAD_OPERATION exception;
-  bad_operation <<= exception;
-  request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::RepositoryId
-Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
deleted file mode 100644
index d98fa730f1f..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "tao/DynamicInterface/Dynamic_Implementation.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/ORB.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual PortableServer::DynamicImplementation
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
-  virtual CORBA::RepositoryId _primary_interface (
-      const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL);
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Test.idl b/TAO/performance-tests/Sequence_Latency/DSI/Test.idl
deleted file mode 100644
index 8589f1e7a79..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
deleted file mode 100644
index 8298ea4930b..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-//
-// $Id$
-//
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(DSI_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-int sz = 512;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-
-                        case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-                        case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-void
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::octet_load ol (sz);
-  ol.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_octet_method (ol,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::long_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_long_method (ll,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::short_load sl (sz);
-  sl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_short_method (sl,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::char_load cl (sz);
-  cl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_char_method (cl,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::longlong_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_longlong_method (ll,
-                                              start
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-void
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::double_load dl (sz);
-  dl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_double_method (dl,
-                                            start
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-
-                        Test::octet_load oc;
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (ACE_OS::strcmp (data_type, "octet") == 0 )
-        {
-          test_octet_seq (roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "char") == 0)
-        {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "long") == 0)
-        {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "short") == 0)
-        {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "double") == 0)
-        {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "longlong") == 0)
-        {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/run_test.pl b/TAO/performance-tests/Sequence_Latency/DSI/run_test.pl
deleted file mode 100755
index 73b83fc174d..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/run_test.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-
-print STDERR "================ DSI Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for Performance Test\n\n";
-        print "run_test  [-t type] \n";
-        print "\n";
-        print "-t type             -- runs only one type of param test\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 50000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (40);
-
-unlink $iorfile;
-
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
deleted file mode 100644
index e986310ab43..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(DSI_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
deleted file mode 100644
index 557c16b5caf..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
deleted file mode 100644
index d35a5ac7473..00000000000
--- a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Latency/DSI/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
-</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
deleted file mode 100644
index 2a49e587b0a..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*sequence_idl): taoidldefaults, strategies, minimum_corba {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*sequence server): taoserver, strategies, minimum_corba {
-  after += *sequence_idl
-
-  exename = server
-  Source_Files {
-    Roundtrip.cpp
-    server.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
-  after += *sequence_idl
-
-  exename = client
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
deleted file mode 100644
index 3bfe3653b10..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Deferred_Sequence_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Deferred_Sequence_Client.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Deferred_Sequence_Server.am
-
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/README b/TAO/performance-tests/Sequence_Latency/Deferred/README
deleted file mode 100644
index 803fafa3a0e..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/README
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-
-@page Deferred Synchronous Latency Test README File
-
-	This test tries to estimate the minimum latency for a deferred
-synchronous request.  The test uses a single threaded client and
-server, and configures the ORB to eliminate common sources of
-overhead, such as locking. This test uses sequence of various data
-types.
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful, and prints
-out the performance numbers.
-
-*/
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
deleted file mode 100644
index 5da0733d7e2..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Deferred_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-
-Test::Timestamp
-Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
deleted file mode 100644
index a2c066ceda6..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-{
-public:
-
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Test.idl b/TAO/performance-tests/Sequence_Latency/Deferred/Test.idl
deleted file mode 100644
index 8589f1e7a79..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
deleted file mode 100644
index b93bbd8ffbd..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ /dev/null
@@ -1,647 +0,0 @@
-// $Id$
-
-#include "tao/DynamicInterface/Request.h"  /* Must come first for G++
-                                              3.4 or better */
-
-#include "TestC.h"
-
-#include "tao/Strategies/advanced_resource.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-#include "ace/OS_NS_errno.h"
-
-ACE_RCSID (Deferred,
-           client,
-           "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int burst = 10;
-int do_shutdown = 1;
-int do_dump_history = 0;
-int sz = 512;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:b:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-
-          case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'b':
-        burst = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-t <datatype> "
-                                                   "-s <size> "
-                                                   "-k <ior> "
-                           "-i <niterations> "
-                           "-b <burst> "
-                           "-x (disable shutdown) "
-                           "-h (dump history) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-
-int
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::octet_load ol (sz);
-  ol.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  CORBA::Request_var *request;
-  ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-  for (int i = 0; i < niterations; ++i)
-    {
-      int j;
-
-      for (j = 0; j != burst; ++j)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          request[j] =
-            roundtrip->_request ("test_octet_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          request[j]->add_in_arg ("octet_load") <<= ol;
-          request[j]->add_in_arg ("send_time") <<= start;
-                  request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      for (j = 0; j != burst; ++j)
-        {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          CORBA::ULongLong retval;
-          if ((request[j]->return_value () >>= retval) == 1)
-            {
-              ACE_hrtime_t now = ACE_OS::gethrtime ();
-              history.sample (ACE_HRTIME_TO_U64(now) - retval);
-            }
-        }
-    }
-  delete[] request;
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-  return 0;
-}
-
-
-int
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::long_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  CORBA::Request_var *request;
-  ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-  for (int i = 0; i < niterations; ++i)
-    {
-      int j;
-
-      for (j = 0; j != burst; ++j)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          request[j] =
-            roundtrip->_request ("test_long_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          request[j]->add_in_arg ("long_load") <<= ll;
-          request[j]->add_in_arg ("send_time") <<= start;
-                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      for (j = 0; j != burst; ++j)
-        {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          CORBA::ULongLong retval;
-          if ((request[j]->return_value () >>= retval) == 1)
-            {
-              ACE_hrtime_t now = ACE_OS::gethrtime ();
-              history.sample (ACE_HRTIME_TO_U64(now) - retval);
-            }
-        }
-    }
-  delete[] request;
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-  return 0;
-}
-
-
-int
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::short_load sl (sz);
-  sl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  CORBA::Request_var *request;
-  ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-  for (int i = 0; i < niterations; ++i)
-    {
-      int j;
-
-      for (j = 0; j != burst; ++j)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          request[j] =
-            roundtrip->_request ("test_short_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          request[j]->add_in_arg ("short_load") <<= sl;
-          request[j]->add_in_arg ("send_time") <<= start;
-                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      for (j = 0; j != burst; ++j)
-        {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          CORBA::ULongLong retval;
-          if ((request[j]->return_value () >>= retval) == 1)
-            {
-              ACE_hrtime_t now = ACE_OS::gethrtime ();
-              history.sample (ACE_HRTIME_TO_U64(now) - retval);
-            }
-        }
-    }
-  delete[] request;
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-  return 0;
-}
-
-
-int
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::char_load cl (sz);
-  cl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  CORBA::Request_var *request;
-  ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-  for (int i = 0; i < niterations; ++i)
-    {
-      int j;
-
-      for (j = 0; j != burst; ++j)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          request[j] =
-            roundtrip->_request ("test_char_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          request[j]->add_in_arg ("char_load") <<= cl;
-          request[j]->add_in_arg ("send_time") <<= start;
-                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      for (j = 0; j != burst; ++j)
-        {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          CORBA::ULongLong retval;
-          if ((request[j]->return_value () >>= retval) == 1)
-            {
-              ACE_hrtime_t now = ACE_OS::gethrtime ();
-              history.sample (ACE_HRTIME_TO_U64(now) - retval);
-            }
-        }
-    }
-  delete[] request;
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-  return 0;
-}
-
-
-int
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::longlong_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  CORBA::Request_var *request;
-  ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-  for (int i = 0; i < niterations; ++i)
-    {
-      int j;
-
-      for (j = 0; j != burst; ++j)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          request[j] =
-            roundtrip->_request ("test_longlong_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          request[j]->add_in_arg ("longlong_load") <<= ll;
-          request[j]->add_in_arg ("send_time") <<= start;
-                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      for (j = 0; j != burst; ++j)
-        {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          CORBA::ULongLong retval;
-          if ((request[j]->return_value () >>= retval) == 1)
-            {
-              ACE_hrtime_t now = ACE_OS::gethrtime ();
-              history.sample (ACE_HRTIME_TO_U64(now) - retval);
-            }
-        }
-    }
-  delete[] request;
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-  return 0;
-}
-
-
-int
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::double_load dl (sz);
-  dl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-  CORBA::Request_var *request;
-  ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-  for (int i = 0; i < niterations; ++i)
-    {
-      int j;
-
-      for (j = 0; j != burst; ++j)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          request[j] =
-            roundtrip->_request ("test_double_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          request[j]->add_in_arg ("double_load") <<= dl;
-          request[j]->add_in_arg ("send_time") <<= start;
-                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      for (j = 0; j != burst; ++j)
-        {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          CORBA::ULongLong retval;
-          if ((request[j]->return_value () >>= retval) == 1)
-            {
-              ACE_hrtime_t now = ACE_OS::gethrtime ();
-              history.sample (ACE_HRTIME_TO_U64(now) - retval);
-            }
-        }
-    }
-  delete[] request;
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-  return 0;
-}
-
-
-
-// The main() function starts here
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-          Test::octet_load oc;
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-
-          // Test various sequence types
-
-          if (ACE_OS::strcmp (data_type, "octet") == 0 )
-        {
-          test_octet_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "char") == 0)
-        {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "long") == 0)
-        {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "short") == 0)
-        {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "double") == 0)
-        {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "longlong") == 0)
-        {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl b/TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl
deleted file mode 100755
index 6ad9631ca6c..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-print STDERR "================ Deferred Synchronous Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for Performance Test\n\n";
-        print "run_test  [-t type] \n";
-        print "\n";
-        print "-t type             -- runs only one type of param test\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 50000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (40);
-
-unlink $iorfile;
-
-
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
deleted file mode 100644
index 20ea98c2655..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Deferred_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
deleted file mode 100644
index c15a02cf58f..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null"
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
deleted file mode 100644
index a9d9071cbd8..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Latency/Deferred/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null"/>
-</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Makefile.am b/TAO/performance-tests/Sequence_Latency/Makefile.am
deleted file mode 100644
index f3e5d4f61bb..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        AMH_Single_Threaded \
-        AMI \
-        DII \
-        DSI \
-        Deferred \
-        Single_Threaded \
-        Thread_Per_Connection \
-        Thread_Pool
-
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
deleted file mode 100644
index c352e76e3e6..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
+++ /dev/null
@@ -1,113 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Single_Threaded_Sequence_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Single_Threaded_Sequence_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Roundtrip.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Single_Threaded_Sequence_Server.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
deleted file mode 100644
index 83dde3b6f0e..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-
-Test::Timestamp
-Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
deleted file mode 100644
index a2c066ceda6..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-{
-public:
-
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
deleted file mode 100644
index 9cb41beface..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*sequence_idl): taoidldefaults, strategies {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*sequence server) : taoserver, strategies {
-  after += *sequence_idl
-  Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
-    TestC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*sequence client): taoclient, strategies {
-  after += *sequence_idl
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl
deleted file mode 100644
index 8589f1e7a79..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
deleted file mode 100644
index 2352cf06b92..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ /dev/null
@@ -1,451 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int sz = 512;
-int do_dump_history = 0;
-int do_shutdown = 1;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "ht:xs:k:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "-h (dump history) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-void
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::octet_load ol (sz);
-  ol.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_octet_method (ol,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "Octet test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::long_load ll (sz);
-  ll.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_long_method (ll,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::short_load sl (sz);
-  sl.length (sz);
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_short_method (sl,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::char_load cl (sz);
-  cl.length (sz);
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_char_method (cl,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::longlong_load ll (sz);
-  ll.length (sz);
-
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_longlong_method (ll,
-                                              start
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-void
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
-{
-  ACE_Sample_History history (niterations);
-
-  Test::double_load dl (sz);
-  dl.length (sz);
-
-
-  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-  for (int i = 0; i < niterations; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) roundtrip->test_double_method (dl,
-                                            start
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      history.sample (now - start);
-    }
-
-  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-  ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-  if (do_dump_history)
-    {
-      history.dump_samples ("HISTORY", gsf);
-    }
-
-  ACE_Basic_Stats stats;
-  history.collect_basic_stats (stats);
-  stats.dump_results ("Total", gsf);
-
-  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                         test_end - test_start,
-                                         stats.samples_count ());
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      Test::octet_load oc;
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (ACE_OS::strcmp (data_type, "octet") == 0 )
-        {
-          test_octet_seq (roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "char") == 0)
-        {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "long") == 0)
-        {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "short") == 0)
-        {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "double") == 0)
-        {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else if (ACE_OS::strcmp (data_type, "longlong") == 0)
-        {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf b/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf
deleted file mode 100644
index 981687f41f5..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-#
-# The file is empty, forcing the ORB to use its default configuration.
-#
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml b/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
deleted file mode 100644
index 03ac9dfa183..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <!--  The file is empty, forcing the ORB to use its default configuration. -->
- <!--  -->
-</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default_configuration.pl b/TAO/performance-tests/Sequence_Latency/Single_Threaded/default_configuration.pl
deleted file mode 100755
index e5788aeda7b..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default_configuration.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile     = PerlACE::LocalFile ("test.ior");
-$defaultconf = PerlACE::LocalFile ("default$PerlACE::svcconf_ext");
-
-print STDERR "================ Single-threaded (default) Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-      print "Run_Test Perl script for Performance Test\n\n";
-      print "run_test  [-t type] \n";
-      print "\n";
-      print "-t type             -- runs only one type of param test\n";
-      exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-      $type = $ARGV[$i + 1];
-      $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-ORBSvcConf $defaultconf"
-			    . " -o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-ORBSvcConf $defaultconf"
-                            . " -t $type -k file://$iorfile"
-                            . " -i 150000");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (10);
-
-unlink $iorfile;
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl b/TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl
deleted file mode 100755
index f5a860139d4..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-print STDERR "================ Single-threaded Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-      print "Run_Test Perl script for Performance Test\n\n";
-      print "run_test  [-t type] \n";
-      print "\n";
-      print "-t type             -- runs only one type of param test\n";
-      exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-      $type = $ARGV[$i + 1];
-      $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 150000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (10);
-
-unlink $iorfile;
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
deleted file mode 100644
index b3f4e9e135d..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
deleted file mode 100644
index 9e0c5ed01ed..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
deleted file mode 100644
index 5b2a58bb6f0..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/>
-</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
deleted file mode 100644
index 072b7a2888a..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-// $Id$
-//
-#include "Client_Task.h"
-#include "ace/OS_NS_time.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$")
-
-Client_Task::Client_Task (const char *data_type,
-                          int size,
-                          Test::Roundtrip_ptr roundtrip,
-                          int niterations)
-  : data_type_ (CORBA::string_dup (data_type))
-  , size_ (size)
-  , roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-  , niterations_ (niterations)
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ACE_OS::strcmp (this->data_type_.in (), "octet") == 0 )
-        {
-          this->test_octet_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "long") == 0 )
-        {
-          this->test_long_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "short") == 0 )
-        {
-          this->test_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "char") == 0 )
-        {
-          this->test_char_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "longlong") == 0 )
-        {
-          this->test_longlong_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "double") == 0 )
-        {
-          this->test_double_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
-                                  const char *msg,
-                                  ACE_UINT32 gsf)
-{
-  totals.accumulate (this->latency_);
-  this->latency_.dump_results (msg, gsf);
-}
-
-void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::ULongLong dummy = 0;
-  Test::octet_load oc;
-
-  for (int i = 0; i != 100; ++i)
-    {
-      ACE_TRY
-        {
-          (void) this->roundtrip_->test_octet_method (oc, dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
-
-void
-Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::octet_load ol (this->size_);
-  ol.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::long_load ll (this->size_);
-  ll.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-
-void
-Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::short_load sl (this->size_);
-  sl.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::char_load cl (this->size_);
-  cl.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::longlong_load ll (this->size_);
-  ll.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::double_load dl (this->size_);
-  dl.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
deleted file mode 100644
index 340878b4354..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-#include /**/ "ace/pre.h"
-
-#include "TestC.h"
-#include "ace/Task.h"
-#include "ace/Basic_Stats.h"
-
-/// Implement the Test::Client_Task interface
-class Client_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Client_Task (const char *data_type,
-                           int size,
-               Test::Roundtrip_ptr roundtrip,
-               int niterations);
-
-  /// Add this thread results to the global numbers and print the
-  /// per-thread results.
-  void accumulate_and_dump (ACE_Basic_Stats &totals,
-                            const char *msg,
-                            ACE_UINT32 gsf);
-
-  /// The service method
-  virtual int svc (void);
-
-private:
-  /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Some performance test methods
-  void test_octet_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_long_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_short_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_char_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_double_seq (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  /// The data type of the sequence load to be tested
-  CORBA::String_var data_type_;
-
-  /// The size of the sequence data
-  int size_;
-
-  /// The object reference used for this test
-  Test::Roundtrip_var roundtrip_;
-
-  /// The number of iterations
-  int niterations_;
-
-  /// Keep track of the latency (minimum, average, maximum and jitter)
-  ACE_Basic_Stats latency_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
deleted file mode 100644
index 57d239f16e9..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Thread_Per_Conn_Sequence_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Thread_Per_Conn_Sequence_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Thread_Per_Conn_Sequence_Server.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Roundtrip.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/README b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/README
deleted file mode 100644
index d6cb2abb4f2..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/README
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-
-@page Single Threaded Sequence Latency Performance Test README File
-
-	This test tries to estimate the minimum latency for a twoway
-request.  The test uses a single threaded client and server, and
-configures the ORB to eliminate common sources of overhead, such as
-locking. This test uses sequence of various data types.
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful, and prints
-out the performance numbers.
-
-*/
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
deleted file mode 100644
index 74274ddbab5..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Per_Connection_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
deleted file mode 100644
index 5b1758055af..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl
deleted file mode 100644
index efe330265e3..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
deleted file mode 100644
index 160d90fec3f..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*sequence_idl): taoidldefaults, strategies {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*sequence server): taoserver, strategies {
-  after += *sequence_idl
-  Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
-    TestC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*sequence client): taoclient, strategies {
-  after += *sequence_idl
-  Source_Files {
-    TestC.cpp
-    Client_Task.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
deleted file mode 100644
index af752262c0d..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// $Id$
-
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int do_shutdown = 1;
-int sz = 512;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-	  
-	  case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-	  
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-t <datatype> "
-						   "-s <size> "
-						   "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-	  /// Begin the test
-
-	  ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
-
-	  Client_Task task0(data_type, sz, roundtrip.in (), niterations);
-	  Client_Task task1(data_type, sz, roundtrip.in (), niterations);
-	  Client_Task task2(data_type, sz, roundtrip.in (), niterations);
-	  Client_Task task3(data_type, sz, roundtrip.in (), niterations);
-
-	  ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-	  task0.activate(THR_NEW_LWP | THR_JOINABLE);
-	  task1.activate(THR_NEW_LWP | THR_JOINABLE);
-	  task2.activate(THR_NEW_LWP | THR_JOINABLE);
-	  task3.activate(THR_NEW_LWP | THR_JOINABLE);
-
-	  task0.thr_mgr()->wait ();
-	  ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-	  ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
-
-	  ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-	  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-	  ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-	  ACE_Basic_Stats totals;
-	  task0.accumulate_and_dump (totals, "Task[0]", gsf);
-	  task1.accumulate_and_dump (totals, "Task[1]", gsf);
-	  task2.accumulate_and_dump (totals, "Task[2]", gsf);
-	  task3.accumulate_and_dump (totals, "Task[3]", gsf);
-
-	  totals.dump_results ("Total", gsf);
-
-	  ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-											 test_end - test_start,
-											 totals.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl
deleted file mode 100755
index c563ac7d972..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-print STDERR "================ Thread-Per-Connection Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for Performance Test\n\n";
-        print "run_test  [-t type] \n";
-        print "\n";
-        print "-t type             -- runs only one type of param test\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 50000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (40);
-
-unlink $iorfile;
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
deleted file mode 100644
index 26f9ed145c8..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf
deleted file mode 100644
index f6f2ef699ee..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
deleted file mode 100644
index 30eb65ebcfa..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Latency/Thread_Per_Connection/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection"/>
-</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
deleted file mode 100644
index 66daa358433..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-// $Id$
-//
-#include "Client_Task.h"
-#include "ace/OS_NS_time.h"
-
-ACE_RCSID(Thread_Pool_Latency, Client_Task, "$Id$")
-
-Client_Task::Client_Task (const char *data_type,
-                          int size,
-                          Test::Roundtrip_ptr roundtrip,
-                          int niterations)
-  : data_type_ (CORBA::string_dup (data_type))
-  , size_ (size)
-  , roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-  , niterations_ (niterations)
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ACE_OS::strcmp (this->data_type_.in (), "octet") == 0 )
-        {
-          this->test_octet_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "long") == 0 )
-        {
-          this->test_long_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "short") == 0 )
-        {
-          this->test_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "char") == 0 )
-        {
-          this->test_char_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "longlong") == 0 )
-        {
-          this->test_longlong_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      if (ACE_OS::strcmp (this->data_type_.in (), "double") == 0 )
-        {
-          this->test_double_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
-                                  const char *msg,
-                                  ACE_UINT32 gsf)
-{
-  totals.accumulate (this->latency_);
-  this->latency_.dump_results (msg, gsf);
-}
-
-void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::ULongLong dummy = 0;
-  Test::octet_load oc;
-
-  for (int i = 0; i != 100; ++i)
-    {
-      ACE_TRY
-        {
-          (void) this->roundtrip_->test_octet_method (oc, dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
-
-void
-Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::octet_load ol (this->size_);
-  ol.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::long_load ll (this->size_);
-  ll.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-
-void
-Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::short_load sl (this->size_);
-  sl.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::char_load cl (this->size_);
-  cl.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::longlong_load ll (this->size_);
-  ll.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
-
-void
-Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Test::double_load dl (this->size_);
-  dl.length (this->size_);
-
-  for (int i = 0; i != this->niterations_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      (void) this->roundtrip_->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->latency_.sample (now - start);
-
-    }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
deleted file mode 100644
index 340878b4354..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-#include /**/ "ace/pre.h"
-
-#include "TestC.h"
-#include "ace/Task.h"
-#include "ace/Basic_Stats.h"
-
-/// Implement the Test::Client_Task interface
-class Client_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Client_Task (const char *data_type,
-                           int size,
-               Test::Roundtrip_ptr roundtrip,
-               int niterations);
-
-  /// Add this thread results to the global numbers and print the
-  /// per-thread results.
-  void accumulate_and_dump (ACE_Basic_Stats &totals,
-                            const char *msg,
-                            ACE_UINT32 gsf);
-
-  /// The service method
-  virtual int svc (void);
-
-private:
-  /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Some performance test methods
-  void test_octet_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_long_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_short_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_char_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_double_seq (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  /// The data type of the sequence load to be tested
-  CORBA::String_var data_type_;
-
-  /// The size of the sequence data
-  int size_;
-
-  /// The object reference used for this test
-  Test::Roundtrip_var roundtrip_;
-
-  /// The number of iterations
-  int niterations_;
-
-  /// Keep track of the latency (minimum, average, maximum and jitter)
-  ACE_Basic_Stats latency_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
deleted file mode 100644
index 0596650c04f..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Thread_Pool_Sequence_Idl.am
-
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Thread_Pool_Sequence_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Client_Task.cpp \
-  TestC.cpp \
-  client.cpp \
-  Client_Task.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Makefile.Thread_Pool_Sequence_Server.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Roundtrip.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  Worker_Thread.cpp \
-  server.cpp \
-  Roundtrip.h \
-  Worker_Thread.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/README b/TAO/performance-tests/Sequence_Latency/Thread_Pool/README
deleted file mode 100644
index 53770acd916..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/README
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-
-@page Thread Pool Sequence Latency Test README File
-
-	This test tries to estimate the minimum latency for the
-Thread-Pool concurrency model for sequences of different data
-types and sizes.  The test uses a multi-threaded client
-and server.
-
-	
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful, and prints
-out the performance numbers.
-
-*/
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
deleted file mode 100644
index d5e5f17b1cd..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Thread_Pool_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-Test::Timestamp
-Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
deleted file mode 100644
index 5b1758055af..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl
deleted file mode 100644
index 8589f1e7a79..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  typedef sequence<octet> octet_load;
-  typedef sequence<long> long_load;
-  typedef sequence<char> char_load;
-  typedef sequence<short> short_load;
-  typedef sequence<long long> longlong_load;
-  typedef sequence<double> double_load;
-
-  /// Measure roundtrip delay
-  interface Roundtrip
-  {
-    /// A simple method to measure roundtrip delays
-    /**
-     * The operation simply returns one of its argument, this is used
-     * in AMI  and deferred synchronous tests to measure the roundtrip
-     * delay without the need for a different reply handler for each
-     * request.
-     */
-    Timestamp test_octet_method (in octet_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_long_method (in long_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_short_method (in short_load ol,
-                                 in Timestamp send_time);
-
-    Timestamp test_char_method (in char_load ol,
-                                in Timestamp send_time);
-
-    Timestamp test_longlong_method (in longlong_load ol,
-                                    in Timestamp send_time);
-
-    Timestamp test_double_method (in double_load ol,
-                                 in Timestamp send_time);
-
-    /// Shutdown the ORB
-    void shutdown ();
-  };
-};
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
deleted file mode 100644
index df4e8aa4ae6..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*sequence_idl): taoidldefaults, strategies {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*sequence server): taoserver, strategies {
-  after += *sequence_idl
-  Source_Files {
-    Roundtrip.cpp
-    TestS.cpp
-    TestC.cpp
-    Worker_Thread.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*sequence client): taoclient, strategies {
-  after += *sequence_idl
-  Source_Files {
-    TestC.cpp
-    Client_Task.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
deleted file mode 100644
index e485bb2b843..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-#include "Worker_Thread.h"
-
-ACE_RCSID(Thread_Pool_Latency, Worker_Thread, "$Id$")
-
-Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Worker_Thread::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY {} ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
deleted file mode 100644
index 7168f88602b..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#ifndef WORKER_THREAD_H
-#define WORKER_THREAD_H
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB.h"
-#include "ace/Task.h"
-
-/// Implement the Test::Worker_Thread interface
-class Worker_Thread : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Worker_Thread (CORBA::ORB_ptr orb);
-
-  // = The service method
-  virtual int svc (void);
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* WORKER_THREAD_H */
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
deleted file mode 100644
index f12757f7de8..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// $Id$
-
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Pool_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int do_shutdown = 1;
-int sz = 512;
-
-const char *data_type = "octet";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        data_type = get_opts.opt_arg ();
-
-        if (ACE_OS::strcmp (data_type, "octet") != 0 &&
-            ACE_OS::strcmp (data_type, "char") != 0 &&
-            ACE_OS::strcmp (data_type, "long") != 0 &&
-            ACE_OS::strcmp (data_type, "short") != 0 &&
-            ACE_OS::strcmp (data_type, "double") != 0 &&
-            ACE_OS::strcmp (data_type, "longlong") != 0)
-          return -1;
-        break;
-
-          case 's':
-        sz = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-t <datatype> "
-                                                   "-s <size> "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-          /// Begin the test
-
-      ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
-
-      Client_Task task0 (data_type, sz, roundtrip.in (), niterations);
-      Client_Task task1 (data_type, sz, roundtrip.in (), niterations);
-      Client_Task task2 (data_type, sz, roundtrip.in (), niterations);
-      Client_Task task3 (data_type, sz, roundtrip.in (), niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      task0.activate (THR_NEW_LWP | THR_JOINABLE);
-      task1.activate (THR_NEW_LWP | THR_JOINABLE);
-      task2.activate (THR_NEW_LWP | THR_JOINABLE);
-      task3.activate (THR_NEW_LWP | THR_JOINABLE);
-
-      task0.thr_mgr()->wait ();
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      ACE_Basic_Stats totals;
-      task0.accumulate_and_dump (totals, "Task[0]", gsf);
-      task1.accumulate_and_dump (totals, "Task[1]", gsf);
-      task2.accumulate_and_dump (totals, "Task[2]", gsf);
-      task3.accumulate_and_dump (totals, "Task[3]", gsf);
-
-      totals.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             totals.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl b/TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl
deleted file mode 100755
index a9aa52f43c0..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-print STDERR "================ Thread_Pool Latency Test\n";
-
-unlink $iorfile;
-
-my $type = 'octet';
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for Performance Test\n\n";
-        print "run_test  [-t type] \n";
-        print "\n";
-        print "-t type             -- runs only one type of param test\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$SV = new PerlACE::Process ("server",
-                            "-o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            "-t $type -k file://$iorfile "
-                            . " -i 150000");
-
-print STDERR $CL->CommandLine () ;
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (420);
-$server = $SV->WaitKill (40);
-
-unlink $iorfile;
-
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-
-exit $status;
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
deleted file mode 100644
index 2f0ba140ea3..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "Worker_Thread.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/OS_NS_errno.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Pool_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Worker_Thread worker (orb.in ());
-
-      worker.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1);
-      worker.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf
deleted file mode 100644
index 46ff5409fdf..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
deleted file mode 100644
index d47d971ed22..00000000000
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Latency/Thread_Pool/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
- <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
-</ACE_Svc_Conf>