diff options
Diffstat (limited to 'TAO/orbsvcs/Concurrency_Service')
-rw-r--r-- | TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp | 222 | ||||
-rw-r--r-- | TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp | 104 | ||||
-rw-r--r-- | TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsw | 29 | ||||
-rw-r--r-- | TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h | 101 | ||||
-rw-r--r-- | TAO/orbsvcs/Concurrency_Service/Makefile | 293 | ||||
-rw-r--r-- | TAO/orbsvcs/Concurrency_Service/README | 129 | ||||
-rw-r--r-- | TAO/orbsvcs/Concurrency_Service/svc.conf | 49 |
7 files changed, 0 insertions, 927 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp deleted file mode 100644 index 4c523fb2ddd..00000000000 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ /dev/null @@ -1,222 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// orbsvcs/Concurrecy_Service/Concurrency_Service -// -// = FILENAME -// Concurrency_Service.cpp -// -// = DESCRIPTION -// This class implements a Concurrency_Service object. -// -// = AUTHORS -// Torben Worm <tworm@cs.wustl.edu> -// -// ============================================================================ - -#include "Concurrency_Service.h" - -ACE_RCSID(Concurrency_Service, Concurrency_Service, "$Id$") - -// Default Constructor. - -Concurrency_Service::Concurrency_Service (void) - : use_naming_service_ (1), - ior_output_file_ (0) -{ - ACE_DEBUG ((LM_DEBUG, - "Concurrency_Service::Concurrency_Service (void)\n")); -} - -// Constructor taking command-line arguments. - -Concurrency_Service::Concurrency_Service (int argc, - char** argv, - CORBA::Environment& _env) -{ - ACE_DEBUG ((LM_DEBUG, - "Concurrency_Service::Concurrency_Service (...)\n")); - this->init (argc, argv, _env); -} - -int -Concurrency_Service::parse_args (void) -{ - ACE_DEBUG ((LM_DEBUG, - "Concurrency_Service::parse_args\n")); - - ACE_Get_Opt get_opts (argc_, argv_, "do:s"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'd': // debug flag - TAO_debug_level++; - break; - case 'o': // output the IOR to a file - this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w"); - if (this->ior_output_file_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to open %s for writing: %p\n", - get_opts.optarg), -1); - break; - case 's': - this->use_naming_service_ = 0; - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s" - " [-d]" - " [-o] <ior_output_file>" - "\n", - argv_[0]), - 1); - } - // Indicates sucessfull persing of command line. - return 0; -} - -// Initialize the state of the Concurrency_Service object. - -int -Concurrency_Service::init (int argc, - char **argv, - CORBA::Environment &_env) -{ - ACE_DEBUG ((LM_DEBUG, - "Concurrency_Service::init\n")); - if (this->orb_manager_.init_child_poa (argc, - argv, - "child_poa", - _env) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "init_child_poa"), - -1); - TAO_CHECK_ENV_RETURN (_env,-1); - - this->argc_ = argc; - this->argv_ = argv; - - if (this->parse_args ()!=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Could not parse command line\n"), - -1); - CORBA::String_var str = - this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory (), - _env); - ACE_DEBUG ((LM_DEBUG, - "The IOR is: <%s>\n", - str.in ())); - - if (this->ior_output_file_) - { - ACE_OS::fprintf (this->ior_output_file_, "%s", str.in ()); - ACE_OS::fclose (this->ior_output_file_); - } - - if (this->use_naming_service_) - return this->init_naming_service (_env); - - return 0; -} - -int -Concurrency_Service::init_naming_service (CORBA::Environment &_env) -{ - ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n")); - CORBA::ORB_var orb; - PortableServer::POA_var child_poa; - - orb = this->orb_manager_.orb (); - child_poa = this->orb_manager_.child_poa (); - - int result = this->my_name_server_.init (orb.in (), - child_poa.in ()); - if (result == -1) - return result; - lockset_factory_ = - this->my_concurrency_server_.GetLockSetFactory ()->_this (_env); - TAO_CHECK_ENV_RETURN (_env, -1); - - CosNaming::Name concurrency_context_name (1); - concurrency_context_name.length (1); - concurrency_context_name[0].id = CORBA::string_dup ("CosConcurrency"); - - this->concurrency_context_ = - this->my_name_server_->bind_new_context (concurrency_context_name, - _env); - TAO_CHECK_ENV_RETURN (_env, -1); - - CosNaming::Name lockset_name (1); - lockset_name.length (1); - lockset_name[0].id = CORBA::string_dup ("LockSetFactory"); - this->concurrency_context_->bind (lockset_name, - lockset_factory_.in (), - _env); - TAO_CHECK_ENV_RETURN (_env, -1); - return 0; -} - -// Run the ORB event loop. - -int -Concurrency_Service::run (CORBA_Environment& _env) -{ - ACE_DEBUG ((LM_DEBUG, - "Concurrency_Service::run (...)\n")); - - if (this->orb_manager_.run (_env) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Concurrency_Service::run"), - -1); - return 0; -} - -// Destructor. - -Concurrency_Service::~Concurrency_Service (void) -{ - ACE_DEBUG ((LM_DEBUG, - "Concurrency_Service::~Concurrency_Service (void)\n")); -} - -int -main (int argc, char ** argv) -{ - Concurrency_Service concurrency_service; - - ACE_DEBUG ((LM_DEBUG, - "\n \t Concurrency Service:SERVER \n \n")); - - TAO_TRY - { - if (concurrency_service.init (argc, argv, TAO_TRY_ENV) == -1) - return 1; - else - { - concurrency_service.run (TAO_TRY_ENV); - TAO_CHECK_ENV; - } - } - - TAO_CATCH (CORBA::SystemException, sysex) - { - ACE_UNUSED_ARG (sysex); - TAO_TRY_ENV.print_exception ("System Exception"); - return -1; - } - TAO_CATCH (CORBA::UserException, userex) - { - ACE_UNUSED_ARG (userex); - TAO_TRY_ENV.print_exception ("User Exception"); - return -1; - } - - TAO_ENDTRY; - return 0; -} - diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp deleted file mode 100644 index 032a6288cbf..00000000000 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp +++ /dev/null @@ -1,104 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Concurrency_Service" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Concurrency_Service - 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 "Concurrency_Service.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 "Concurrency_Service.mak"\
- CFG="Concurrency_Service - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Concurrency_Service - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Concurrency_Service - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Concurrency_Service - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# 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 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
-
-!ELSEIF "$(CFG)" == "Concurrency_Service - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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 /pdbtype:sept
-# ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Concurrency_Service - Win32 Release"
-# Name "Concurrency_Service - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".cpp"
-# Begin Source File
-
-SOURCE=.\Concurrency_Service.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ".h"
-# Begin Source File
-
-SOURCE=.\Concurrency_Service.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsw b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsw deleted file mode 100644 index a9cf51b0f96..00000000000 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Concurrency_Service"=.\Concurrency_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h deleted file mode 100644 index 4154e64e5a7..00000000000 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h +++ /dev/null @@ -1,101 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// orbsvcs/Concurrency_Service/Concurency_Service -// -// = FILENAME -// Concurrency_Service.h -// -// = DESCRIPTION -// This class implements a subset of the functionality of the -// CORBA Concurrency Service. -// -// = AUTHORS -// Torben Worm <tworm@cs.wustl.edu> -// -// ============================================================================ - -#if !defined (_CONCURRENCY_SERVICE_H) -#define _CONCURRENCY_SERVICE_H - -#include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" -#include "tao/TAO.h" -#include "orbsvcs/Concurrency/Concurrency_Utils.h" -#include "orbsvcs/Naming/Naming_Utils.h" - -class Concurrency_Service : public TAO_ORB_Manager -{ - // = TITLE - // Defines a class that encapsulates the implementation of the - // concurrency service. - // = DESCRIPTION - // This class uses the TAO_ORB_Manager, the TAO_Naming_Server, and - // the TAO_Concurrency_Server classes to implement a server for - // the concurrency service. -public: - // = Initialization and termination methods. - Concurrency_Service (void); - // Default Constructor. - - Concurrency_Service (int argc, - char **argv, - CORBA::Environment &env); - // Constructor taking the command-line arguments. - - ~Concurrency_Service (void); - // Destructor. - - int init (int argc, - char **argv, - CORBA::Environment &env); - // Initialize the Concurrency Service with the arguments. - - int run (CORBA_Environment &env); - // Run the Concurrency_Service. - -private: - int parse_args (void); - // Parses the commandline arguments. - - int init_naming_service (CORBA::Environment &env); - // Initialize the name server and register the concurency server - // factory with it. Maybe later it will be convinient to register - // the individual lock sets with the naming service. At present the - // clients must keep track of the reference and pass 'by hand' - - int use_naming_service_; - // Flag to tell wheter the naming service will be used. - - FILE *ior_output_file_; - // File to output the concurrency server IOR. - - TAO_ORB_Manager orb_manager_; - // The ORB manager - - TAO_Naming_Server my_name_server_; - // An instance of the name server used for registering the factory - // objects. - - TAO_Concurrency_Server my_concurrency_server_; - // An instance of the concurrency server. - - CosConcurrencyControl::LockSetFactory_var lockset_factory_; - // Factory var to register with the naming service. - - CosNaming::NamingContext_var concurrency_context_; - // Naming context for the concurrency service. - - CosNaming::NamingContext_var naming_context_; - // Naming context for the naming service. - - int argc_; - // Number of commandline arguments. - - char **argv_; - // Commandline arguments. -}; - -#endif /* _CONCURRENCY_SERVICE_H */ diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile deleted file mode 100644 index 6164dbb8cdb..00000000000 --- a/TAO/orbsvcs/Concurrency_Service/Makefile +++ /dev/null @@ -1,293 +0,0 @@ -#---------------------------------------------------------------------------- -# -# $Id$ -# -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN = Concurrency_Service - -SRC=Concurrency_Service.cpp - -LDLIBS = -lorbsvcs -lTAO - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -ifndef TAO_ROOT - TAO_ROOT = $(ACE_ROOT)/TAO -endif - -#TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE - -LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/Concurrency_Service.o .obj/Concurrency_Service.so .shobj/Concurrency_Service.o .shobj/Concurrency_Service.so: Concurrency_Service.cpp Concurrency_Service.h \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/ACE.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.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(TAO_ROOT)/tao/TAO.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(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/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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.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/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.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/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(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/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(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/SString.h \ - $(ACE_ROOT)/ace/SString.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 \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.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/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(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 \ - $(ACE_ROOT)/ace/Strategies.i \ - $(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/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Union.h \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(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 \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Object_Table.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.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/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/Concurrency_Service/README b/TAO/orbsvcs/Concurrency_Service/README deleted file mode 100644 index 007d4fb7b51..00000000000 --- a/TAO/orbsvcs/Concurrency_Service/README +++ /dev/null @@ -1,129 +0,0 @@ -$Id$ - -This file describes how to run the TAO Concurrency Service and its -accompanying tests. In addition, it describes the locations of the -files that make up the service and tests. For a general description -of the directory structure for the services please consult - - $TAO_ROOT/docs/orbsvcs.html - ----------------------------------------- - -HOW TO RUN THE SERVICE - -The Concurrency Service server runs in a thread-per-connection -concurrency model, which is specified by the svc.conf file. This -model is necessary to enable the server to block in a dedicated -thread, i.e., one for each client. The concurrency service will not -run in the reactive model. - -The server itself is located in the - -$TAO_ROOT/orbsvcs/Concurrency_Service - -directory. - -The server accepts the folowing options: - - usage: ./Concurrency_Service [-d] [-o] <ior_output_file> - [-d] is the debug option - [-o] <ior_output_file> outputs the IOR of the lock set factory - to the file - [-s] Prevents the concurency server from using the naming server - -The lock set factory is registered in the naming service in the -CosConcurrency context with the name "LockSetFactory". - ----------------------------------------- - -THE IMPLEMENTATION - -The implementation of the concurrency service objects is located in -the $TAO_ROOT/orbsvcs/orbsvcs/Concurrency directory and consists of -the following files: - - CC_LockSet.{h,cpp} Implementation of the lock set. At present - there is only one implementation of the lock set which - implements multiple possesion semantics for both - transactional (which is not otherwise supported) and - non-transactional clients. Please see the comments in - the CC_LockSet.h file for further details. - - CC_LockSetFactory.{h,cpp} Iplementation of the lock set - factory - - Concurrency_Utils.{h,cpp} Wrapper around the concurrency - server. - -The current implementation does not support transactions. If you'd -like to add support for transactions to TAO please let us know. - ----------------------------------------- - -THE TESTS - -The tests are located in the $TAO_ROOT/orbsvcs/tests/Concurrency -directory. There are two types of tests: - - . A simple test -- which tests that it is possible to create - locks and lock them in all the different lock modes - - . A more extended test which requires two (or more) - processes. - -The client accepts the following options: - - usage: ./CC_client [-b] [-d] - [-c] <stdin|testscriptname> - [-e] <test;arg1;arg2> - [-f cc_factory-obj-ref-key-file] - [-k cc-obj-ref-key] [-x] [-s] - - . The [-b] option runs the basic tests. - . The [-c] option runs a test script against the concurrency - service server. This option is described in more detail in - the $TAO_ROOT/orbsvcs/tests/Concurrency/README file. It is - the intent that this type of testing will be used instead of - the [-b] and [-e] tests. These tests are retained for - backwards compatibility. - . The [-d] option is the debug option. - . The [-e] option is for running one of the extended tests. The - format of the argument to the -e option is <test;arg1;arg2> - where test is the name of the test (at present test = - {1,2,3}) and arg1 and arg2 are arguments to the test. See - the example below. - - . The [-f] option reads the factory IOR from a file. This is - currently not supported. - - . The [-k] option takes the factory IOR as argument on the - commandline. This is currently not supported. - - . The [-x] option tells the server to shut down - gracefully. Currently this has no effect. - - . The [-s] option tells the test not to use the naming - service. This is currently not supported. - ----------------------------------------- - -EXAMPLE TEST RUN - - Window-1> ./Concurrency_Service -d - Window-2> ./CC_client -b - Window-2> ./CC_client -e '1;Name' - Window-2> ./CC_client -e '2;Name' - Window-3> ./CC_client -e '3;Name' - -NOTE: It seems that there is a problem using the naming service the - first time the client is run. This error does not appear if the - environment variable 'NameService' is set to the IOR of the naming - service (the IOR of the naming service is printed when the - Concurrency_Control server is started). - ----------------------------------------- - -CONTACT POINT - -If you have any questions about this service, please contact Torben -Worm at <tworm@cs.wustl.edu>. diff --git a/TAO/orbsvcs/Concurrency_Service/svc.conf b/TAO/orbsvcs/Concurrency_Service/svc.conf deleted file mode 100644 index da10b90ce7a..00000000000 --- a/TAO/orbsvcs/Concurrency_Service/svc.conf +++ /dev/null @@ -1,49 +0,0 @@ -# $Id$ -# -# This file contains a sample ACE_Service_Config configuration -# file specifying the strategy factories utilized by an application -# using TAO. There are currently only two possible factories: -# Client_Strategy_Factory and Server_Strategy_Factory. These names -# must be used as the second argument to their corresponding line, -# because that's what the ORB uses to find the desired factory. -# -# Note that there are two unordinary characteristics of the way *this* -# file is set up: -# - both client and server strategies are specified in the same -# file, which would only make sense for co-located clients & servers -# - both of the factories are actually sourced out of libTAO.so -# (TAO.DLL on Win32), and they would normally be in a separate -# dll from the TAO ORB Core. -# -# The options which can be passed to the Resource Factory are: -# -# -ORBresources <which> -# where <which> can be 'global' to specify globally-held resources, -# or 'tss' to specify thread-specific resources. -# -# The options which can be passed to the Client are: -# <none currently> -# -# The options which can be passed to the Server are: -# -# -ORBconcurrency <which> -# where <which> can be 'thread-per-connection' to specify -# use of the ACE_Threaded_Strategy concurrency strategy, -# or 'reactive' to specify use of the ACE_Reactive_Strategy -# concurrency strategy. -# -# -ORBthreadflags <flags> -# specifies the default thread flags to use, where <flags> is a -# logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP, -# THR_SUSPENDED, or THR_DAEMON. Note that not every flag may be valid -# on every platform. -# -# -ORBdemuxstrategy <which> -# where <which> can be one of 'dynamic', 'linear', 'active', or 'user', -# and specifies the type of object lookup strategy used internally. -# -ORBtablesize <unsigned> -# specifies the size of the object table -# -dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global" -dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() -dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBtablesize 128" |