summaryrefslogtreecommitdiff
path: root/TAO/performance-tests/Cubit/TAO/DII_Cubit
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/performance-tests/Cubit/TAO/DII_Cubit')
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw29
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile353
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/README47
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp804
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp120
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl153
-rwxr-xr-xTAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl33
7 files changed, 0 insertions, 1539 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw
deleted file mode 100644
index 3e83cd1bc20..00000000000
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "client"=.\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
deleted file mode 100644
index e5c83793836..00000000000
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ /dev/null
@@ -1,353 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-# Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
- TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-DIRS = ../IDL_Cubit
-
-LDLIBS = ../IDL_Cubit/.obj/cubitC.o \
- ../IDL_Cubit/.obj/cubitS.o \
- -lTAO
-
-PROG_SRCS = client.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_CLT_OBJS = client.o
-
-CFLAGS += -I../IDL_Cubit
-
-BIN = client
-BUILD = $(BIN) ../IDL_Cubit/server
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-# Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-# Local targets
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs \
- -L$(TAO_ROOT)/tao \
- -L$(TAO_ROOT)/orbsvcs/Naming_Service
-
-ifeq ($(CXX),cxx)
- ifeq ($(findstring ptrepository,$(CCFLAGS)),ptrepository)
- #### Digital Unix 4.0
- CCFLAGS += -ptr ../IDL_Cubit/ptrepository
- endif # CCFLAGS contains ptrepository
-else
-ifeq (-xildoff,$(findstring -xildoff,$(LDFLAGS)))
- #### Sun CC
- CCFLAGS += -ptr. -ptr../IDL_Cubit
-endif # Sun CC
-endif # cxx
-
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-
-.PRECIOUS: cubitC.cpp cubitS.cpp cubitC.h cubitS.h
-
-client: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-../IDL_Cubit/server:
- cd ../IDL_Cubit; $(MAKE) BUILD=server
-
-realclean: clean
- -/bin/rm -rf cubitC.* cubitS.* cubitS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/IIOP_Acceptor.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Env_Value_T.h \
- $(ACE_ROOT)/ace/Env_Value_T.i \
- $(ACE_ROOT)/ace/Env_Value_T.cpp \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
- ../IDL_Cubit/cubitC.h ../IDL_Cubit/cubitC.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/README b/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
deleted file mode 100644
index f7afda6d95c..00000000000
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-This is the cubit example that does everything using DII requests.
-It uses the server in IDL_Cubit. Getting a reference
-to the Cubit object, making the Cubit operation calls,
-and shutting down the server are all done with DII requests.
-
-NOTES: The IDL_Cubit server used to run a Naming Service so the client
- could easily locate it. This proved too problematic, the test
- required a complete compilation of the orbsvcs library and was
- not reliable. The preferred method is to use a file to pass
- the factory IOR between the server and the client.
-
-To run the tests with one "button-push", execute the perl script run_test.pl
-in this directory. It will start up the server and client. The client will
-shut down the server when the tests are finished.
-
-If you want to run each executable separately and manually, run the
-server first (in IDL_Cubit). Then run the client with zero or more of
-the following args:
-
- [-d] Increments TAO_debug_level. It's additive, up
- to 2 levels of debugging.
-
- [-n <calls/loop>] Sets the # of calls per loop (default is 250).
-
- [-i <factory IOR>] For passing the IOR by hand.
-
- [-f <filename>] If server is run with [-o <filename>] option,
- it outputs its factory IOR to a file, which
- the client can read with this option.
-
- [-x] Shuts down server when finished.
-
-If using the -i option, you might want to run the server with the option
-[-ORBobjrefstyle url]. This will cause the server to display its IOR in a
-more human-readable form. The server can be run in the same window in the
-background, or in a different window.
-
-The command line options, default calls per loop, order and display format of the
-stats are all similar to those in the IDL_Cubit tests.
-
-On the Unix side, the Makefile will also build IDL_Cubit/server if
-necessary (thanks to David Levine). If the server exits when run on a
-Unix machine, it probbly means that someone else is also running it
-and the defaults port numbers have collided. Just add the arg
-[-ORBport 0] when running the server and it will get a new port number.
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
deleted file mode 100644
index ad00a9f4039..00000000000
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ /dev/null
@@ -1,804 +0,0 @@
-// $Id$
-
-
-// ============================================================================
-//
-// = LIBRARY
-// TAO/tests/Cubit/TAO/DII_Cubit
-//
-// = FILENAME
-// client.cpp
-//
-// = DESCRIPTION
-// This class implements a simple CORBA client of the Cubit
-// interface using DII functionality.
-//
-// = AUTHOR
-// Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "ace/Profile_Timer.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-// Since we don't yet have an interface repository or dynamic-Any, we
-// just get the info from the IDL-generated files, since we're mainly
-// interested in timing comparisons anyway.
-#include "../IDL_Cubit/cubitC.h"
-
-ACE_RCSID(DII_Cubit, client, "$Id$")
-
- // Some constants used below.
-const CORBA::ULong DEFAULT_LOOP_COUNT = 250;
-const char *DEFAULT_FACTORY_IOR = "ior00";
-const int SMALL_OCTET_SEQ_LENGTH = 16;
-const int LARGE_OCTET_SEQ_LENGTH = 4096;
-const int SMALL_LONG_SEQ_LENGTH = 4;
-const int LARGE_LONG_SEQ_LENGTH = 1024;
-const int NUMBER_OF_TESTS = 10;
-
-// Some macros for env checks used identically in each operation.
-#define CUBIT_CHECK_ENV_RETURN_VOID(PRINT_STRING) \
-if (this->env_.exception () != 0) \
-{ \
- this->error_count_++; \
- this->env_.print_exception (PRINT_STRING); \
- return; \
-}
-
-#define REQUEST_CHECK_ENV_RETURN_VOID(REQ, PRINT_STRING) \
-if (REQ->env ()->exception () != 0) \
-{ \
- this->error_count_++; \
- REQ->env ()->print_exception (PRINT_STRING); \
- return; \
-}
-
-class DII_Cubit_Client
-{
- // = TITLE
- // Defines a class that encapsulates behaviour of a Cubit client
- // that makes requests using DII rather than stubs.
- //
- // = DESCRIPTION
- // This class declares an interface to run an example client for
- // a Cubit CORBA server. All the complexity for initializing the
- // client is hidden in the class. Just the run() interface is
- // needed.
-public:
- // = Constructor and destructor.
- DII_Cubit_Client (void);
- // Constructor.
-
- ~DII_Cubit_Client (void);
- // Destructor.
-
- int init (int argc, char **argv);
- // Initialize the ORB and gets the Cubit objref.
-
- int run (void);
- // Execute client example code.
-
-private:
- int init_naming_service (void);
- // Gets objref through naming service.
-
- int parse_args (void);
- // Parses the arguments passed on the command line.
-
- int read_ior (char *filename);
- // Function to read the cubit factory IOR from a file.
-
- void print_stats (const char *call_name,
- ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
- // Prints the timing stats.
-
- // = DII versions of Cubit operations:
-
- void cube_short_dii (void);
- void cube_long_dii (void);
- void cube_octet_dii (void);
- void cube_union_dii (void);
- void cube_struct_dii (void);
- void cube_octet_seq_dii (int length);
- void cube_long_seq_dii (int length);
-
- // = Wrappers for cubing small and large sequences w/o args:
-
- void cube_small_long_seq (void);
- void cube_large_long_seq (void);
- void cube_small_octet_seq (void);
- void cube_large_octet_seq (void);
- void cube_mixin (void);
- // Wrapper for the mixin call, just to be neat.
-
- void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])(void);
- // Array of pointers to the operation functions.
-
- static char *stats_messages_[];
- // Array of labels for passing to print_stats.
-
- int argc_;
- // # of arguments on the command line.
-
- char **argv_;
- // arguments from command line.
-
- CORBA::ULong loop_count_;
- // # of calls in test loop.
-
- int shutdown_;
- // Flag to tell server to exit.
-
- CORBA::Environment env_;
- // Environment variable.
-
- CORBA::ORB_var orb_var_;
- // Storage of the ORB reference.
-
- CORBA::Object_var factory_var_;
- // Storage of the Cubit_factory objref
-
- CORBA::Object_var obj_var_;
- // Storage of the Cubit objref.
-
- CORBA::ULong call_count_;
- // # of calls made to functions.
-
- CORBA::ULong error_count_;
- // # of errors incurred in the lifetime of the application.
-
- char *factory_IOR_;
- // IOR of the factory used to make a Cubit object.
-
- FILE *cubit_factory_ior_file_;
- // File from which to obtain the IOR.
-
- ACE_HANDLE f_handle_;
- // File handle to read the IOR.
-};
-
-// Constructor
-DII_Cubit_Client::DII_Cubit_Client (void)
- : loop_count_ (DEFAULT_LOOP_COUNT),
- shutdown_ (0),
- orb_var_ (0),
- factory_var_ (CORBA::Object::_nil ()),
- obj_var_ (CORBA::Object::_nil ()),
- call_count_ (0),
- error_count_ (0),
- factory_IOR_ (CORBA::string_dup (DEFAULT_FACTORY_IOR))
-{
- // Initialize the array of pointers-to-member-functions.
- this->op_array_[0] = &DII_Cubit_Client::cube_short_dii;
- this->op_array_[1] = &DII_Cubit_Client::cube_octet_dii;
- this->op_array_[2] = &DII_Cubit_Client::cube_long_dii;
- this->op_array_[3] = &DII_Cubit_Client::cube_struct_dii;
- this->op_array_[4] = &DII_Cubit_Client::cube_union_dii;
- this->op_array_[5] = &DII_Cubit_Client::cube_small_long_seq;
- this->op_array_[6] = &DII_Cubit_Client::cube_large_long_seq;
- this->op_array_[7] = &DII_Cubit_Client::cube_small_octet_seq;
- this->op_array_[8] = &DII_Cubit_Client::cube_large_octet_seq;
- this->op_array_[9] = &DII_Cubit_Client::cube_mixin;
-}
-
-// Destructor
-DII_Cubit_Client::~DII_Cubit_Client (void)
-{
- CORBA::string_free (this->factory_IOR_);
-}
-
-// An array of messages to pass to print_stats, so we can step through
-// this along with op_array_.
-char *DII_Cubit_Client::stats_messages_[] =
-{
- "DII cube_short",
- "DII cube_octet",
- "DII cube_long",
- "DII cube_struct",
- "DII cube_union",
- "DII cube_small_sequence<long>",
- "DII cube_large_sequence<long>",
- "DII cube_small_sequence<octet>",
- "DII cube_large_sequence<octet>",
- "DII cube mixin (short/octet/long)"
-};
-
-int
-DII_Cubit_Client::init (int argc, char **argv)
-{
- // Nice and safe.
- this->argc_ = argc;
- this->argv_ = argv;
-
- TAO_TRY
- {
- // Initialize the ORB.
- this->orb_var_ = CORBA::ORB_init (this->argc_,
- this->argv_,
- "internet",
- TAO_TRY_ENV);
- TAO_CHECK_ENV;
-
- // Parse command line and verify parameters.
- if (this->parse_args () == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p\n",
- "DII_Cubit_Client::parse_args failed"),
- -1);
-
- // Get a factory object reference from the factory IOR.
- this->factory_var_ =
- this->orb_var_->string_to_object (this->factory_IOR_,
- TAO_TRY_ENV);
- TAO_CHECK_ENV;
-
- // Get a Cubit object with a DII request on the Cubit factory.
- CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit", TAO_TRY_ENV));
-
- TAO_CHECK_ENV;
-
- // make_cubit takes a char* arg that it doesn't use, but we must
- // still include it in the request.
- CORBA::String dummy = "";
-
- mc_req->add_in_arg () <<= dummy;
-
- mc_req->set_return_type (CORBA::_tc_Object);
-
- // Insert the result-holding variable into the request.
- mc_req->result ()->value ()->replace (CORBA::_tc_Object,
- &this->obj_var_,
- 0,
- TAO_TRY_ENV);
- TAO_CHECK_ENV;
-
- // Invoke the <make_cubit> operation to ask the Cubit factory
- // for a Cubit object.
- mc_req->invoke ();
-
- if (CORBA::is_nil (this->obj_var_.in ()))
- ACE_ERROR_RETURN ((LM_ERROR,
- " could not obtain Cubit object from Cubit factory <%s>\n"),
- -1);
- }
- TAO_CATCHANY
- {
- TAO_TRY_ENV.print_exception ("DII_Cubit_Client::init");
- return -1;
- }
- TAO_ENDTRY;
-
- return 0;
-}
-
-// Sort out the args in the command line.
-
-int
-DII_Cubit_Client::parse_args (void)
-{
- ACE_Get_Opt opts (argc_, argv_, "dn:i:f:x");
- int c;
- int result;
-
- while ((c = opts ()) != -1)
- switch (c)
- {
- case 'd': // debug flag
- TAO_debug_level++;
- break;
- case 'n': // loop count
- this->loop_count_ = ACE_OS::atoi (opts.optarg);
- break;
- case 'i': // Get the IOR from the command line.
- this->factory_IOR_ = opts.optarg;
- break;
- case 'f': // Read the IOR from the file.
- result = this->read_ior (opts.optarg);
- if (result < 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to read ior from %s : %p\n",
- opts.optarg),
- -1);
- break;
- case 'x': // Shut down server after test run.
- this->shutdown_ = 1;
- break;
- case '?':
- default:
- ACE_ERROR_RETURN ((LM_ERROR,
- "usage: %s"
- " [-d]"
- " [-n calls/loop]"
- " [-i cubit-factory-IOR]"
- " [-f filename]"
- " [-x]"
- "\n",
- this->argv_ [0]),
- -1);
- }
- return 0; // Indicates successful parsing of command line.
-}
-
-// Get the factory IOR from the file created by the server.
-int
-DII_Cubit_Client::read_ior (char *filename)
-{
- // Open the file for reading.
- this->f_handle_ = ACE_OS::open (filename,0);
-
- if (this->f_handle_ == ACE_INVALID_HANDLE)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to open %s for writing: %p\n",
- filename),
- -1);
- ACE_Read_Buffer ior_buffer (this->f_handle_);
- this->factory_IOR_ = ior_buffer.read ();
-
- if (this->factory_IOR_ == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to allocate memory to read ior: %p\n"),
- -1);
- return 0;
-}
-
-// Formats and prints time statistics. Identical to function in
-// IDL_Cubit, for ease of comparison.
-
-void
-DII_Cubit_Client::print_stats (const char *call_name,
- ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
-{
- ACE_DEBUG ((LM_DEBUG,
- "%s:\n",
- call_name));
-
- if (this->call_count_ > 0
- && this->error_count_ == 0)
- {
-#if defined (ACE_LACKS_FLOATING_POINT)
- // elapsed_time.real_time is in units of microseconds.
- const u_int calls_per_sec =
- this->call_count_ * 1000000u / elapsed_time.real_time;
-
- ACE_DEBUG ((LM_DEBUG,
- "\treal_time\t= %u ms,\n"
- "\t%u calls/second\n",
- elapsed_time.real_time / 1000u,
- calls_per_sec));
-#else /* ! ACE_LACKS_FLOATING_POINT */
- // elapsed_time.real_time is in units of seconds.
- double calls_per_sec =
- this->call_count_ / elapsed_time.real_time;
-
- ACE_DEBUG ((LM_DEBUG,
- "\treal_time\t= %0.06f ms, \n\t"
- "user_time\t= %0.06f ms, \n\t"
- "system_time\t= %0.06f ms\n"
- "\t%0.00f calls/second\n",
- elapsed_time.real_time < 0.0 ? 0.0
- : elapsed_time.real_time * ACE_ONE_SECOND_IN_MSECS,
- elapsed_time.user_time < 0.0 ? 0.0
- : elapsed_time.user_time * ACE_ONE_SECOND_IN_MSECS,
- elapsed_time.system_time < 0.0 ? 0.0
- : elapsed_time.system_time * ACE_ONE_SECOND_IN_MSECS,
- calls_per_sec < 0.0 ? 0.0 : calls_per_sec));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
- }
- else
- ACE_ERROR ((LM_ERROR,
- "\tNo time stats printed. "
- "Call count zero or error ocurred.\n"));
-
- ACE_DEBUG ((LM_DEBUG,
- "\t%d calls, %d errors\n",
- this->call_count_,
- this->error_count_));
-}
-
-void
-DII_Cubit_Client::cube_short_dii (void)
-{
- // Create the request ...
- CORBA::Request_var req (this->obj_var_->_request ("cube_short",
- this->env_));
-
- CUBIT_CHECK_ENV_RETURN_VOID ("cube_short_dii request create");
-
- CORBA::Short ret_short = 0;
- CORBA::Short arg_short = -3;
-
- // Add the short to the request arg list.
- req->add_in_arg () <<= arg_short;
-
- req->set_return_type (CORBA::_tc_short);
-
- this->call_count_++;
-
- req->invoke ();
-
- REQUEST_CHECK_ENV_RETURN_VOID (req,
- "cube_short_dii invoke");
-
- req->return_value () >>= ret_short;
-
- if (ret_short != arg_short * arg_short * arg_short)
- {
- ACE_ERROR ((LM_ERROR,
- "cube_short_dii -- bad results\n"));
-
- this->error_count_++;
- }
-}
-
-void
-DII_Cubit_Client::cube_long_dii (void)
-{
- // Create the request ...
- CORBA::Request_var req (this->obj_var_->_request ("cube_long",
- this->env_));
-
- CUBIT_CHECK_ENV_RETURN_VOID ("cube_long_dii request create");
-
- CORBA::Long ret_long = 0;
- CORBA::Long arg_long = -7;
-
- // Add the long to the request arg list.
- req->add_in_arg () <<= arg_long;
-
- req->set_return_type (CORBA::_tc_long);
-
- this->call_count_++;
-
- req->invoke ();
-
- REQUEST_CHECK_ENV_RETURN_VOID (req,
- "cube_long_dii invoke");
-
- req->return_value () >>= ret_long;
-
- if (ret_long != arg_long * arg_long * arg_long)
- {
- ACE_ERROR ((LM_ERROR,
- "cube_long_dii -- bad results\n"));
-
- this->error_count_++;
- }
-}
-
-void
-DII_Cubit_Client::cube_octet_dii (void)
-{
- // Create the request ...
- CORBA::Request_var req (this->obj_var_->_request ("cube_octet",
- this->env_));
-
- CUBIT_CHECK_ENV_RETURN_VOID ("cube_octet_dii request create");
-
- CORBA::Octet ret_octet = 0;
- CORBA::Octet arg_octet = 5;
-
- // Add the octet to the request arg list.
- CORBA::Any::from_octet from_arg_octet (arg_octet);
- req->add_in_arg () <<= from_arg_octet;
-
- req->set_return_type (CORBA::_tc_octet);
-
- // Invoke, check for an exception and verify the result.
- this->call_count_++;
-
- req->invoke ();
-
- REQUEST_CHECK_ENV_RETURN_VOID (req,
- "cube_octet_dii invoke");
-
- CORBA::Any::to_octet to_ret_octet (ret_octet);
- req->return_value () >>= to_ret_octet;
-
- if (ret_octet != arg_octet * arg_octet * arg_octet)
- {
- ACE_ERROR ((LM_ERROR,
- "cube_octet_dii -- bad results\n"));
-
- this->error_count_++;
- }
-}
-
-void
-DII_Cubit_Client::cube_union_dii (void)
-{ /*
- // Create the request ...
- CORBA::Request_var req (this->obj_var_->_request ("cube_union",
- this->env_));
-
- CUBIT_CHECK_ENV_RETURN_VOID ("cube_union_dii request create");
-
- Cubit::oneof arg_union, ret_union;
-
- arg_union._d(Cubit::e_3rd);
- arg_union.cm ().l = 5;
- arg_union.cm ().s = -7;
- arg_union.cm ().o = 3;
-
- // A different discrim value than arg_ret, just to be ornery.
- ret_union._d(Cubit::e_1st);
- ret_union.s (0);
-
- // Add the union to the request arg list and set the return type.
- req->add_in_arg () <<= arg_union;
-
- req->set_return_type (Cubit::_tc_oneof);
-
- // Invoke, check for an exception and verify the result
-
- this->call_count_++;
-
- req->invoke ();
-
- REQUEST_CHECK_ENV_RETURN_VOID (req, "cube_union_dii invoke");
-
- // Extract the result and check validity.
- Cubit::oneof* ret_ptr = &ret_union;
- req->return_value () >>= ret_ptr;
-
- if (ret_union.cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l
- || ret_union.cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s
- || ret_union.cm ().o != arg_union.cm ().o * arg_union.cm ().o * arg_union.cm ().o)
- {
- ACE_ERROR ((LM_ERROR,
- "cube_union_dii -- bad results\n"));
-
- this->error_count_++;
- } */
-}
-
-void
-DII_Cubit_Client::cube_struct_dii (void)
-{
- // Create the request ...
- CORBA::Request_var req (this->obj_var_->_request ("cube_struct",
- this->env_));
-
- CUBIT_CHECK_ENV_RETURN_VOID ("cube_struct_dii request create");
-
- Cubit::Many arg_struct, *ret_struct_ptr;
-
- arg_struct.l = 5;
- arg_struct.s = -7;
- arg_struct.o = 3;
-
- // Add struct to the request arg list.
- req->add_in_arg () <<= arg_struct;
-
- req->set_return_type (Cubit::_tc_Many);
-
- // Invoke, check for an exception and verify the result.
-
- this->call_count_++;
-
- req->invoke ();
-
- REQUEST_CHECK_ENV_RETURN_VOID (req, "cube_struct_dii invoke");
-
- req->return_value () >>= ret_struct_ptr;
-
- if (ret_struct_ptr->l != arg_struct.l * arg_struct.l * arg_struct.l
- || ret_struct_ptr->s != arg_struct.s * arg_struct.s * arg_struct.s
- || ret_struct_ptr->o != arg_struct.o * arg_struct.o * arg_struct.o)
- {
- ACE_ERROR ((LM_ERROR,
- "cube_struct_dii -- bad results\n"));
-
- this->error_count_++;
- }
-}
-
-void
-DII_Cubit_Client::cube_octet_seq_dii (int length)
-{
- // Create the request ...
- CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence",
- this->env_));
-
- CUBIT_CHECK_ENV_RETURN_VOID ("cube_octet_seq_dii request create");
-
- // Same length as in IDL_Cubit tests so timings can be compared.
- // Return value holder is set to a different length to test resizing.
- Cubit::octet_seq arg_octet_seq (length), *ret_octet_seq_ptr;
- arg_octet_seq.length (length);
- arg_octet_seq[0] = 4;
-
- // Add octet sequence to the request arg list
-
- req->add_in_arg () <<= arg_octet_seq;
-
- req->set_return_type (Cubit::_tc_octet_seq);
-
- // Invoke, check for an exception and verify the result.
-
- this->call_count_++;
-
- req->invoke ();
-
- REQUEST_CHECK_ENV_RETURN_VOID (req,
- "cube_octet_seq_dii invoke");
-
- req->return_value () >>= ret_octet_seq_ptr;
-
- // Check for correct length.
- if (ret_octet_seq_ptr->length () != arg_octet_seq.length ())
- {
- ACE_ERROR ((LM_ERROR,
- "cube_octet_seq_dii -- bad length\n"));
-
- this->error_count_++;
- }
-
- // Check for correct value(s).
- if ((*ret_octet_seq_ptr)[0] != arg_octet_seq[0] * arg_octet_seq[0] * arg_octet_seq[0])
- {
- ACE_ERROR ((LM_ERROR,
- "cube_octet_seq_dii -- bad results\n"));
-
- this->error_count_++;
- }
-}
-
-void
-DII_Cubit_Client::cube_long_seq_dii (int length)
-{
- // Create the request ...
- CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence",
- this->env_));
-
- CUBIT_CHECK_ENV_RETURN_VOID ("cube_long_seq_dii request create");
-
- // Same length as in IDL_Cubit tests so timings can be compared.
- // Return value holder is set to a different length to test
- // resizing.
- Cubit::long_seq *ret_long_seq_ptr;
- Cubit::long_seq arg_long_seq (length);
- arg_long_seq.length (length);
- arg_long_seq[0] = 4;
-
- // Add the long_seq to the request arg list.
- req->add_in_arg () <<= arg_long_seq;
-
- req->set_return_type (Cubit::_tc_long_seq);
-
- // Invoke, check for an exception and verify the result.
-
- this->call_count_++;
-
- req->invoke ();
-
- REQUEST_CHECK_ENV_RETURN_VOID (req,
- "cube_long_seq_dii invoke");
-
- req->return_value () >>= ret_long_seq_ptr;
-
- // Check for correct length.
- if (ret_long_seq_ptr->length () != arg_long_seq.length ())
- {
- ACE_ERROR ((LM_ERROR,
- "cube_long_seq_dii -- bad length\n"));
-
- this->error_count_++;
- }
-
- // Check for correct value(s).
- if ((*ret_long_seq_ptr)[0] != arg_long_seq[0] * arg_long_seq[0] * arg_long_seq[0])
- {
- ACE_ERROR ((LM_ERROR,
- "cube_long_seq_dii -- bad results\n"));
-
- this->error_count_++;
- }
-}
-
-// Wrappers for operations with non-void arg lists and the 3-in-1
-// mixin test, so an array of pointers to functions can be stepped
-// through in run ().
-
-void
-DII_Cubit_Client::cube_small_long_seq (void)
-{
- this->cube_long_seq_dii (SMALL_LONG_SEQ_LENGTH);
-}
-
-void
-DII_Cubit_Client::cube_large_long_seq (void)
-{
- this->cube_long_seq_dii (LARGE_LONG_SEQ_LENGTH);
-}
-
-void
-DII_Cubit_Client::cube_small_octet_seq (void)
-{
- this->cube_octet_seq_dii (SMALL_OCTET_SEQ_LENGTH);
-}
-
-void
-DII_Cubit_Client::cube_large_octet_seq (void)
-{
- this->cube_octet_seq_dii (LARGE_OCTET_SEQ_LENGTH);
-}
-
-void
-DII_Cubit_Client::cube_mixin (void)
-{
- this->cube_short_dii ();
- this->cube_octet_dii ();
- this->cube_long_dii ();
-}
-
-int
-DII_Cubit_Client::run (void)
-{
- // loop counter.
- CORBA::ULong i;
-
- // Make a timer and an elapsed time holder.
- ACE_Profile_Timer dii_timer;
- ACE_Profile_Timer::ACE_Elapsed_Time dii_elapsed_time;
-
- // Order and format of test calls matches that of SII (IDL) tests
- // for easy comparison.
-
- for (int j = 0; j < NUMBER_OF_TESTS; j++)
- {
- this->call_count_ = 0;
- this->error_count_ = 0;
- dii_timer.start ();
-
- for (i = 0; i < this->loop_count_; i++)
- (this->*op_array_[j])();
-
- dii_timer.stop ();
- dii_timer.elapsed_time (dii_elapsed_time);
- this->print_stats (this->stats_messages_[j], dii_elapsed_time);
- }
-
- TAO_TRY
- {
- // Shut down server via a DII request.
- if (this->shutdown_)
- {
- CORBA::Request_var req (this->obj_var_->_request ("shutdown",
- TAO_TRY_ENV));
-
- TAO_CHECK_ENV;
-
- // Cubit::shutdown () is a oneway operation.
- req->send_oneway ();
-
- ACE_DEBUG ((LM_DEBUG,
- "\n\t Shutting down IDL_Cubit server \n\n"));
- }
- }
- TAO_CATCHANY
- {
- TAO_TRY_ENV.print_exception ("DII_Cubit_Client: server shutdown");
- return -1;
- }
- TAO_ENDTRY;
-
- return this->error_count_ == 0 ? 0 : 1;
-}
-
-// Start the test.
-
-int main (int argc, char *argv[])
-{
- DII_Cubit_Client cubit_client;
-
- ACE_DEBUG ((LM_DEBUG,
- "\n\t DII_Cubit::CLIENT \n\n"));
-
- if (cubit_client.init (argc, argv) == -1)
- return 1;
-
- return cubit_client.run ();
-}
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
deleted file mode 100644
index 5b91266bb1d..00000000000
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
+++ /dev/null
@@ -1,120 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DII_Cubit Client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=DII_Cubit Client - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "client.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "client.mak" CFG="DII_Cubit Client - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "DII_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DII_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "DII_Cubit Client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\client\Release"
-# PROP BASE Intermediate_Dir ".\client\Release"
-# PROP BASE Target_Dir ".\client"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\client"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\IDL_Cubit" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 TAO.lib ace.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF "$(CFG)" == "DII_Cubit Client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\client\Debug"
-# PROP BASE Intermediate_Dir ".\client\Debug"
-# PROP BASE Target_Dir ".\client"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ".\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\client"
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\IDL_Cubit" /I "..\..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF
-
-# Begin Target
-
-# Name "DII_Cubit Client - Win32 Release"
-# Name "DII_Cubit Client - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\IDL_Cubit\cubitC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\IDL_Cubit\cubitS.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\IDL_Cubit\cubitC.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\IDL_Cubit\cubitS.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
deleted file mode 100644
index 7f6e87ea8d8..00000000000
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-interface Cubit
-{
- // = TITLE
- // Defines an interface that encapsulates operations that cube
- // numbers.
- //
- // = DESCRIPTION
- // This interface encapsulates operations that cube
- // octets, shorts, longs, structs and unions.
-
- oneway void cube_oneway ();
- // Test the basic latency of a nil oneway operation.
-
- void cube_void ();
- // Test the basic latency of a nil operation.
-
- octet cube_octet (in octet o);
- // cube an octet
-
- short cube_short (in short s);
- // cube a short
-
- long cube_long (in long l);
- // cube a long
-
- struct Many
- {
- octet o; // + 3 bytes padding (normally) ...
- long l;
- short s; // + 2 bytes padding (normally) ...
- };
-
- Many cube_struct (in Many values);
- // Cube a struct
-
- enum discrim
- {
- e_0th,
- e_1st,
- e_2nd,
- e_3rd
- };
- // Enumeration of the different elements in a union.
-
- union oneof switch (discrim)
- {
- // this is an easy union to interpret; no padding
- // is needed between discriminant and value.
- case e_0th:
- octet o;
- case e_1st:
- short s;
- case e_2nd:
- long l;
- case e_3rd:
- Many cm;
-
- // default:
- // Many cm;
- };
- // Union of different types.
-
- oneof cube_union (in oneof values);
- // cube a union.
-
- typedef sequence<long> long_seq;
-
- void cube_long_sequence (in long_seq input,
- out long_seq output);
- // Cube several longs.
-
-
- typedef sequence<octet> octet_seq;
- void cube_octet_sequence (in octet_seq input, out octet_seq output);
- // Cube an octet sequence.
-
- oneway void shutdown ();
- // shutdown the application.
-
- // = The following types provide a torture-test for structs.
- struct RtiPacketHeader
- {
- unsigned long packetLength; // this is probably redundant
- unsigned short federationHandle;
- unsigned long channelHandle;
- unsigned long packetColor;
- };
-
- struct HandleValuePair
- {
- unsigned short handle;
- octet_seq data;
- };
-
- enum MessageHeaderTypes
- {
- objectUpdate,
- interaction
- // others omitted
- };
-
- typedef sequence<HandleValuePair> HandleValuePairSeq;
- struct RtiObjectUpdateMessageHeader
- {
- unsigned long updateLength; // probably redundant
- unsigned long updateTag;
- unsigned long objectHandle;
- double timestamp;
- unsigned long long eventRetractionHandle;
- unsigned short classHandle;
- unsigned short sendingFederateHandle;
- string userTag;
- octet_seq regionData;
- octet transportationHandle;
- octet orderingHandle;
- HandleValuePairSeq messagePayload;
- };
-
- struct RtiInteractionMessageHeader
- {
- unsigned long updateLength;
- // similar to object update
- };
-
- union MessageUnion switch(MessageHeaderTypes)
- {
- case objectUpdate:
- RtiObjectUpdateMessageHeader oumh;
- case interaction:
- RtiInteractionMessageHeader imh;
- };
-
- typedef sequence <MessageUnion> MessageUnionSeq;
- struct RtiPacket
- {
- RtiPacketHeader packetHeader;
- MessageUnionSeq msgs;
- };
-
- void cube_rti_data (in RtiPacket input,
- out RtiPacket output);
-};
-
-interface Cubit_Factory
-{
- // = TITLE
- // Creates Cubit objects.
-
- Cubit make_cubit ();
-};
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
deleted file mode 100755
index bb1241bfd7e..00000000000
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#$Id$
-# -*- perl -*-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
- & eval 'exec perl -S $0 $argv:q'
- if 0;
-
-unshift @INC, '../../../../../bin';
-require Process;
-
-$client_port = 0;
-$server_port = 0;
-$iorfile = "theior";
-$sleeptime = 5;
-
-$SV = Process::Create ("..$DIR_SEPARATOR"
- ."IDL_Cubit".$DIR_SEPARATOR.
- "server".$Process::EXE_EXT,
- " -ORBport ".$server_port.
- " -ORBobjrefstyle url".
- " -o $iorfile");
-
-sleep $sleeptime;
-
-$status = system ("client".$Process::EXE_EXT.
- " -ORBport $client_port".
- " -f $iorfile -x");
-
-# @@ TODO change to Wait() once the -x option works.
-$SV->Kill (); $SV->Wait ();
-
-unlink $iorfile;
-
-exit $status;
View Lorry Controller Status