diff options
author | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-07-24 15:50:11 +0000 |
---|---|---|
committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-07-24 15:50:11 +0000 |
commit | 6b846cf03c0bcbd8c276cb0af61a181e5f98eaae (patch) | |
tree | da50d054f9c761c3f6a5923f6979e93306c56d68 /TAO/performance-tests/Memory | |
parent | 0e555b9150d38e3b3473ba325b56db2642e6352b (diff) | |
download | ATCD-6b846cf03c0bcbd8c276cb0af61a181e5f98eaae.tar.gz |
Repo restructuring
Diffstat (limited to 'TAO/performance-tests/Memory')
19 files changed, 0 insertions, 972 deletions
diff --git a/TAO/performance-tests/Memory/IORsize/Foo_i.cpp b/TAO/performance-tests/Memory/IORsize/Foo_i.cpp deleted file mode 100644 index 691fd24ab34..00000000000 --- a/TAO/performance-tests/Memory/IORsize/Foo_i.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "Foo_i.h" - -ACE_RCSID(IORSize, - Foo_i, - "$Id$") diff --git a/TAO/performance-tests/Memory/IORsize/Foo_i.h b/TAO/performance-tests/Memory/IORsize/Foo_i.h deleted file mode 100644 index 7640b9d7579..00000000000 --- a/TAO/performance-tests/Memory/IORsize/Foo_i.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// $Id$ -// -#ifndef FOO_I_H -#define FOO_I_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::Hello interface -class Foo_i - : public virtual POA_Test::Foo -{ -public: - Foo_i (CORBA::ORB_ptr p) - : orb_ (CORBA::ORB::_duplicate (p)) {} - -private: - CORBA::ORB_var orb_; -}; - -#if defined(_MSC_VER) -# pragma warning(pop) -#endif /* _MSC_VER */ - -#include /**/ "ace/post.h" -#endif /*FOO_I_H*/ diff --git a/TAO/performance-tests/Memory/IORsize/Makefile.am b/TAO/performance-tests/Memory/IORsize/Makefile.am deleted file mode 100644 index e29753ed209..00000000000 --- a/TAO/performance-tests/Memory/IORsize/Makefile.am +++ /dev/null @@ -1,100 +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) - -## Makefile.Memory_IORsize_Idl.am - -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) -Sa -St $(srcdir)/Test.idl - @touch $@ - - -noinst_HEADERS = \ - Test.idl - -## Makefile.Memory_IORsize_Client.am - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Foo_i.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Foo_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Memory_IORsize_Server.am - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Memory_Growth.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Memory_Growth.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## 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/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp deleted file mode 100644 index fd523b90fe6..00000000000 --- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// $Id$ -// -#include "Memory_Growth.h" -#include "ace/Manual_Event.h" - -ACE_RCSID (IORSize, - Memory_Growth, - "$Id$") - -Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -void -Memory_Growth::send_objref (const Test::PayLoad & /*p*/ - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_Manual_Event me; - - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Going to wait .. \n")); - - me.wait (); - - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Wokeup from wait .. \n")); - return; -} - -void -Memory_Growth::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/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h deleted file mode 100644 index f1f2b5646af..00000000000 --- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// $Id$ -// - -#ifndef MEMORY_GROWTH_H -#define MEMORY_GROWTH_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::Hello interface -class Memory_Growth - : public virtual POA_Test::Memory_Growth -{ -public: - /// Constructor - Memory_Growth (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual void send_objref (const Test::PayLoad &p - 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 /* MEMORY_GROWTH_H */ diff --git a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc deleted file mode 100644 index 0fe46138f86..00000000000 --- a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc +++ /dev/null @@ -1,38 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*idl): taoidldefaults { - idl_files { - Test.idl - } - custom_only = 1 -} - -project(*client) : taoserver { - after += *idl - - exename = client - source_files { - client.cpp - Foo_i.cpp - TestS.cpp - TestC.cpp - } - - idl_files { - } -} - -project(*server) : taoserver { - after += *idl - - source_files { - server.cpp - Memory_Growth.cpp - TestS.cpp - TestC.cpp - } - - idl_files { - } -} diff --git a/TAO/performance-tests/Memory/IORsize/Test.idl b/TAO/performance-tests/Memory/IORsize/Test.idl deleted file mode 100644 index fed95b2a5ff..00000000000 --- a/TAO/performance-tests/Memory/IORsize/Test.idl +++ /dev/null @@ -1,29 +0,0 @@ -// -// $Id$ -// - -/// Put the interfaces in a module, to avoid global namespace pollution -module Test -{ - /// A very simple interface, sequences of which will be transferred - /// from the client to the server. - interface Foo - { - }; - - typedef sequence<Foo> PayLoad; - - /// A very simple interface for testing - interface Memory_Growth - { - /// A simple call which we will use to send BIG sequences to the - /// server - void send_objref (in Test::PayLoad p); - - /// A method to shutdown the ORB - /** - * This method is used to simplify the test shutdown process - */ - oneway void shutdown (); - }; -}; diff --git a/TAO/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp deleted file mode 100644 index f883c9d7749..00000000000 --- a/TAO/performance-tests/Memory/IORsize/client.cpp +++ /dev/null @@ -1,121 +0,0 @@ -// $Id$ - -#include "TestC.h" -#include "ace/Get_Opt.h" -#include "TestS.h" -#include "Foo_i.h" - -ACE_RCSID(Hello, client, "$Id$") - -const char *ior = "file://test.ior"; -static int n = 10; -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:n:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'n': - n = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k <ior> " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - 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; - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (parse_args (argc, argv) != 0) - return 1; - - Foo_i *foo_i; - ACE_NEW_RETURN (foo_i, - Foo_i (orb.in ()), - 1); - - PortableServer::ServantBase_var owner_transfer(foo_i); - - Test::Foo_var foo = - foo_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Memory_Growth_var mem = - Test::Memory_Growth::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (mem.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil Test::Hello reference <%s>\n", - ior), - 1); - } - - // Make a sequence.. - Test::PayLoad pl (50000); - pl.length (50000); - - for (CORBA::ULong l = 0; - l != pl.length (); - l++) - { - pl[l] = foo; - } - - // Make a few calls to the remote object - for (int iter = 0; iter != n; iter++) - { - mem->send_objref (pl - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - // Let us run the event loop. This way we will not exit - orb->run (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/Memory/IORsize/server.conf b/TAO/performance-tests/Memory/IORsize/server.conf deleted file mode 100644 index ceceaf7a2e0..00000000000 --- a/TAO/performance-tests/Memory/IORsize/server.conf +++ /dev/null @@ -1,2 +0,0 @@ -# $Id$ -static Resource_Factory "-ORBResourceUsage lazy" diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp deleted file mode 100644 index 712dafdf097..00000000000 --- a/TAO/performance-tests/Memory/IORsize/server.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// $Id$ - -#include "Memory_Growth.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" - -ACE_RCSID (Hello, - 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[]) -{ - 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; - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (root_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Panic: nil RootPOA\n"), - 1); - - 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; - - Memory_Growth *memory; - ACE_NEW_RETURN (memory, - Memory_Growth (orb.in ()), - 1); - - PortableServer::ServantBase_var owner_transfer(memory); - - Test::Memory_Growth_var mem = - memory->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (mem.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Output the IOR to the <ior_output_file> - 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; - - // Run the evnt loop for ever - 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/Memory/Makefile.am b/TAO/performance-tests/Memory/Makefile.am deleted file mode 100644 index b090b6edf6c..00000000000 --- a/TAO/performance-tests/Memory/Makefile.am +++ /dev/null @@ -1,14 +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 = \ - IORsize \ - Single_Threaded - diff --git a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am deleted file mode 100644 index 4f61f97705b..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am +++ /dev/null @@ -1,96 +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) - -## Makefile.Memory_Growth_Idl.am - -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) -Sa -St -Sa -St $(srcdir)/Test.idl - @touch $@ - - -noinst_HEADERS = \ - Test.idl - -## Makefile.Memory_Growth_Client.am - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Memory_Growth.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Memory_Growth_Server.am - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Memory_Growth.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Memory_Growth.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## 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/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp deleted file mode 100644 index 71113a02bf4..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// -// $Id$ -// -#include "Memory_Growth.h" - -ACE_RCSID(Hello, Hello, "$Id$") - -Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -void -Memory_Growth::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return; -} - -void -Memory_Growth::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/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h deleted file mode 100644 index 9f4ae96b84d..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// $Id$ -// - -#ifndef MEMORY_GROWTH_H -#define MEMORY_GROWTH_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::Hello interface -class Memory_Growth - : public virtual POA_Test::Memory_Growth -{ -public: - /// Constructor - Memory_Growth (CORBA::ORB_ptr orb); - - // = The skeleton methods - virtual void ping (ACE_ENV_SINGLE_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 /* MEMORY_GROWTH_H */ diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc deleted file mode 100644 index 4d5113ec925..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc +++ /dev/null @@ -1,35 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*idl): taoidldefaults { - idlflags += -Sa -St - - IDL_Files { - Test.idl - } - - custom_only = 1 -} - -project(*server): taoserver { - after += *idl - Source_Files { - Memory_Growth.cpp - server.cpp - TestS.cpp - TestC.cpp - } - IDL_Files { - } -} - -project(*client): taoclient { - after += *idl - Source_Files { - TestC.cpp - client.cpp - } - IDL_Files { - } -} - diff --git a/TAO/performance-tests/Memory/Single_Threaded/README b/TAO/performance-tests/Memory/Single_Threaded/README deleted file mode 100644 index e83f3663b44..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/README +++ /dev/null @@ -1,10 +0,0 @@ -/** - -@page Single_Threaded Test README File - - This is a simple test to track memory usage of the executables -ie. size of task's code + data + stack space. This will not be run -in our daily builds. This will be used only to see the memory used -by the executables. This is just a start for more things to come. - -*/ diff --git a/TAO/performance-tests/Memory/Single_Threaded/Test.idl b/TAO/performance-tests/Memory/Single_Threaded/Test.idl deleted file mode 100644 index 20a5d04a06f..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/Test.idl +++ /dev/null @@ -1,20 +0,0 @@ -// -// $Id$ -// - -/// Put the interfaces in a module, to avoid global namespace pollution -module Test -{ - /// A very simple interface - interface Memory_Growth - { - /// A simple ping call. - void ping (); - - /// A method to shutdown the ORB - /** - * This method is used to simplify the test shutdown process - */ - oneway void shutdown (); - }; -}; diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp deleted file mode 100644 index 50c39fc24fd..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// $Id$ - -#include "TestC.h" -#include "ace/Get_Opt.h" - -ACE_RCSID(Hello, client, "$Id$") - -const char *ior = "file://test.ior"; -static int n = 100; -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "k:n:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'n': - n = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k <ior> " - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -int -main (int argc, char *argv[]) -{ - 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 tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - Test::Memory_Growth_var mem = - Test::Memory_Growth::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (mem.in ())) - { - ACE_ERROR_RETURN ((LM_DEBUG, - "Nil Test::Hello reference <%s>\n", - ior), - 1); - } - - // Make a few calls to the remote object - for (int iter = 0; iter != n; iter++) - { - mem->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - - // Let us run the event loop. This way we will not exit - orb->run (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/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp deleted file mode 100644 index 712dafdf097..00000000000 --- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// $Id$ - -#include "Memory_Growth.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" - -ACE_RCSID (Hello, - 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[]) -{ - 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; - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (CORBA::is_nil (root_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Panic: nil RootPOA\n"), - 1); - - 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; - - Memory_Growth *memory; - ACE_NEW_RETURN (memory, - Memory_Growth (orb.in ()), - 1); - - PortableServer::ServantBase_var owner_transfer(memory); - - Test::Memory_Growth_var mem = - memory->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::String_var ior = - orb->object_to_string (mem.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Output the IOR to the <ior_output_file> - 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; - - // Run the evnt loop for ever - 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; -} |