diff options
86 files changed, 3464 insertions, 17784 deletions
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/Makefile b/TAO/Benchmark/Marshal_Test/Orbix/Makefile deleted file mode 100644 index fae70193bbf..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the Orbix Marshal Benchmark -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lACE -lbenchmark - -PROG_SRCS = marshalC.cpp marshalS.cpp orbix_marshal_client.cpp orbix_marshal_server.cpp \ - orbix_marshal_impl.cpp client.cpp server.cpp - -LSRC = $(PROG_SRCS) - -MARSHAL_CLIENT_OBJS = marshalC.o orbix_marshal_client.o client.o - -ifdef dsi -MARSHAL_SERVER_OBJS = orbix_marshal_impl.o orbix_marshal_server.o server.o -else -MARSHAL_SERVER_OBJS = marshalS.o orbix_marshal_impl.o orbix_marshal_server.o server.o -endif -BIN = client server - -#CLIENT_LIBS = -lITini -liiop -lorbix -#SERVER_LIBS = -lITini -liiop -lDSI -lorbix -lIRclt -CLIENT_LIBS = -liiop -lorbix -SERVER_LIBS = -liiop -lDSI -lorbix -lIRclt - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(TAO_ROOT)/rules.tao.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 -# include Orbix specific file -include /project/mambo/gokhale/CONFIG/orbixsol2s4.mk - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -CPPFLAGS += -I$(TAO_ROOT)/Benchmark - -server: $(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(SERVER_LIBS) $(POSTLINK) - -client: $(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(CLIENT_LIBS) $(POSTLINK) - -marshal.h marshalC.cpp marshalS.cpp: marshal.idl - $(IDL) $(IDLFLAGS) $< - -clean: - $(RM) core *.o *~ client server *C.cpp *S.cpp *S.h *C.h - $(MAKE) realclean diff --git a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/client.cpp deleted file mode 100644 index d3ef24fadc0..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "orbix_marshal_client.h" - -ACE_RCSID(Orbix, client, "$Id$") - -int main (int argc, char *argv []) -{ - // instantiate a DRIVER with the Orbix_Client_Proxy as the template - CORBA_Benchmark_Driver<Orbix_Marshal_Client_Proxy> driver (new - Orbix_Marshal_Client_Proxy ()); - - // let the driver do everything for us so that we remain very simple - return driver.run (argc, argv); -} diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h b/TAO/Benchmark/Marshal_Test/Orbix/marshal.h deleted file mode 100644 index 497c872001f..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h +++ /dev/null @@ -1,1326 +0,0 @@ -// $Id$ - -#ifndef marshal_h -#define marshal_h - -#include <CORBA.h> - -#include <string.h> - - -#ifndef _IDL_SEQUENCE_any_defined -#define _IDL_SEQUENCE_any_defined - -class _IDL_SEQUENCE_any { - CORBA::ULong _maximum; - CORBA::ULong _length; - CORBA::any* _buffer; - unsigned char _release; - - public: - _IDL_SEQUENCE_any& operator= (const _IDL_SEQUENCE_any&); - _IDL_SEQUENCE_any (const _IDL_SEQUENCE_any&); - - _IDL_SEQUENCE_any (CORBA::ULong max); - _IDL_SEQUENCE_any (CORBA::ULong max, CORBA::ULong length, CORBA::any* data, CORBA::Boolean release = 0); - _IDL_SEQUENCE_any (); - - ~_IDL_SEQUENCE_any (); - - static CORBA::any* allocbuf(CORBA::ULong nelems); - static void freebuf(CORBA::any* data); - - CORBA::ULong maximum() const; - CORBA::ULong length() const; - void length (CORBA::ULong len); - - CORBA::any& operator [] (CORBA::ULong IT_i); - - const CORBA::any& operator [] (CORBA::ULong IT_i) const; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); -}; - -extern const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_any; - -#ifndef _IDL_SEQUENCE_anyVarH -#define _IDL_SEQUENCE_anyVarH - -#ifndef _IDL_SEQUENCE_anyvPtr -#define _IDL_SEQUENCE_anyvPtr -typedef _IDL_SEQUENCE_any* _IDL_SEQUENCE_any_vPtr; -typedef const _IDL_SEQUENCE_any* _IDL_SEQUENCE_any_cvPtr; -#endif - -class _IDL_SEQUENCE_any_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const _IDL_SEQUENCE_any_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new _IDL_SEQUENCE_any; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - _IDL_SEQUENCE_any_var (const _IDL_SEQUENCE_any_var &IT_s) { - (void) copyHelper (IT_s); - } - - _IDL_SEQUENCE_any_var () { - _ptr = NULL; - } - - _IDL_SEQUENCE_any_var (_IDL_SEQUENCE_any *IT_p) { - _ptr = IT_p; - } - - _IDL_SEQUENCE_any_var &operator= (_IDL_SEQUENCE_any *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - _IDL_SEQUENCE_any_var &operator= (const _IDL_SEQUENCE_any_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new _IDL_SEQUENCE_any; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~_IDL_SEQUENCE_any_var () { - delete _ptr; - } - - _IDL_SEQUENCE_any* operator-> () { - return _ptr; - } - - operator _IDL_SEQUENCE_any_cvPtr () const { return _ptr;} - operator _IDL_SEQUENCE_any_vPtr& () { return _ptr;} - operator _IDL_SEQUENCE_any& () const { return * _ptr;} - - const CORBA::any& operator[] (CORBA::ULong index) const; - - CORBA::any& operator[] (CORBA::ULong index); - - protected: - _IDL_SEQUENCE_any *_ptr; - private: - _IDL_SEQUENCE_any_var &operator= (const CORBA::_var &IT_s); - _IDL_SEQUENCE_any_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - - -#ifndef _Marshal_defined -#define _Marshal_defined -class Marshal_dispatch : public virtual CORBA::PPTR { -public: - - Marshal_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, - CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) - : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} - - - Marshal_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Marshal_dispatch () {} - - Marshal_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Marshal_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, - char *IT_i, CORBA::Object* IT_ob, void* IT_im) - : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - - - virtual unsigned char dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void* IT_pp=NULL); - - -}; - -class Marshal; - -#ifndef MarshalPtr -#define MarshalPtr - -typedef Marshal* Marshal_ptr; - -typedef Marshal* MarshalRef; - -#endif - - -#ifndef MarshalForwH -#define MarshalForwH -CORBA::ObjectRef Marshal_getBase (void *); -void Marshal_release (Marshal *, CORBA::Environment &IT_env); -void Marshal_release (Marshal_ptr); -Marshal* Marshal_duplicate (Marshal_ptr, CORBA::Environment &IT_env); -Marshal* Marshal_duplicate (Marshal_ptr ); -Marshal_ptr Marshal_nil (CORBA::Environment &IT_env); -Marshal_ptr Marshal_nil (); -#endif -#define Marshal_IMPL "Marshal" - - -class Marshal; - -typedef Marshal MarshalProxy; -#define Marshal_IR "Marshal" -#define Marshal_IMPL "Marshal" - -#ifndef MarshalPtr -#define MarshalPtr - -typedef Marshal* Marshal_ptr; - -typedef Marshal* MarshalRef; - -#endif - -class Marshal: public virtual CORBA::Object { -public: - Marshal (char *IT_OR); - Marshal (ObjectReference *IT_OR); - Marshal () : CORBA::Object (1) {} -protected: - Marshal_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Marshal_ptr _duplicate( - Marshal_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Marshal* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Marshal* _bind (CORBA::Environment &IT_env); - static Marshal* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Marshal* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); -private: - static const void* IT_impl; -public: - static Marshal_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Marshal_ptr) CORBA::OBJECT_NIL;} - -#ifndef Marshal_Marshal_Struct_defined -#define Marshal_Marshal_Struct_defined - -struct Marshal_Struct { - CORBA::Short s; - CORBA::Long l; - CORBA::Char c; - CORBA::Octet o; - CORBA::Double d; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - static void* IT_anySupport (CORBA::Request &IT_r, - void *&, void*, const CORBA::Flags&); - static const void *IT_fn; - Marshal_Struct(const Marshal_Struct &); - Marshal_Struct(); - ~Marshal_Struct(); - Marshal_Struct& operator= (const Marshal_Struct&); -}; - -static const CORBA::TypeCode_ptr _tc_Marshal_Struct; - -#ifndef Marshal_Marshal_StructVarH -#define Marshal_Marshal_StructVarH - -#ifndef Marshal_Marshal_StructvPtr -#define Marshal_Marshal_StructvPtr -typedef Marshal_Struct* Marshal_Struct_vPtr; -typedef const Marshal_Struct* Marshal_Struct_cvPtr; -#endif - -class Marshal_Struct_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Marshal_Struct_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Marshal_Struct; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Marshal_Struct_var (const Marshal_Struct_var &IT_s) { - (void) copyHelper (IT_s); - } - - Marshal_Struct_var () { - _ptr = new Marshal_Struct; -; - } - - Marshal_Struct_var (Marshal_Struct *IT_p) { - _ptr = IT_p; - } - - Marshal_Struct_var &operator= (Marshal_Struct *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Marshal_Struct_var &operator= (const Marshal_Struct_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Marshal_Struct; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Marshal_Struct_var () { - delete _ptr; - } - - Marshal_Struct* operator-> () { - return _ptr; - } - - operator Marshal_Struct_cvPtr () const { return _ptr;} - operator Marshal_Struct_vPtr& () { return _ptr;} - operator Marshal_Struct& () const { return * _ptr;} - - protected: - Marshal_Struct *_ptr; - private: - Marshal_Struct_var &operator= (const CORBA::_var &IT_s); - Marshal_Struct_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -static const CORBA::TypeCode_ptr _tc_discrim; - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th,e_6th, IT__ENUM_Marshal_discrim=CORBA_ULONG_MAX}; - -#ifndef Marshal_Marshal_Union_defined -#define Marshal_Marshal_Union_defined - -struct Marshal_Union { - private: - - discrim __d; - union { - CORBA::Short _s_; - CORBA::Long _l_; - CORBA::Char _c_; - CORBA::Octet _o_; - CORBA::Double _d_; - Marshal_Struct * _ms_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - static void* IT_anySupport (CORBA::Request &IT_r, - void *&, void*, const CORBA::Flags&); - static const void *IT_fn; - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Marshal::e_0th)) - { - this-> Marshal_Union::~Marshal_Union(); - memset(this, 0, sizeof(*this)); - } - - __d = Marshal::e_0th; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Marshal::e_1st)) - { - this-> Marshal_Union::~Marshal_Union(); - memset(this, 0, sizeof(*this)); - } - - __d = Marshal::e_1st; - isSet = 1; - _l_ = IT_member; - } - - CORBA::Char c () const { - return _c_; - } - - void c (CORBA::Char IT_member) { - if (isSet && (__d != Marshal::e_2nd)) - { - this-> Marshal_Union::~Marshal_Union(); - memset(this, 0, sizeof(*this)); - } - - __d = Marshal::e_2nd; - isSet = 1; - _c_ = IT_member; - } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Marshal::e_3rd)) - { - this-> Marshal_Union::~Marshal_Union(); - memset(this, 0, sizeof(*this)); - } - - __d = Marshal::e_3rd; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Double d () const { - return _d_; - } - - void d (CORBA::Double IT_member) { - if (isSet && (__d != Marshal::e_4th)) - { - this-> Marshal_Union::~Marshal_Union(); - memset(this, 0, sizeof(*this)); - } - - __d = Marshal::e_4th; - isSet = 1; - _d_ = IT_member; - } - - Marshal_Struct& ms () { - return (*_ms_); - } - - const Marshal_Struct& ms () const { - return (*_ms_); - } - - void ms (const Marshal_Struct& IT_member) { - if (isSet && (__d != Marshal::e_6th)) - { - this-> Marshal_Union::~Marshal_Union(); - memset(this, 0, sizeof(*this)); - } - - __d = Marshal::e_6th; - - if (!isSet) { - _ms_ = new Marshal_Struct; - isSet = 1; - } - *(_ms_) = IT_member; - } - - - Marshal_Union(); - Marshal_Union(const Marshal_Union &); - ~Marshal_Union(); - Marshal_Union& operator= (const Marshal_Union&); -}; - -static const CORBA::TypeCode_ptr _tc_Marshal_Union; - -#ifndef Marshal_Marshal_UnionVarH -#define Marshal_Marshal_UnionVarH - -#ifndef Marshal_Marshal_UnionvPtr -#define Marshal_Marshal_UnionvPtr -typedef Marshal_Union* Marshal_Union_vPtr; -typedef const Marshal_Union* Marshal_Union_cvPtr; -#endif - -class Marshal_Union_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Marshal_Union_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Marshal_Union; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Marshal_Union_var (const Marshal_Union_var &IT_s) { - (void) copyHelper (IT_s); - } - - Marshal_Union_var () { - _ptr = NULL; - } - - Marshal_Union_var (Marshal_Union *IT_p) { - _ptr = IT_p; - } - - Marshal_Union_var &operator= (Marshal_Union *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Marshal_Union_var &operator= (const Marshal_Union_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Marshal_Union; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Marshal_Union_var () { - delete _ptr; - } - - Marshal_Union* operator-> () { - return _ptr; - } - - operator Marshal_Union_cvPtr () const { return _ptr;} - operator Marshal_Union_vPtr& () { return _ptr;} - operator Marshal_Union& () const { return * _ptr;} - - protected: - Marshal_Union *_ptr; - private: - Marshal_Union_var &operator= (const CORBA::_var &IT_s); - Marshal_Union_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif -static const CORBA::TypeCode_ptr _tc_AnySeq; - -typedef _IDL_SEQUENCE_any AnySeq; -typedef const _IDL_SEQUENCE_any AnySeq_IT_const; - -typedef _IDL_SEQUENCE_any_var AnySeq_var; - - -#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_Recursive_defined -#define Marshal__IDL_SEQUENCE_Marshal_Marshal_Recursive_defined - -struct Marshal_Recursive; -class _IDL_SEQUENCE_Marshal_Marshal_Recursive { - CORBA::ULong _maximum; - CORBA::ULong _length; - Marshal_Recursive* _buffer; - unsigned char _release; - - public: - _IDL_SEQUENCE_Marshal_Marshal_Recursive& operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&); - _IDL_SEQUENCE_Marshal_Marshal_Recursive (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&); - - _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max); - _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max, CORBA::ULong length, Marshal_Recursive* data, CORBA::Boolean release = 0); - _IDL_SEQUENCE_Marshal_Marshal_Recursive (); - - ~_IDL_SEQUENCE_Marshal_Marshal_Recursive (); - - static Marshal_Recursive* allocbuf(CORBA::ULong nelems); - static void freebuf(Marshal_Recursive* data); - - CORBA::ULong maximum() const; - CORBA::ULong length() const; - void length (CORBA::ULong len); - - Marshal_Recursive& operator [] (CORBA::ULong IT_i); - - const Marshal_Recursive& operator [] (CORBA::ULong IT_i) const; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); -}; - -static const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_Marshal_Marshal_Recursive; - -#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH -#define Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH - -#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr -#define Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr -typedef _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr; -typedef const _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr; -#endif - -class _IDL_SEQUENCE_Marshal_Marshal_Recursive_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) { - (void) copyHelper (IT_s); - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var () { - _ptr = NULL; - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) { - _ptr = IT_p; - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~_IDL_SEQUENCE_Marshal_Marshal_Recursive_var () { - delete _ptr; - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive* operator-> () { - return _ptr; - } - - operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr () const { return _ptr;} - operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr& () { return _ptr;} - operator _IDL_SEQUENCE_Marshal_Marshal_Recursive& () const { return * _ptr;} - - const Marshal_Recursive& operator[] (CORBA::ULong index) const; - - Marshal_Recursive& operator[] (CORBA::ULong index); - - protected: - _IDL_SEQUENCE_Marshal_Marshal_Recursive *_ptr; - private: - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const CORBA::_var &IT_s); - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - - -#ifndef Marshal_Marshal_Recursive_defined -#define Marshal_Marshal_Recursive_defined - -struct Marshal_Recursive { - CORBA::any value; - _IDL_SEQUENCE_Marshal_Marshal_Recursive next; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - static void* IT_anySupport (CORBA::Request &IT_r, - void *&, void*, const CORBA::Flags&); - static const void *IT_fn; - Marshal_Recursive(const Marshal_Recursive &); - Marshal_Recursive(); - ~Marshal_Recursive(); - Marshal_Recursive& operator= (const Marshal_Recursive&); -}; - -static const CORBA::TypeCode_ptr _tc_Marshal_Recursive; - -#ifndef Marshal_Marshal_RecursiveVarH -#define Marshal_Marshal_RecursiveVarH - -#ifndef Marshal_Marshal_RecursivevPtr -#define Marshal_Marshal_RecursivevPtr -typedef Marshal_Recursive* Marshal_Recursive_vPtr; -typedef const Marshal_Recursive* Marshal_Recursive_cvPtr; -#endif - -class Marshal_Recursive_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Marshal_Recursive_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Marshal_Recursive; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Marshal_Recursive_var (const Marshal_Recursive_var &IT_s) { - (void) copyHelper (IT_s); - } - - Marshal_Recursive_var () { - _ptr = NULL; - } - - Marshal_Recursive_var (Marshal_Recursive *IT_p) { - _ptr = IT_p; - } - - Marshal_Recursive_var &operator= (Marshal_Recursive *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Marshal_Recursive_var &operator= (const Marshal_Recursive_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Marshal_Recursive; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Marshal_Recursive_var () { - delete _ptr; - } - - Marshal_Recursive* operator-> () { - return _ptr; - } - - operator Marshal_Recursive_cvPtr () const { return _ptr;} - operator Marshal_Recursive_vPtr& () { return _ptr;} - operator Marshal_Recursive& () const { return * _ptr;} - - protected: - Marshal_Recursive *_ptr; - private: - Marshal_Recursive_var &operator= (const CORBA::_var &IT_s); - Marshal_Recursive_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - - virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -extern const CORBA::TypeCode_ptr _tc_MarshalRef; - -#ifndef MarshalVarH -#define MarshalVarH - -#ifndef MarshalvPtr -#define MarshalvPtr -typedef Marshal* Marshal_vPtr; -typedef const Marshal* Marshal_cvPtr; -#endif - -class Marshal_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Marshal_var &IT_s) { - { - _ptr = Marshal_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Marshal_var (const Marshal_var &IT_s) { - (void) copyHelper (IT_s); - } - - Marshal_var () { - _ptr = Marshal_nil (); - } - - Marshal_var (Marshal *IT_p) { - _ptr = IT_p; - } - - Marshal_var &operator= (Marshal *IT_p) { - Marshal_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Marshal_var &operator= (const Marshal_var &IT_s) { - Marshal_release (_ptr); - _ptr = Marshal_duplicate (IT_s._ptr); - return (*this); - } - - ~Marshal_var () { - Marshal_release (_ptr); - } - - Marshal* operator-> () { - return _ptr; - } - - operator Marshal_cvPtr () const { return _ptr;} - operator Marshal_vPtr& () { return _ptr;} - - protected: - Marshal *_ptr; - private: - Marshal_var &operator= (const CORBA::_var &IT_s); - Marshal_var (const CORBA::_var &IT_s); - Marshal_var &operator= (const CORBA::_mgr &IT_s); - Marshal_var &operator= (const CORBA::_SeqElem &IT_s); - Marshal_var (const CORBA::_mgr &IT_s); - Marshal_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef MarshalMgrH -#define MarshalMgrH - -class Marshal_mgr : public CORBA::_mgr -{ - public: - - Marshal_mgr () { - _ptr = Marshal_nil (); - _release = 1; - } - - Marshal_mgr (const Marshal_mgr &IT_s) { - _ptr = Marshal_duplicate (IT_s._ptr); - _release = 1; - } - - Marshal_mgr &operator= (Marshal *IT_p) { - if (_ptr && _release) - Marshal_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Marshal_mgr &operator= (const Marshal_mgr &IT_s) { - if (_ptr && _release) - Marshal_release (_ptr); - _ptr = Marshal_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Marshal_mgr &operator= (Marshal_var &IT_s) { - if (_ptr && _release) - Marshal_release (_ptr); - _ptr = Marshal_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Marshal_mgr () { - if (_release) - Marshal_release (_ptr); - } - - unsigned char release () { - return _release; - } - - void release (unsigned char rel) { - _release = rel; - } - - operator int () const { - return (((CORBA::Object_ptr) _ptr) ? 1 : 0); - } - - operator void* () const { - return _ptr; - } - - operator CORBA::Object * () const { - return (CORBA::Object *) _ptr; - } - - operator Marshal* () const { - return (Marshal*) _ptr; - } - - Marshal_ptr operator-> () const { - return _ptr; - } - - Marshal *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Marshal_mgr Marshal_mgr_IT_const; -#endif - -#ifndef MarshalSeqElemH -#define MarshalSeqElemH - -class Marshal_SeqElem : public CORBA::_SeqElem -{ - public: - - Marshal_SeqElem (Marshal_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Marshal_SeqElem &operator= (Marshal_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Marshal_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Marshal_SeqElem &operator= (const Marshal_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Marshal_release (*(_ptr)); - *(_ptr) = Marshal_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Marshal_ptr () const { - return _ptr ? (Marshal_ptr) (*_ptr) : Marshal_nil(); - } - - Marshal_ptr operator->() const { return *_ptr;} - - protected: - Marshal_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Marshal(X) Marshal##X - -#define DEF_TIE_Marshal(X) \ - class Marshal##X : public virtual Marshal { \ - X* m_obj; \ - public: \ - \ - \ - Marshal##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Marshal(), m_obj(objp) { \ - m_pptr = new Marshal_dispatch \ - (( Marshal*)this,(CORBA::Object*)this,m,l,Marshal_IR,m_obj); \ - } \ - Marshal##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Marshal() { \ - m_pptr = new Marshal_dispatch \ - (( Marshal*)this,(CORBA::Object*)this,IT_m,Marshal_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Marshal##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_short ( s1, s2,IT_env);\ -}\ - \ -virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_long ( l1, l2,IT_env);\ -}\ - \ -virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_octet ( o1, o2,IT_env);\ -}\ - \ -virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_char ( c1, c2,IT_env);\ -}\ - \ -virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_double ( d1, d2,IT_env);\ -}\ - \ -virtual void test_struct (const Marshal::Marshal_Struct& ms1, Marshal::Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_struct ( ms1, ms2,IT_env);\ -}\ - \ -virtual void test_union (const Marshal::Marshal_Union& u1, Marshal::Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_union ( u1, u2,IT_env);\ -}\ - \ -virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_any ( a1, a2,IT_env);\ -}\ - \ -virtual void test_sequence (const Marshal::AnySeq& as1, Marshal::AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_sequence ( as1, as2,IT_env);\ -}\ - \ -virtual void test_recursive (const Marshal::Marshal_Recursive& mr1, Marshal::Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_recursive ( mr1, mr2,IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Marshal \ -virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_short ( s1, s2,IT_env);\ -}\ - \ -virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_long ( l1, l2,IT_env);\ -}\ - \ -virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_octet ( o1, o2,IT_env);\ -}\ - \ -virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_char ( c1, c2,IT_env);\ -}\ - \ -virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_double ( d1, d2,IT_env);\ -}\ - \ -virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_struct ( ms1, ms2,IT_env);\ -}\ - \ -virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_union ( u1, u2,IT_env);\ -}\ - \ -virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_any ( a1, a2,IT_env);\ -}\ - \ -virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_sequence ( as1, as2,IT_env);\ -}\ - \ -virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->test_recursive ( mr1, mr2,IT_env);\ -}\ - - - - -class MarshalProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - MarshalProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Marshal_IR, IT_p) {} - - virtual void* New (char *IT_OR, CORBA::Environment&); - - virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - - virtual void* New2 (); - - virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); - - virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - - virtual CORBA::Object* New2Object (); - - virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - - virtual CORBA::PPTR* pptr (void *IT_p); - - virtual void baseInterfaces (_IDL_SEQUENCE_string&); - - -}; - -extern MarshalProxyFactoryClass MarshalProxyFactory; - -class MarshalBOAImpl : public virtual Marshal { -public: - MarshalBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Marshal_IR)) - m_pptr = new Marshal_dispatch ( (Marshal*)this, - (CORBA::Object*)this, m, l, Marshal_IR, this); -} - - virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#ifndef _IDL_SEQUENCE_Marshal_Marshal_Recursive_defined -#define _IDL_SEQUENCE_Marshal_Marshal_Recursive_defined - -class _IDL_SEQUENCE_Marshal_Marshal_Recursive { - CORBA::ULong _maximum; - CORBA::ULong _length; - Marshal::Marshal_Recursive* _buffer; - unsigned char _release; - - public: - _IDL_SEQUENCE_Marshal_Marshal_Recursive& operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&); - _IDL_SEQUENCE_Marshal_Marshal_Recursive (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&); - - _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max); - _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max, CORBA::ULong length, Marshal::Marshal_Recursive* data, CORBA::Boolean release = 0); - _IDL_SEQUENCE_Marshal_Marshal_Recursive (); - - ~_IDL_SEQUENCE_Marshal_Marshal_Recursive (); - - static Marshal::Marshal_Recursive* allocbuf(CORBA::ULong nelems); - static void freebuf(Marshal::Marshal_Recursive* data); - - CORBA::ULong maximum() const; - CORBA::ULong length() const; - void length (CORBA::ULong len); - - Marshal::Marshal_Recursive& operator [] (CORBA::ULong IT_i); - - const Marshal::Marshal_Recursive& operator [] (CORBA::ULong IT_i) const; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); -}; - -extern const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_Marshal_Marshal_Recursive; - -#ifndef _IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH -#define _IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH - -#ifndef _IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr -#define _IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr -typedef _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr; -typedef const _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr; -#endif - -class _IDL_SEQUENCE_Marshal_Marshal_Recursive_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) { - (void) copyHelper (IT_s); - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var () { - _ptr = NULL; - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) { - _ptr = IT_p; - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~_IDL_SEQUENCE_Marshal_Marshal_Recursive_var () { - delete _ptr; - } - - _IDL_SEQUENCE_Marshal_Marshal_Recursive* operator-> () { - return _ptr; - } - - operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr () const { return _ptr;} - operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr& () { return _ptr;} - operator _IDL_SEQUENCE_Marshal_Marshal_Recursive& () const { return * _ptr;} - - const Marshal::Marshal_Recursive& operator[] (CORBA::ULong index) const; - - Marshal::Marshal_Recursive& operator[] (CORBA::ULong index); - - protected: - _IDL_SEQUENCE_Marshal_Marshal_Recursive *_ptr; - private: - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const CORBA::_var &IT_s); - _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - - -void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Union& IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Union*& IT_t); - - -void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Recursive& IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Recursive*& IT_t); - - -void operator<<= (CORBA::any &IT_a, Marshal_ptr IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal_ptr& IT_t); - - -void operator<<= (CORBA::any &IT_a, const Marshal::_IDL_SEQUENCE_Marshal_Marshal_Recursive& IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::_IDL_SEQUENCE_Marshal_Marshal_Recursive*& IT_t); - - -void operator<<= (CORBA::any &IT_a, const _IDL_SEQUENCE_Marshal_Marshal_Recursive& IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, _IDL_SEQUENCE_Marshal_Marshal_Recursive*& IT_t); - - -void operator<<= (CORBA::any &IT_a, Marshal::discrim IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::discrim& IT_t); - - -void operator<<= (CORBA::any &IT_a, const _IDL_SEQUENCE_any& IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, _IDL_SEQUENCE_any*& IT_t); - - -void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Struct& IT_t); -CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Struct*& IT_t); - - -#endif diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl b/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl deleted file mode 100644 index 80b3ec9ab20..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl +++ /dev/null @@ -1,90 +0,0 @@ -// $Id$ - -// Interface for the marshal benchmark - -interface Marshal -{ - struct Marshal_Struct - { - short s; - long l; - char c; - octet o; - double d; - }; - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th}; - - union Marshal_Union - switch (discrim) - { - case e_0th: - short s; - case e_1st: - long l; - case e_2nd: - char c; - case e_3rd: - octet o; - case e_4th: - double d; - default: // this will test typecode indirection - Marshal_Struct ms; - }; - - /* - typedef sequence<short> ShortSeq; - typedef sequence<long> LongSeq; - typedef sequence<octet> OctetSeq; - typedef sequence<char> CharSeq; - typedef sequence<double> DoubleSeq; - typedef sequence<Marshal_Struct> StructSeq; - typedef sequence<Marshal_Union> UnionSeq; - */ - // for testing sequences of Any - typedef sequence<any> AnySeq; - - // testing recursive behavior - // complex. - struct Marshal_Recursive - { - // we use this to test the limited recursion allowed by IDL. This is an - // ideal test for indirected typecodes. - - // simulate a behavior of a list node - any value; - sequence <Marshal_Recursive> next; - }; - - void test_short (in short s1, out short s2); // test a short - void test_long (in long l1, out long l2); // test a long - void test_octet (in octet o1, out octet o2); // test an octet - void test_char (in char c1, out char c2); // test a char - void test_double (in double d1, out double d2); // test a double - void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a - // struct - void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a - // union. - void test_any (in any a1, out any a2); // test an Any - /* - void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in - CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in - UnionSeq us1, in AnySeq as1, - out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out - CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out - UnionSeq us2, out AnySeq as2); - */ - void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a - // 3 level indirection - - // sequence, any, and its - // value type - void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); // - // very complicated -}; - - - - - - - diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp deleted file mode 100644 index fcd4aead376..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp +++ /dev/null @@ -1,1338 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Orbix marshal benchmark -// -// = FILENAME -// orbix_marshal_proxy.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -//#define USE_INIT -#include "orbix_marshal_client.h" - -#if !defined (__ACE_INLINE__) -#include "orbix_marshal_client.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(Orbix, orbix_marshal_client, "$Id$") - -int -Orbix_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - char **argv; - int argc; - CORBA::Object_ptr target; - char *markerserver; - int mlen=0, slen=0; // length of marker and service name - -#if 0 - // get the argument list to be passed on to the ORB_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->orb_ = CORBA::ORB_init (argc, (char *const *)argv, "Orbix"); - if (this->orb_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } -#endif - - // create a marker server - if (options.service_name ()) - slen = ACE_OS::strlen (options.service_name ()); - if (options.object_name ()) - mlen = ACE_OS::strlen (options.object_name ()); - - if (slen > 0) - { - markerserver = new char [mlen+slen+1+1]; - ACE_OS::sprintf (markerserver, "%s:%s", (mlen ? options.object_name ():""), - options.service_name ()); - ACE_DEBUG ((LM_DEBUG, "markerserver = %s\n", markerserver)); - } - else // server name is required - { - markerserver = NULL; - } - - // get the obj ref by binding it to the specified host using the specified obj_name - try { - target = Marshal::_bind (markerserver, options.hostname ()); - } - catch (CORBA::SystemException &se) - { - cerr << "failed to bind: " << &se << endl; - return 0; - } - if (CORBA::is_nil (target)) - { - ACE_DEBUG ((LM_DEBUG, "bind call failed\n")); - return -1; - } - - this->ref_ = Marshal::_narrow (target); - if (CORBA::is_nil (this->ref_)) - { - ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n")); - return -1; - } - - // tell the "results" object what file it must store the results into - results.filename (options.filename ()); - - // use SII or DII accordingly - switch (options.policy ()) - { - case CORBA_Marshal_Options::STATIC : // use SII - return this->use_sii (options, results); - break; - case CORBA_Marshal_Options::DYNAMIC : // use DII - return this->use_dii (options, results); - break; - default: - ACE_DEBUG ((LM_DEBUG, "bad policy\n")); - return -1; - } - // hopefully we are never here, else something is seriously wrong - return -1; -} - -int -Orbix_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - int i; - int status = 0; - // This method tests the static invocation interface - - for (i=0; i < options.iterations () && !status; i++) - { - switch (options.data_type ()) - { - // shorts - case CORBA_Marshal_Options::SHORT: - status = sii_test_short (options, results); - break; - // longs - case CORBA_Marshal_Options::LONG: - status = sii_test_long (options, results); - break; - // octets - case CORBA_Marshal_Options::OCTET: - status = sii_test_octet (options, results); - break; - // chars - case CORBA_Marshal_Options::CHAR: - status = sii_test_char (options, results); - break; - // doubles - case CORBA_Marshal_Options::DOUBLE: - status = sii_test_double (options, results); - break; - // Structs - case CORBA_Marshal_Options::STRUCT: - status = sii_test_struct (options, results); - break; - // unions - case CORBA_Marshal_Options::UNION: - status = sii_test_union (options, results); - break; - // anys - case CORBA_Marshal_Options::ANY: - status = sii_test_any (options, results); - break; - // sequences - case CORBA_Marshal_Options::SEQUENCE: - status = sii_test_sequence (options, results); - break; - // longs - case CORBA_Marshal_Options::RECURSIVE: - // status = sii_test_recursive (options, results); - // doesn't work - break; - default: - status = -1; - } // end of switch - } // for loop - - if (!status) - return 0; - else - return -1; -} - -int -Orbix_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - int i; - int status = 0; - // This method tests the dynamic invocation interface - - for (i=0; i < options.iterations () && !status; i++) - { - switch (options.data_type ()) - { - // shorts - case CORBA_Marshal_Options::SHORT: - status = dii_test_short (options, results); - break; - // longs - case CORBA_Marshal_Options::LONG: - status = dii_test_long (options, results); - break; - // octets - case CORBA_Marshal_Options::OCTET: - status = dii_test_octet (options, results); - break; - // chars - case CORBA_Marshal_Options::CHAR: - status = dii_test_char (options, results); - break; - // doubles - case CORBA_Marshal_Options::DOUBLE: - status = dii_test_double (options, results); - break; - // Structs - case CORBA_Marshal_Options::STRUCT: - status = dii_test_struct (options, results); - break; - // unions - case CORBA_Marshal_Options::UNION: - status = dii_test_union (options, results); - break; - // anys - case CORBA_Marshal_Options::ANY: - status = dii_test_any (options, results); - break; - // sequences - case CORBA_Marshal_Options::SEQUENCE: - status = dii_test_sequence (options, results); - break; - // longs - case CORBA_Marshal_Options::RECURSIVE: - // status = dii_test_recursive (options, results); - // doesn't work - break; - default: - status = -1; - } // end of switch - } // for loop - - if (!status) - return 0; - else - return -1; -} - - -// all helper functions : SII -int -Orbix_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - CORBA::Short s1, s2; - s1 = 3; - ref_->test_short (s1, s2); - if (s2 == 2*s1) - { - ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2)); - return -1; - } -} - -int -Orbix_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - CORBA::Long l1, l2; - l1 = 256; - ref_->test_long (l1, l2); - if (l2 == 3*l1) - { - ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2)); - return -1; - } -} - -int -Orbix_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // octets -{ - CORBA::Octet o1, o2; - o1 = (CORBA::Octet) 127; - ref_->test_octet (o1, o2); - if (o1 == o2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2)); - return -1; - } -} - -int -Orbix_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // chars -{ - CORBA::Char c1, c2; - c1 = 'B'; - ref_->test_char (c1, c2); - if (c1 == c2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2)); - return -1; - } -} - -int -Orbix_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // doubles -{ - CORBA::Double d1, d2; - d1 = 3.1415; - ref_->test_double (d1, d2); - if (d2 == d1/2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2)); - return -1; - } -} - -int -Orbix_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // structs -{ - Marshal::Marshal_Struct ms1, ms2; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - ref_->test_struct (ms1, ms2); - if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o && - ms1.d == ms2.d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n")); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n")); - return -1; - } -} - -int -Orbix_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // unions -{ - Marshal::Marshal_Union u1, u2; - Marshal::Marshal_Struct ms; - - // first test an enumerated case - // u1._d (Marshal::e_1st); Orbix does this on its own - u1.l (4567); - - ref_->test_union (u1, u2); - if ( (u1._d () == u2._d()) && (u1.l () == u2.l ())) - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n")); - return -1; - } - - // now test the default case - // In Orbix, setting each field like this will not work because the poor - // Union has no clue what discriminant it must set to. -#if 0 - u1.ms ().s = 3; - u1.ms ().l = 256; - u1.ms ().c = 'B'; - u1.ms ().o = (CORBA::Octet) 127; - u1.ms ().d = 3.1415; -#endif - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA::Octet) 127; - ms.d = 3.1415; - - u1.ms (ms); - - ref_->test_union (u1, u2); - - if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o && - u1.ms ().d == u2.ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n")); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n")); - return -1; - } -} - -int -Orbix_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we send a struct thru the any - CORBA::Any a1, *a2; - Marshal::Marshal_Struct ms1, *ms2; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - // populate the any with a MarshalStruct - a1 <<= ms1; - - a2 = new CORBA::Any; - - // now test it - ref_->test_any (a1, a2); - - // check if the two typecodes are equal - if (a2->type ()->equal (Marshal::_tc_Marshal_Struct)) - { - // now see if the values are same - ms2 = (Marshal::Marshal_Struct *)a2->value (); - if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o && - ms1.d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_any success\n")); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n")); - return -1; - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n")); - } - return 0; -} - -int -Orbix_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // make a sequence of Anys and fill each one with a different data type - Marshal::AnySeq as1 (7), *as2; - Marshal::Marshal_Struct ms; - Marshal::Marshal_Union u; - - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA::Octet) 127; - ms.d = 3.1415; - - u.ms (ms); - - // it looks like we must tell the sequence how many elements it is going to - // carry. By just fixing the max value does not work. - - as1.length (7); - - as1[0] <<= (CORBA::Short)3; - as1[1] <<= (CORBA::Long) 256; - as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127); - as1[3] <<= CORBA::Any::from_char ('B'); - as1[4] <<= (CORBA::Double)3.1415; // double - as1[5] <<= ms; // struct - as1[6] <<= u; // union - - as2 = new Marshal::AnySeq; - - ref_->test_sequence (as1, as2); - - ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n")); - if (as1.length () == as2->length ()) - { - // now make sure that the elements are same - for (int i=0; i < as1.length (); i++) - { - if (as1[i].type ()->equal ((*as2)[i].type ())) - { - // now see if the values are same - switch (i) - { - case 0: - if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n")); - } - break; - case 1: - if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n")); - } - break; - case 2: - if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n")); - } - break; - case 3: - if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n")); - } - break; - case 4: - if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n")); - } - break; - case 5: - { - Marshal::Marshal_Struct *ms1, *ms2; - - ms1 = (Marshal::Marshal_Struct *)as1[i].value (); - ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value (); - - if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o && - ms1->d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n")); - } - } - break; - case 6: - { - Marshal::Marshal_Union *u1, *u2; - - u1 = (Marshal::Marshal_Union *)as1[i].value (); - u2 = (Marshal::Marshal_Union *)(*as2)[i].value (); - - if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s && - u1->ms ().l == u2->ms ().l && - u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o && - u1->ms ().d == u2->ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n")); - } - } - break; - } - } - else - { - ACE_DEBUG ((LM_DEBUG, - "SII test_sequence: typecode mismatch for element %d\n", i)); - break; - } - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n", - as2->length ())); - } - return 0; -} - -int -Orbix_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we will try a simple one here - Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2; - - mr1.value <<= (CORBA::Long)1; - mr1.next.length (1); // sequence of length 1 - - // fill the element - elem1 = &mr1.next[0]; - elem1->value <<= CORBA::Any::from_char ('D'); - elem1->next.length (0); // end of seq - - mr2 = new Marshal::Marshal_Recursive; - - try { - ref_->test_recursive (mr1, mr2); - } - catch (CORBA::SystemException &se){ - cerr << "error invoking request: " << se << endl; - } - - elem2 = &mr2->next[0]; - - if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ()) - && (mr1.next.length () == mr2->next.length ()) // same length sequence - && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ()) - && (elem1->next.length () == elem2->next.length ())) - { - ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n")); - } - - return 0; -} - -// ------------------------------------------------------- -// all helper functions : DII -// ------------------------------------------------------- - -int -Orbix_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Short s1, s2; - - s1 = 3; - s2 = 0; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add (CORBA::ARG_IN)->value ()) <<= s1; - // this usage is also correct. All we care is to supply a storage area for - // the OUT parameter - // arglist->add (CORBA::ARG_OUT)->value ()->replace (CORBA::_tc_short, &s2); - *(arglist->add (CORBA::ARG_OUT)->value ()) <<= s2; - orb_->create_list(1, result_list); // 1 result - result = result_list->item (0); - - // create a request - ref_->_create_request(ctx, - "test_short", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= s2; - - if (s2 == 2*s1) - { - ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Long l1, l2; - - l1 = 256; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= l1; - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_long, &l2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_long", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= l2; - - if (l2 == 3*l1) - { - ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // octets -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Octet o1, o2; - - o1 = (CORBA::Octet) 127; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_octet (o1); - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_octet, &o2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_octet", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= CORBA::Any::to_octet (o2); - - if (o1 == o2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // chars -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Char c1, c2; - - c1 = 'B'; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_char (c1); - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_char, &c2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_char", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= CORBA::Any::to_char (c2); - - if (c1 == c2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // doubles -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Double d1, d2; - - d1 = 3.1415; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= d1; - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_double, &d2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_double", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= d2; - - if (d2 == d1/2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // structs -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - Marshal::Marshal_Struct ms1, *ms2=0; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= ms1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, ms2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_struct", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= ms2; - - if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o && - ms1.d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n")); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // unions -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - Marshal::Marshal_Union u1, *u2 = 0; - Marshal::Marshal_Struct ms; - - - // first test an enumerated case - // u1._d (Marshal::e_1st); - u1.l (4567); - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= u1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, u2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_union", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= u2; - - if ( (u1._d () == u2->_d()) && (u1.l () == u2->l ())) - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n")); - } - delete u2; - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - - // test the default case - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA::Octet) 127; - ms.d = 3.1415; - - u1.ms (ms); - u2 = 0; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= u1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, u2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_union", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= u2; - - if (u1.ms ().s == u2->ms ().s && u1.ms ().l == u2->ms ().l && u1.ms ().c == u2->ms ().c && u1.ms ().o == u2->ms ().o && - u1.ms ().d == u2->ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n")); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - // we send a struct thru the any - CORBA::Any a1, *a2; - Marshal::Marshal_Struct ms1, *ms2; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - // populate the any with a MarshalStruct - a1 <<= ms1; - - a2 = new CORBA::Any; - - // now test it - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= a1; - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_any, a2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_any", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= (*a2); - - // check if the two typecodes are equal - if (a2->type ()->equal (Marshal::_tc_Marshal_Struct)) - { - // now see if the values are same - ms2 = (Marshal::Marshal_Struct *)a2->value (); - if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o && - ms1.d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_any success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n")); - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n")); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - // make a sequence of Anys and fill each one with a different data type - Marshal::AnySeq as1 (7), *as2; - Marshal::Marshal_Struct ms; - Marshal::Marshal_Union u; - - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA::Octet) 127; - ms.d = 3.1415; - - u.ms (ms); - - // it looks like we must tell the sequence how many elements it is going to - // carry. By just fixing the max value does not work. - - as1.length (7); - - as1[0] <<= (CORBA::Short)3; - as1[1] <<= (CORBA::Long) 256; - as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127); - as1[3] <<= CORBA::Any::from_char ('B'); - as1[4] <<= (CORBA::Double)3.1415; // double - as1[5] <<= ms; // struct - as1[6] <<= u; // union - - as2 = new Marshal::AnySeq; - - orb_->create_list(2, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= as1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_sequence", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= as2; - - ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n")); - if (as1.length () == as2->length ()) - { - // now make sure that the elements are same - for (int i=0; i < as1.length (); i++) - { - if (as1[i].type ()->equal ((*as2)[i].type ())) - { - // now see if the values are same - switch (i) - { - case 0: - if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n")); - } - break; - case 1: - if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n")); - } - break; - case 2: - if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n")); - } - break; - case 3: - if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n")); - } - break; - case 4: - if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n")); - } - break; - case 5: - { - Marshal::Marshal_Struct *ms1, *ms2; - - ms1 = (Marshal::Marshal_Struct *)as1[i].value (); - ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value (); - - if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o && - ms1->d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n")); - } - } - break; - case 6: - { - Marshal::Marshal_Union *u1, *u2; - - u1 = (Marshal::Marshal_Union *)as1[i].value (); - u2 = (Marshal::Marshal_Union *)(*as2)[i].value (); - - if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s && - u1->ms ().l == u2->ms ().l && - u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o && - u1->ms ().d == u2->ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n")); - } - } - break; - } - } - else - { - ACE_DEBUG ((LM_DEBUG, - "DII test_sequence: typecode mismatch for element %d\n", i)); - break; - } - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n", - as2->length ())); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Orbix_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we will try a simple one here - Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2; - - mr1.value <<= (CORBA::Long)1; - mr1.next.length (1); // sequence of length 1 - - // fill the element - elem1 = &mr1.next[0]; - elem1->value <<= CORBA::Any::from_char ('D'); - elem1->next.length (0); // end of seq - - mr2 = new Marshal::Marshal_Recursive; - - try { - ref_->test_recursive (mr1, mr2); - } - catch (CORBA::SystemException &se){ - cerr << "error invoking request: " << se << endl; - } - - elem2 = &mr2->next[0]; - - if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ()) - && (mr1.next.length () == mr2->next.length ()) // same length sequence - && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ()) - && (elem1->next.length () == elem2->next.length ())) - { - ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n")); - } - - return 0; -} - diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h deleted file mode 100644 index c22f71f0d16..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h +++ /dev/null @@ -1,125 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Marshal Orbix Benchmark -// -// = FILENAME -// orbix_marshal_client.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _ORBIX_MARSHAL_CLIENT_H_ -#define _ORBIX_MARSHAL_CLIENT_H_ - -// benchmark library includes -#include "benchmark/marshal_options.h" -#include "benchmark/marshal_results.h" -#include "benchmark/marshal_proxy.h" - -// include Orbix specific include files -#include "marshal.h" // generated by IDL compiler - -class Orbix_Marshal_Client_Proxy : public CORBA_Marshal_Proxy -{ - // =TITLE - // Orbix_Marshal_Client_Proxy - // =DESCRIPTION - // Orbix client size specialization of the CORBA Marshal proxy class -public: - Orbix_Marshal_Client_Proxy (void); - // constructor - - ~Orbix_Marshal_Client_Proxy (void); - // destructor - - virtual int run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // do the actual work - - virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // use the static invocation interface - - virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // use the dynamic invocation interface -private: - // =helper functions - int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - // all the DII helpers - int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - CORBA::ORB_ptr orb_; - // handle to the underlying orb - - Marshal_ptr ref_; - // the object reference -}; - -#if defined (__ACE_INLINE__) -#include "orbix_marshal_client.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i deleted file mode 100644 index a99b72db952..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - - -ACE_INLINE -Orbix_Marshal_Client_Proxy::Orbix_Marshal_Client_Proxy (void) - : orb_ (CORBA::ORB::_nil ()), - ref_ (0) -{ -} - -ACE_INLINE -Orbix_Marshal_Client_Proxy::~Orbix_Marshal_Client_Proxy (void) -{ - // releasing order is important - - // release the reference - CORBA::release (ref_); - - // release the ORB - CORBA::release (orb_); -} - - diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp deleted file mode 100644 index 282d9e4f309..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp +++ /dev/null @@ -1,313 +0,0 @@ -// $Id$ - -#include "orbix_marshal_impl.h" - -#if !defined (__ACE_INLINE__) -#include "orbix_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(Orbix, orbix_marshal_impl, "$Id$") - -// All the methods of the SSI class -void -Marshal_SSI_Impl::test_short (CORBA::Short s1, - CORBA::Short &s2, - CORBA::Environment &IT_env) -{ - s2 = 2*s1; -} - -void -Marshal_SSI_Impl::test_long (CORBA::Long l1, - CORBA::Long &l2, - CORBA::Environment &IT_env) -{ - l2 = 3*l1; -} - -void -Marshal_SSI_Impl::test_octet (CORBA::Octet o1, - CORBA::Octet &o2, - CORBA::Environment &IT_env) -{ - o2 = o1; -} - -void -Marshal_SSI_Impl::test_char (CORBA::Char c1, - CORBA::Char &c2, - CORBA::Environment &IT_env) -{ - c2 = c1; -} - -void -Marshal_SSI_Impl::test_double (CORBA::Double d1, - CORBA::Double &d2, - CORBA::Environment &IT_env) -{ - d2 = d1/2; -} - -void -Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA::Environment &IT_env) -{ - ms2.s = ms1.s; - ms2.l = ms1.l; - ms2.c = ms1.c; - ms2.o = ms1.o; - ms2.d = ms1.d; -} - -void -Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA::Environment &IT_env) -{ - switch (u1._d ()) - { - case Marshal::e_0th: - u2.s (u1.s ()); // set short - break; - case Marshal::e_1st: - u2.l (u1.l ()); // set long - break; - case Marshal::e_2nd: - u2.c (u1.c ()); // set char - break; - case Marshal::e_3rd: - u2.o (u1.o ()); // set octet - break; - case Marshal::e_4th: - u2.d (u1.d ()); // set double - break; - case Marshal::e_5th: - default: - u2.ms (u1. ms ()); // set structs - break; - } -} - -void -Marshal_SSI_Impl::test_any (const CORBA::Any &a1, - CORBA::Any *&a2, - CORBA::Environment &IT_env) -{ - a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy -} - -void -Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2, - CORBA::Environment &IT_env) -{ - as2 = new Marshal::AnySeq (as1); -} - -void -Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1, - Marshal::Marshal_Recursive *&mr2, - CORBA::Environment &IT_env) -{ -} - -//---------------------------------------------------------------------------- -//the methods of the DSI implementation class - -void -Marshal_DSI_Impl::invoke (CORBA::ServerRequest& req, CORBA::Environment_ptr - ep, CORBA::Environment &IT_env) -{ - ACE_DEBUG ((LM_DEBUG, "************ inside invoke **********\n")); - // parse the incoming request and find out for what operation it is. We use a - // simple linear search here - if (!ACE_OS::strcmp (req.op_name (IT_env), "test_short")) - { - test_short_skel (req); - } - else if (!ACE_OS::strcmp (req.op_name (), "test_long")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_octet")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_char")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_double")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_struct")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_union")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_any")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_sequence")) - { - } -} - -void -Marshal_DSI_Impl::test_short (CORBA::Short s1, - CORBA::Short &s2) -{ - s2 = 5*s1; -} - -void -Marshal_DSI_Impl::test_long (CORBA::Long l1, - CORBA::Long &l2) -{ - l2 = l1; -} - -void -Marshal_DSI_Impl::test_octet (CORBA::Octet o1, - CORBA::Octet &o2) -{ - o2 = o1; -} - -void -Marshal_DSI_Impl::test_char (CORBA::Char c1, - CORBA::Char &c2) -{ - c2 = c1; -} - -void -Marshal_DSI_Impl::test_double (CORBA::Double d1, - CORBA::Double &d2) -{ - d2 = d1; -} - -void -Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2) -{ - ms2.s = ms1.s; - ms2.l = ms1.l; - ms2.c = ms1.c; - ms2.o = ms1.o; - ms2.d = ms1.d; -} - -void -Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2) -{ - switch (u1._d ()) - { - case Marshal::e_0th: - u2.s (u1.s ()); // set short - break; - case Marshal::e_1st: - u2.l (u1.l ()); // set long - break; - case Marshal::e_2nd: - u2.c (u1.c ()); // set char - break; - case Marshal::e_3rd: - u2.o (u1.o ()); // set octet - break; - case Marshal::e_4th: - u2.d (u1.d ()); // set double - break; - case Marshal::e_5th: - default: - u2.ms (u1. ms ()); // set structs - break; - } -} - -void -Marshal_DSI_Impl::test_any (const CORBA::Any &a1, - CORBA::Any *&a2) -{ - a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy -} - -void -Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2) -{ - as2 = new Marshal::AnySeq (as1); -} - -void -Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1, - Marshal::Marshal_Recursive *&mr2) -{ -} - -// all the helper functions for the DSI class -void -Marshal_DSI_Impl::test_short_skel (CORBA::ServerRequest& req) -{ - CORBA::NVList_ptr short_nv; - CORBA::Any *any_s1, *any_s2; - CORBA::Short s1 = 0, s2 = 0; - - orb_->create_list (2, short_nv); // parse 2 args - any_s1 = new CORBA::Any (CORBA::_tc_short, &s1, 0); - any_s2 = new CORBA::Any (CORBA::_tc_short, &s2, 0); - short_nv->add_value ("s1", *any_s1, CORBA::ARG_IN); - short_nv->add_value ("s2", *any_s2, CORBA::ARG_OUT); - - req.params (short_nv); - - test_short (s1, s2); - ACE_DEBUG ((LM_DEBUG, ">>>>>>>s1 = %d and s2 = %d\n<<<<<<<<", s1, s2)); -} - -void -Marshal_DSI_Impl::test_long_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_octet_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_char_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_double_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_struct_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_union_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_any_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_sequence_skel (CORBA::ServerRequest& req) -{ -} - -void -Marshal_DSI_Impl::test_recursive_skel (CORBA::ServerRequest& req) -{ -} diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h deleted file mode 100644 index 2b62f4bb81b..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h +++ /dev/null @@ -1,195 +0,0 @@ -// $Id$ - -#ifndef ORBIX_MARSHAL_IMPL_H -#define ORBIX_MARSHAL_IMPL_H - -// to include DSI related files - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "marshal.h" - - -class Marshal_SSI_Impl - : public virtual MarshalBOAImpl -{ - // =TITLE - // Marshal_SSI_Impl - // =DESCRIPTION - // Implementation of the interface using the static skeleton interface -public: - Marshal_SSI_Impl (const char *object_name = (const char *)NULL); - // constructor - - ~Marshal_SSI_Impl (void); - // destructor - - virtual void test_short (CORBA::Short s1, - CORBA::Short& s2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test short - - virtual void test_long (CORBA::Long l1, - CORBA::Long& l2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test long - - virtual void test_octet (CORBA::Octet o1, - CORBA::Octet& o2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test octet - - virtual void test_char (CORBA::Char c1, - CORBA::Char& c2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test char - - virtual void test_double (CORBA::Double d1, - CORBA::Double& d2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test double - - virtual void test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test struct - - virtual void test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test union - - virtual void test_any (const CORBA::Any& a1, - CORBA::Any *& a2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test any - - /* - virtual void test_sequence (const Marshal::ShortSeq& s1, - const Marshal::LongSeq& l1, - const Marshal::OctetSeq& o1, - const Marshal::CharSeq& c1, - const Marshal::DoubleSeq& d1, - const Marshal::StructSeq& S1, - const Marshal::UnionSeq& U1, - const Marshal::AnySeq& a1, - Marshal::ShortSeq *& s2, - Marshal::LongSeq *& l2, - Marshal::OctetSeq *& o2, - Marshal::CharSeq *& c2, - Marshal::DoubleSeq *& d2, - Marshal::StructSeq *& S2, - Marshal::UnionSeq *& U2, - Marshal::AnySeq *& a2); - */ - virtual void test_sequence (const Marshal::AnySeq& a1, - Marshal::AnySeq *& a2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test sequence - - virtual void test_recursive (const Marshal::Marshal_Recursive& mr1, - Marshal::Marshal_Recursive *& mr2, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - // test struct - -}; - -class Marshal_DSI_Impl : public CORBA::DynamicImplementation -{ - // =TITLE - // Marshal_DSI_Impl - // =DESCRIPTION - // Implementation of the interface using the dynamic skeleton interface -public: - Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *object_name = (const char *)NULL); - // constructor - - ~Marshal_DSI_Impl (void); - // destructor - -private: - virtual void invoke (CORBA::ServerRequest& req, CORBA::Environment_ptr, - CORBA::Environment&IT_env = - CORBA::IT_chooseDefaultEnv()); - // This method is a must - - void test_short (CORBA::Short s1, - CORBA::Short& s2); - // test short - - void test_long (CORBA::Long l1, - CORBA::Long& l2); - // test long - - void test_octet (CORBA::Octet o1, - CORBA::Octet& o2); - // test octet - - void test_char (CORBA::Char c1, - CORBA::Char& c2); - // test char - - void test_double (CORBA::Double d1, - CORBA::Double& d2); - // test double - - void test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2); - // test struct - - void test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2); - // test union - - void test_any (const CORBA::Any& a1, - CORBA::Any *& a2); - // test any - - void test_sequence (const Marshal::AnySeq& a1, - Marshal::AnySeq *& a2); - // test sequence - - void test_recursive (const Marshal::Marshal_Recursive& mr1, - Marshal::Marshal_Recursive *& mr2); - // test struct - -private: - //= helper functions - they behave as if they were skeletons - void test_short_skel (CORBA::ServerRequest& req); - void test_long_skel (CORBA::ServerRequest& req); - void test_octet_skel (CORBA::ServerRequest& req); - void test_char_skel (CORBA::ServerRequest& req); - void test_double_skel (CORBA::ServerRequest& req); - void test_struct_skel (CORBA::ServerRequest& req); - void test_union_skel (CORBA::ServerRequest& req); - void test_any_skel (CORBA::ServerRequest& req); - void test_sequence_skel (CORBA::ServerRequest& req); - void test_recursive_skel (CORBA::ServerRequest& req); - - // we need the orb to create argument lists (NVList) for us - CORBA::ORB_ptr orb_; // not owned by us - -#if 0 - CORBA::NVList_ptr short_nv_; - CORBA::NVList_ptr long_nv_; - CORBA::NVList_ptr octet_nv_; - CORBA::NVList_ptr char_nv_; - CORBA::NVList_ptr double_nv_; - CORBA::NVList_ptr struct_nv_; - CORBA::NVList_ptr union_nv_; - CORBA::NVList_ptr any_nv_; - CORBA::NVList_ptr seq_nv_; - CORBA::NVList_ptr recursive_nv_; - CORBA::Any_ptr result_; // void result -#endif -}; - -#if defined (__ACE_INLINE__) -#include "orbix_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -#endif // defined (ORBIX_MARSHAL_IMPL_H) diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i deleted file mode 100644 index 0efa658c148..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - -// constructor -ACE_INLINE -Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name) - : MarshalBOAImpl (obj_name) -{ -} - -// destructor -ACE_INLINE -Marshal_SSI_Impl::~Marshal_SSI_Impl (void) -{ -} - -// constructor -ACE_INLINE -Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *obj_name) - : orb_ (orb) -{ -} - -// destructor -ACE_INLINE -Marshal_DSI_Impl::~Marshal_DSI_Impl (void) -{ - orb_ = CORBA::ORB::_nil (); -} - diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp deleted file mode 100644 index 205287577c1..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Orbix marshal benchmark -// -// = FILENAME -// orbix_marshal_server.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -//#define USE_INIT - -#include "orbix_marshal_server.h" - -#if !defined (__ACE_INLINE__) -#include "orbix_marshal_server.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(Orbix, orbix_marshal_server, "$Id$") - -int -Orbix_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - char **argv; - int argc; - -#if 0 - // get the argument list to be passed on to the ORB_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->orb_ = CORBA::ORB_init (argc, (char *const *)argv, "Orbix"); - if (this->orb_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } - - // get the argument list to be passed on to the BOA_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->boa_ = this->orb_->BOA_init (argc, (char *const *)argv, "Orbix_BOA"); - if (this->boa_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } -#endif - // tell the "results" object what file it must store the results into - results.filename (options.filename ()); - - // use SII or DII accordingly - switch (options.policy ()) - { - case CORBA_Marshal_Options::STATIC : // use SSI - this->ssi_ = new Marshal_SSI_Impl (options.object_name ()); - break; - case CORBA_Marshal_Options::DYNAMIC : // use DSI - // this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ())); - this->dsi_ = new Marshal_DSI_Impl (&CORBA::Orbix, ACE_OS::strdup (options.object_name ())); - // register with the BOA - try { - // we need to do a setImpl - //this->boa_->setImpl ("Marshal", *this->dsi_); - CORBA::Orbix.setImpl ("Marshal", *this->dsi_); - } - catch (CORBA::SystemException &se) - { - cerr << "system exception in obj_is_ready" << se << endl; - } - break; - default: - ACE_DEBUG ((LM_DEBUG, "bad policy\n")); - return -1; - } - - ACE_DEBUG ((LM_DEBUG, "Calling impl is ready\n")); - try { - // call impl_is_ready - // this->boa_->impl_is_ready ((char *)options.service_name ()); - CORBA::Orbix.impl_is_ready ("marshalDSI"); - } - catch (CORBA::SystemException &se) - { - cerr << "system exception: " << se << endl; - } - - return 0; -} - diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h deleted file mode 100644 index 3fb2fa83396..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Marshal Orbix Benchmark -// -// = FILENAME -// orbix_marshal_server.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _ORBIX_MARSHAL_SERVER_H_ -#define _ORBIX_MARSHAL_SERVER_H_ - -// benchmark library includes -#include "benchmark/marshal_options.h" -#include "benchmark/marshal_results.h" -#include "benchmark/marshal_proxy.h" - -// implementation classes -#include "orbix_marshal_impl.h" - -// include Orbix specific include files -#include "marshal.h" // generated by IDL compiler - -class Orbix_Marshal_Server_Proxy : public CORBA_Marshal_Proxy -{ -public: - Orbix_Marshal_Server_Proxy (void); - // constructor - - ~Orbix_Marshal_Server_Proxy (void); - // destructor - - virtual int run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // do the actual work -private: - CORBA::ORB_ptr orb_; - // underlying orb; - - CORBA::BOA_ptr boa_; - // underlying boa; - - Marshal_SSI_Impl *ssi_; - Marshal_DSI_Impl *dsi_; - // the implementation (SSI or DSI) -}; - - -#if defined (__ACE_INLINE__) -#include "orbix_marshal_server.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i deleted file mode 100644 index 8219d7d5042..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -// constructor -ACE_INLINE -Orbix_Marshal_Server_Proxy::Orbix_Marshal_Server_Proxy (void) - : orb_ (0), - boa_ (0), - ssi_ (0), - dsi_ (0) -{ -} - -// destructor -ACE_INLINE -Orbix_Marshal_Server_Proxy::~Orbix_Marshal_Server_Proxy (void) -{ - // releasing order is important - - // release the impl - delete ssi_; - delete dsi_; - - // release the BOA - CORBA::release (boa_); - - // release the ORB - CORBA::release (orb_); -} diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_client b/TAO/Benchmark/Marshal_Test/Orbix/run_client deleted file mode 100755 index b0f7503d7bc..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/run_client +++ /dev/null @@ -1,23 +0,0 @@ -echo "********* Static Invocation Interface **********" -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T s -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T l -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T o -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T c -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T d -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T S -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T U -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T A -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T Q -#client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T R -# -echo "********* Dynamic Invocation Interface **********" -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T s -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T l -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T o -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T c -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T d -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T S -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T U -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T A -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T Q - diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi b/TAO/Benchmark/Marshal_Test/Orbix/run_dsi deleted file mode 100755 index f44f488aee7..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi +++ /dev/null @@ -1,4 +0,0 @@ -echo "********* Static Invocation Interface **********" -client -i 1 -h mambo -R s -P S -n marshalDSI -T s -echo "********* Dynamic Invocation Interface **********" -client -i 1 -h mambo -R s -P D -n marshalDSI -T s diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server b/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server deleted file mode 100755 index 19dc309e0dc..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server +++ /dev/null @@ -1 +0,0 @@ -putit marshalDSI "${TAO_ROOT}/Benchmark/Marshal_Test/Orbix/server -R r -P D -I V -o dsi_marshal -n marshalDSI"
\ No newline at end of file diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi b/TAO/Benchmark/Marshal_Test/Orbix/run_ssi deleted file mode 100755 index 9a1ca614e4e..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi +++ /dev/null @@ -1,4 +0,0 @@ -echo "********* Static Invocation Interface **********" -client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T s -echo "********* Dynamic Invocation Interface **********" -client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T s diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server b/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server deleted file mode 100755 index a0af5a0dcf4..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server +++ /dev/null @@ -1 +0,0 @@ -putit marshalSSI "${TAO_ROOT}/Benchmark/Marshal_Test/Orbix/server -R r -P S -I V -o ssi_marshal -n marshalSSI"
\ No newline at end of file diff --git a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/server.cpp deleted file mode 100644 index 9a0696645d8..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "orbix_marshal_server.h" - -ACE_RCSID(Orbix, server, "$Id$") - -int main (int argc, char *argv []) -{ - // instantiate a DRIVER with the Orbix_Client_Proxy as the template - CORBA_Benchmark_Driver<Orbix_Marshal_Server_Proxy> driver (new - Orbix_Marshal_Server_Proxy ()); - - // let the driver do everything for us so that we remain very simple - return driver.run (argc, argv); -} diff --git a/TAO/Benchmark/Marshal_Test/TAO/Makefile b/TAO/Benchmark/Marshal_Test/TAO/Makefile deleted file mode 100644 index abae0c5a297..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the Tao Marshal Benchmark -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lACE -lbenchmark -lTAO - -PROG_SRCS = marshalC.cpp marshalS.cpp tao_marshal_client.cpp tao_marshal_server.cpp \ - tao_marshal_impl.cpp client.cpp server.cpp - -LSRC = $(PROG_SRCS) - -MARSHAL_CLIENT_OBJS = marshalC.o tao_marshal_client.o client.o - -MARSHAL_SERVER_OBJS = marshalC.o marshalS.o tao_marshal_impl.o tao_marshal_server.o server.o - -BIN = client server - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -#---------------------------------------------------------------------------- -# 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.lib.GNU -#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -server: $(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -client: $(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -clean: - $(RM) core *.o *~ client server - $(MAKE) realclean diff --git a/TAO/Benchmark/Marshal_Test/TAO/client.cpp b/TAO/Benchmark/Marshal_Test/TAO/client.cpp deleted file mode 100644 index 88cd1518329..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/client.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "tao_marshal_client.h" - -ACE_RCSID(TAO, client, "$Id$") - -int main (int argc, char *argv []) -{ - // instantiate a DRIVER with the Tao_Client_Proxy as the template - CORBA_Benchmark_Driver<Tao_Marshal_Client_Proxy> driver (new - Tao_Marshal_Client_Proxy ()); - - // let the driver do everything for us so that we remain very simple - return driver.run (argc, argv); -} diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshal.idl b/TAO/Benchmark/Marshal_Test/TAO/marshal.idl deleted file mode 100644 index 077a98e58fd..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshal.idl +++ /dev/null @@ -1,91 +0,0 @@ -// $Id$ - -// Interface for the marshal benchmark - -interface Marshal -{ - struct Marshal_Struct - { - short s; - long l; - char c; - octet o; - double d; - }; - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th}; - - union Marshal_Union - switch (discrim) - { - case e_0th: - short s; - case e_1st: - long l; - case e_2nd: - char c; - case e_3rd: - octet o; - case e_4th: - double d; - case e_5th: - default: // this will test typecode indirection - Marshal_Struct ms; - }; - - /* - typedef sequence<short> ShortSeq; - typedef sequence<long> LongSeq; - typedef sequence<octet> OctetSeq; - typedef sequence<char> CharSeq; - typedef sequence<double> DoubleSeq; - typedef sequence<Marshal_Struct> StructSeq; - typedef sequence<Marshal_Union> UnionSeq; - */ - // for testing sequences of Any - typedef sequence<any> AnySeq; - - // testing recursive behavior - // complex. - struct Marshal_Recursive - { - // we use this to test the limited recursion allowed by IDL. This is an - // ideal test for indirected typecodes. - - // simulate a behavior of a list node - any value; - sequence <Marshal_Recursive> next; - }; - - void test_short (in short s1, out short s2); // test a short - void test_long (in long l1, out long l2); // test a long - void test_octet (in octet o1, out octet o2); // test an octet - void test_char (in char c1, out char c2); // test a char - void test_double (in double d1, out double d2); // test a double - void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a - // struct - void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a - // union. - void test_any (in any a1, out any a2); // test an Any - /* - void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in - CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in - UnionSeq us1, in AnySeq as1, - out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out - CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out - UnionSeq us2, out AnySeq as2); - */ - void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a - // 3 level indirection - - // sequence, any, and its - // value type - void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); // - // very complicated -}; - - - - - - - diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp deleted file mode 100644 index 826481dc85a..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp +++ /dev/null @@ -1,2652 +0,0 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#include "marshalC.h" - -#if !defined (__ACE_INLINE__) -#include "marshalC.i" -#endif /* !defined INLINE */ - -void Marshal::_tao_any_destructor (void *x) -{ - Marshal *tmp = ACE_static_cast (Marshal*,x); - CORBA::release (tmp); -} - -Marshal_ptr Marshal::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if (CORBA::is_nil (obj)) - return Marshal::_nil (); - if (! obj->_is_local ()) - { - CORBA::Boolean is_a = obj->_is_a ("IDL:Marshal:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Marshal::_nil ()); - if (is_a == 0) - return Marshal::_nil (); - } - return Marshal::_unchecked_narrow (obj, ACE_TRY_ENV); -} - -Marshal_ptr Marshal::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & - ) -{ - if (CORBA::is_nil (obj)) - return Marshal::_nil (); - if (! obj->_is_local ()) - { - TAO_Stub* stub = obj->_stubobj (); - if (stub) - stub->_incr_refcnt (); - Marshal_ptr default_proxy = Marshal::_nil (); - - if (obj->_is_collocated () && _TAO_collocation_Marshal_Stub_Factory_function_pointer != 0) - { - default_proxy = _TAO_collocation_Marshal_Stub_Factory_function_pointer (obj); - } - if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, Marshal (stub), Marshal::_nil ()); - #if (TAO_HAS_SMART_PROXIES == 1) - return TAO_Marshal_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); - #else - return default_proxy; - #endif /*TAO_HAS_SMART_PROXIES == 1*/ - } - else - return - ACE_reinterpret_cast - ( - Marshal_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &Marshal::_narrow - ) - ) - ); -} - -Marshal_ptr -Marshal::_duplicate (Marshal_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} - -static const CORBA::Long _oc_Marshal_Marshal_Struct[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c2f), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x53747275), ACE_NTOHL (0x63743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Marshal/Marshal_Struct:1.0 - 15, ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x53747275), ACE_NTOHL (0x63740000), // name = Marshal_Struct - 5, // member count - 2, ACE_NTOHL (0x73000000), // name = s - CORBA::tk_short, - - 2, ACE_NTOHL (0x6c000000), // name = l - CORBA::tk_long, - - 2, ACE_NTOHL (0x63000000), // name = c - CORBA::tk_char, - - 2, ACE_NTOHL (0x6f000000), // name = o - CORBA::tk_octet, - - 2, ACE_NTOHL (0x64000000), // name = d - CORBA::tk_double, - -}; -static CORBA::TypeCode _tc_TAO_tc_Marshal_Marshal_Struct (CORBA::tk_struct, sizeof (_oc_Marshal_Marshal_Struct), (char *) &_oc_Marshal_Marshal_Struct, 0, sizeof (Marshal::Marshal_Struct)); -CORBA::TypeCode_ptr Marshal::_tc_Marshal_Struct = &_tc_TAO_tc_Marshal_Marshal_Struct; - -void Marshal::Marshal_Struct::_tao_any_destructor (void *x) -{ - Marshal_Struct *tmp = ACE_static_cast (Marshal_Struct*,x); - delete tmp; -} - -static const CORBA::Long _oc_Marshal_discrim[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c2f), ACE_NTOHL (0x64697363), ACE_NTOHL (0x72696d3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Marshal/discrim:1.0 - 8, ACE_NTOHL (0x64697363), ACE_NTOHL (0x72696d00), // name = discrim - 7, // member count - 6, ACE_NTOHL (0x655f3074), ACE_NTOHL (0x68000000), // name = e_0th - 6, ACE_NTOHL (0x655f3173), ACE_NTOHL (0x74000000), // name = e_1st - 6, ACE_NTOHL (0x655f326e), ACE_NTOHL (0x64000000), // name = e_2nd - 6, ACE_NTOHL (0x655f3372), ACE_NTOHL (0x64000000), // name = e_3rd - 6, ACE_NTOHL (0x655f3474), ACE_NTOHL (0x68000000), // name = e_4th - 6, ACE_NTOHL (0x655f3574), ACE_NTOHL (0x68000000), // name = e_5th - 6, ACE_NTOHL (0x655f3674), ACE_NTOHL (0x68000000), // name = e_6th -}; -static CORBA::TypeCode _tc_TAO_tc_Marshal_discrim (CORBA::tk_enum, sizeof (_oc_Marshal_discrim), (char *) &_oc_Marshal_discrim, 0, sizeof (Marshal::discrim)); -CORBA::TypeCode_ptr Marshal::_tc_discrim = &_tc_TAO_tc_Marshal_discrim; - -// ************************************************************* -// Operations for union Marshal::Marshal_Union -// ************************************************************* - -// default constructor -Marshal::Marshal_Union::Marshal_Union (void) -{ - ACE_OS::memset (&this->disc_, 0, sizeof (this->disc_)); - ACE_OS::memset (&this->u_, 0, sizeof (this->u_)); - this->disc_ = Marshal::e_0th; -} - -// copy constructor -Marshal::Marshal_Union::Marshal_Union (const ::Marshal::Marshal_Union &u) -{ - this->disc_ = u.disc_; - switch (this->disc_) - { - case Marshal::e_0th: - { - // set the value - this->u_.s_ = u.u_.s_; - } - break; - case Marshal::e_1st: - { - // set the value - this->u_.l_ = u.u_.l_; - } - break; - case Marshal::e_2nd: - { - // set the value - this->u_.c_ = u.u_.c_; - } - break; - case Marshal::e_3rd: - { - // set the value - this->u_.o_ = u.u_.o_; - } - break; - case Marshal::e_4th: - { - // set the value - this->u_.d_ = u.u_.d_; - } - break; - case Marshal::e_5th: - default: - { - this->u_.ms_ = u.u_.ms_; - } - break; - } -} - -// destructor -Marshal::Marshal_Union::~Marshal_Union (void) -{ - // finalize - this->_reset (this->disc_, 1); -} - -void Marshal::Marshal_Union::_tao_any_destructor (void *x) -{ - Marshal_Union *tmp = ACE_static_cast (Marshal_Union*,x); - delete tmp; -} - -// assignment operator -Marshal::Marshal_Union & -Marshal::Marshal_Union::operator= (const ::Marshal::Marshal_Union &u) -{ - this->_reset (u.disc_, 0); - this->disc_ = u.disc_; - switch (this->disc_) - { - case Marshal::e_0th: - { - // set the value - this->u_.s_ = u.u_.s_; - } - break; - case Marshal::e_1st: - { - // set the value - this->u_.l_ = u.u_.l_; - } - break; - case Marshal::e_2nd: - { - // set the value - this->u_.c_ = u.u_.c_; - } - break; - case Marshal::e_3rd: - { - // set the value - this->u_.o_ = u.u_.o_; - } - break; - case Marshal::e_4th: - { - // set the value - this->u_.d_ = u.u_.d_; - } - break; - case Marshal::e_5th: - default: - { - this->u_.ms_ = u.u_.ms_; - } - break; - } - return *this; -} - -// reset method to reset old values of a union -void Marshal::Marshal_Union::_reset (Marshal::discrim, CORBA::Boolean /*finalize*/) -{ - switch (this->disc_) - { - case Marshal::e_0th: - break; - case Marshal::e_1st: - break; - case Marshal::e_2nd: - break; - case Marshal::e_3rd: - break; - case Marshal::e_4th: - break; - case Marshal::e_5th: - default: - break; - - } -} - -static const CORBA::Long _oc_Marshal_Marshal_Union[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c2f), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e3a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Marshal/Marshal_Union:1.0 - 14, ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e000000), // name = Marshal_Union - CORBA::tk_enum, // typecode kind - 132, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c2f), ACE_NTOHL (0x64697363), ACE_NTOHL (0x72696d3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Marshal/discrim:1.0 - 8, ACE_NTOHL (0x64697363), ACE_NTOHL (0x72696d00), // name = discrim - 7, // member count - 6, ACE_NTOHL (0x655f3074), ACE_NTOHL (0x68000000), // name = e_0th - 6, ACE_NTOHL (0x655f3173), ACE_NTOHL (0x74000000), // name = e_1st - 6, ACE_NTOHL (0x655f326e), ACE_NTOHL (0x64000000), // name = e_2nd - 6, ACE_NTOHL (0x655f3372), ACE_NTOHL (0x64000000), // name = e_3rd - 6, ACE_NTOHL (0x655f3474), ACE_NTOHL (0x68000000), // name = e_4th - 6, ACE_NTOHL (0x655f3574), ACE_NTOHL (0x68000000), // name = e_5th - 6, ACE_NTOHL (0x655f3674), ACE_NTOHL (0x68000000), // name = e_6th - - 6, // default used index - 6, // member count - 0x00000000, // union case label (evaluated value) - 2, ACE_NTOHL (0x73000000), // name = s - CORBA::tk_short, - - 0x00000001, // union case label (evaluated value) - 2, ACE_NTOHL (0x6c000000), // name = l - CORBA::tk_long, - - 0x00000002, // union case label (evaluated value) - 2, ACE_NTOHL (0x63000000), // name = c - CORBA::tk_char, - - 0x00000003, // union case label (evaluated value) - 2, ACE_NTOHL (0x6f000000), // name = o - CORBA::tk_octet, - - 0x00000004, // union case label (evaluated value) - 2, ACE_NTOHL (0x64000000), // name = d - CORBA::tk_double, - - 0x00000005, // union case label (evaluated value) - 3, ACE_NTOHL (0x6d730000), // name = ms - CORBA::tk_struct, // typecode kind - 124, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c2f), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x53747275), ACE_NTOHL (0x63743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Marshal/Marshal_Struct:1.0 - 15, ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x53747275), ACE_NTOHL (0x63740000), // name = Marshal_Struct - 5, // member count - 2, ACE_NTOHL (0x73000000), // name = s - CORBA::tk_short, - - 2, ACE_NTOHL (0x6c000000), // name = l - CORBA::tk_long, - - 2, ACE_NTOHL (0x63000000), // name = c - CORBA::tk_char, - - 2, ACE_NTOHL (0x6f000000), // name = o - CORBA::tk_octet, - - 2, ACE_NTOHL (0x64000000), // name = d - CORBA::tk_double, - - -}; -static CORBA::TypeCode _tc_TAO_tc_Marshal_Marshal_Union (CORBA::tk_union, sizeof (_oc_Marshal_Marshal_Union), (char *) &_oc_Marshal_Marshal_Union, 0, sizeof (Marshal::Marshal_Union)); -CORBA::TypeCode_ptr Marshal::_tc_Marshal_Union = &_tc_TAO_tc_Marshal_Marshal_Union; - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_MARSHAL_ANYSEQ_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_MARSHAL_ANYSEQ_CS_ - - void - Marshal::_TAO_Unbounded_Sequence_Marshal_AnySeq::_allocate_buffer (CORBA::ULong length) - { - CORBA::Any* tmp = 0; - tmp = _TAO_Unbounded_Sequence_Marshal_AnySeq::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_Marshal_AnySeq::freebuf (old); - - } - this->buffer_ = tmp; - } - - void - Marshal::_TAO_Unbounded_Sequence_Marshal_AnySeq::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); - - _TAO_Unbounded_Sequence_Marshal_AnySeq::freebuf (tmp); - this->buffer_ = 0; - } - - Marshal::_TAO_Unbounded_Sequence_Marshal_AnySeq::~_TAO_Unbounded_Sequence_Marshal_AnySeq (void) // Dtor. - { - this->_deallocate_buffer (); - } - - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_MARSHAL_ANYSEQ_CS_) -#define _MARSHAL_ANYSEQ_CS_ - -// ************************************************************* -// Marshal::AnySeq -// ************************************************************* - -Marshal::AnySeq::AnySeq (void) -{} -Marshal::AnySeq::AnySeq (CORBA::ULong max) // uses max size - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_AnySeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} -Marshal::AnySeq::AnySeq (CORBA::ULong max, CORBA::ULong length, CORBA::Any *buffer, CORBA::Boolean release) - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_AnySeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} -Marshal::AnySeq::AnySeq (const AnySeq &seq) // copy ctor - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_AnySeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} -Marshal::AnySeq::~AnySeq (void) // dtor -{} -void Marshal::AnySeq::_tao_any_destructor (void *x) -{ - AnySeq *tmp = ACE_static_cast (AnySeq*,x); - delete tmp; -} - - -#endif /* end #if !defined */ - -static const CORBA::Long _oc_Marshal_AnySeq[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 23, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c2f), ACE_NTOHL (0x416e7953), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:Marshal/AnySeq:1.0 - 7, ACE_NTOHL (0x416e7953), ACE_NTOHL (0x65710000), // name = AnySeq - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_any, - - 0U, - -}; -static CORBA::TypeCode _tc_TAO_tc_Marshal_AnySeq (CORBA::tk_alias, sizeof (_oc_Marshal_AnySeq), (char *) &_oc_Marshal_AnySeq, 0, sizeof (Marshal::AnySeq)); -CORBA::TypeCode_ptr Marshal::_tc_AnySeq = &_tc_TAO_tc_Marshal_AnySeq; - -static const CORBA::Long _oc_Marshal_Marshal_Recursive[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c2f), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x52656375), ACE_NTOHL (0x72736976), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:Marshal/Marshal_Recursive:1.0 - 18, ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c5f), ACE_NTOHL (0x52656375), ACE_NTOHL (0x72736976), ACE_NTOHL (0x65000000), // name = Marshal_Recursive - 2, // member count - 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_any, - - 5, ACE_NTOHL (0x6e657874), ACE_NTOHL (0x0), // name = next - CORBA::tk_sequence, // typecode kind - 16, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 0xffffffff, // indirection - 0xffffff84, // negative offset (-124) - 0U, - -}; -static CORBA::TypeCode _tc_TAO_tc_Marshal_Marshal_Recursive (CORBA::tk_struct, sizeof (_oc_Marshal_Marshal_Recursive), (char *) &_oc_Marshal_Marshal_Recursive, 0, sizeof (Marshal::Marshal_Recursive)); -CORBA::TypeCode_ptr Marshal::_tc_Marshal_Recursive = &_tc_TAO_tc_Marshal_Marshal_Recursive; - -void Marshal::Marshal_Recursive::_tao_any_destructor (void *x) -{ - Marshal_Recursive *tmp = ACE_static_cast (Marshal_Recursive*,x); - delete tmp; -} - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CS_ - - void - Marshal::Marshal_Recursive::_TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive::_allocate_buffer (CORBA::ULong length) - { - Marshal::Marshal_Recursive* tmp = 0; - tmp = _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive::allocbuf (length); - - if (this->buffer_ != 0) - { - Marshal::Marshal_Recursive *old = ACE_reinterpret_cast (Marshal::Marshal_Recursive *,this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - tmp[i] = old[i]; - - if (this->release_) - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive::freebuf (old); - - } - this->buffer_ = tmp; - } - - void - Marshal::Marshal_Recursive::_TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive::_deallocate_buffer (void) - { - if (this->buffer_ == 0 || this->release_ == 0) - return; - - Marshal::Marshal_Recursive *tmp = ACE_reinterpret_cast (Marshal::Marshal_Recursive *,this->buffer_); - - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive::freebuf (tmp); - this->buffer_ = 0; - } - - Marshal::Marshal_Recursive::_TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive::~_TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive (void) // Dtor. - { - this->_deallocate_buffer (); - } - - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CS_) -#define _MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CS_ - -// ************************************************************* -// Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive -// ************************************************************* - -Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive::_tao_seq_Marshal_Recursive (void) -{} -Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive::_tao_seq_Marshal_Recursive (CORBA::ULong max) // uses max size - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<Marshal::Marshal_Recursive> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} -Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive::_tao_seq_Marshal_Recursive (CORBA::ULong max, CORBA::ULong length, Marshal::Marshal_Recursive *buffer, CORBA::Boolean release) - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<Marshal::Marshal_Recursive> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} -Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive::_tao_seq_Marshal_Recursive (const _tao_seq_Marshal_Recursive &seq) // copy ctor - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<Marshal::Marshal_Recursive> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} -Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive::~_tao_seq_Marshal_Recursive (void) // dtor -{} -void Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive::_tao_any_destructor (void *x) -{ - _tao_seq_Marshal_Recursive *tmp = ACE_static_cast (_tao_seq_Marshal_Recursive*,x); - delete tmp; -} - - -#endif /* end #if !defined */ - -void Marshal::test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_short", - 10, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_short", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << s1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> s2) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_short", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_short", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_long", - 9, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_long", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << l1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> l2) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_long", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_long", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_octet", - 10, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_octet", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << CORBA::Any::from_octet (o1)) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> CORBA::Any::to_octet (o2)) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_octet", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_octet", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_char", - 9, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_char", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << CORBA::Any::from_char (c1)) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> CORBA::Any::to_char (c2)) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_char", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_char", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_double", - 11, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_double", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << d1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> d2) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_double", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_double", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_struct", - 11, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_struct", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << ms1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> ms2) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_struct", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_struct", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_union", - 10, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_union", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << u1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> u2) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_union", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_union", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - ACE_NEW (a2.ptr (), CORBA::Any); - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_any", - 8, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_any", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << a1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> *a2.ptr ()) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_any", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_any", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - ACE_NEW (as2.ptr (), Marshal::AnySeq); - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_sequence", - 13, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_sequence", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << as1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> *as2.ptr ()) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_sequence", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_sequence", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -void Marshal::test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - - - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - - - ACE_NEW (mr2.ptr (), Marshal::Marshal_Recursive); - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "test_recursive", - 14, - istub->orb_core () - ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter - _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - if (_tao_vfr.valid ()) - { - istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_INTERCEPTOR ( - _tao_vfr.preinvoke ( - _tao_call.request_id (), - 1, - this, - "test_recursive", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - CORBA::Short flag = 131; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << mr1) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) - { - TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> *mr2.ptr ()) - )) - TAO_INTERCEPTOR_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - TAO_INTERCEPTOR ( - _tao_vfr.postinvoke ( - _tao_call.request_id (), - 1, - this, - "test_recursive", - _tao_call.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ) - ); - TAO_INTERCEPTOR_CHECK; - break; - - } -#if (TAO_HAS_INTERCEPTORS == 1) - - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_call.request_id (), - 1, - this, - "test_recursive", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - -} - -CORBA::Boolean Marshal::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Marshal:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); -} - -void *Marshal::_tao_QueryInterface (ptr_arith_t type) -{ - void *retv = 0; - if (type == ACE_reinterpret_cast - (ptr_arith_t, - &Marshal::_narrow)) - retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) - retv = ACE_reinterpret_cast (void *, - ACE_static_cast (CORBA::Object_ptr, this)); - - if (retv) - this->_add_ref (); - return retv; -} - -const char* Marshal::_interface_repository_id (void) const -{ - return "IDL:Marshal:1.0"; -} - -TAO_Marshal_Default_Proxy_Factory::TAO_Marshal_Default_Proxy_Factory (int register_proxy_factory) -{ - if (register_proxy_factory) - { - TAO_Marshal_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this); - } -} - -TAO_Marshal_Default_Proxy_Factory::~TAO_Marshal_Default_Proxy_Factory (void) -{ -} - -Marshal_ptr -TAO_Marshal_Default_Proxy_Factory::create_proxy ( - ::Marshal_ptr proxy, - CORBA::Environment & - ) -{ - return proxy; -} - -TAO_Marshal_Proxy_Factory_Adapter::TAO_Marshal_Proxy_Factory_Adapter (void) - : proxy_factory_ (0), - delete_proxy_factory_ (0) -{ -} - -TAO_Marshal_Proxy_Factory_Adapter::~TAO_Marshal_Proxy_Factory_Adapter (void) -{ - // Making sure the factory which the adapter has is destroyed with it. - if (this->proxy_factory_ != 0) - delete this->proxy_factory_; -} - -int -TAO_Marshal_Proxy_Factory_Adapter::register_proxy_factory ( - TAO_Marshal_Default_Proxy_Factory *df, - CORBA::Environment &ACE_TRY_ENV - ) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->lock_, 0)); - // Remove any existing <proxy_factory_> and replace with the new one. - this->unregister_proxy_factory (ACE_TRY_ENV); - this->proxy_factory_ = df; - this->delete_proxy_factory_ = 0; -return 0; -} - -int -TAO_Marshal_Proxy_Factory_Adapter::unregister_proxy_factory ( - CORBA::Environment & - ) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->lock_, 0)); - if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) - { - // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it - // doesnt get into an infinite loop in <unregister_proxy_factory> as it is - // invoked in the destructor of the class too. - this->delete_proxy_factory_ = 1; - delete this->proxy_factory_; - this->proxy_factory_ = 0; - } -return 0; -} - -Marshal_ptr -TAO_Marshal_Proxy_Factory_Adapter::create_proxy ( - ::Marshal_ptr proxy, - CORBA::Environment & - ) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->lock_, 0)); - // Verify that an <proxy_factory_> is available else make one. - if (this->proxy_factory_ == 0) - ACE_NEW_RETURN (this->proxy_factory_, - TAO_Marshal_Default_Proxy_Factory (1), - 0); - - - return this->proxy_factory_->create_proxy (proxy); -} - -TAO_Marshal_Smart_Proxy_Base::TAO_Marshal_Smart_Proxy_Base (void) -{ -} - -TAO_Marshal_Smart_Proxy_Base::~TAO_Marshal_Smart_Proxy_Base (void) -{ -} - -TAO_Stub * -TAO_Marshal_Smart_Proxy_Base::_stubobj (void) const -{ - return this->base_proxy_->_stubobj (); -} - -void TAO_Marshal_Smart_Proxy_Base::test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_short ( - s1, - s2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_long ( - l1, - l2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_octet ( - o1, - o2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_char ( - c1, - c2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_double ( - d1, - d2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_struct ( - ms1, - ms2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_union ( - u1, - u2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_any ( - a1, - a2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_sequence ( - as1, - as2 - ); - -} - -void TAO_Marshal_Smart_Proxy_Base::test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - this->get_proxy ()->test_recursive ( - mr1, - mr2 - ); - -} - -Marshal_ptr -TAO_Marshal_Smart_Proxy_Base::get_proxy (void) - -{ - // Obtain the real proxy stored in <base_proxy_> - if (CORBA::is_nil (this->proxy_.in ())) - { - // Necessary to do this else you are stuck in an infinte loop - // creating smart proxies! - TAO_Marshal_PROXY_FACTORY_ADAPTER::instance ()->unregister_proxy_factory (); - this->proxy_ = ::Marshal::_unchecked_narrow (this->base_proxy_.in ()); - } - - return this->proxy_.in (); - } - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class ACE_Singleton<TAO_Marshal_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Singleton<TAO_Marshal_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - static const CORBA::Long _oc_Marshal[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 16, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:Marshal:1.0 - 8, ACE_NTOHL (0x4d617273), ACE_NTOHL (0x68616c00), // name = Marshal -}; - static CORBA::TypeCode _tc_TAO_tc_Marshal (CORBA::tk_objref, sizeof (_oc_Marshal), (char *) &_oc_Marshal, 0, sizeof (Marshal)); - CORBA::TypeCode_ptr _tc_Marshal = &_tc_TAO_tc_Marshal; - - Marshal_ptr (*_TAO_collocation_Marshal_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - void operator<<= (CORBA::Any &_tao_any, Marshal_ptr _tao_elem) - { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - _tc_Marshal, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - Marshal::_duplicate (_tao_elem), - Marshal::_tao_any_destructor - ); - } - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Marshal_ptr &_tao_elem) - { - ACE_TRY_NEW_ENV - { - _tao_elem = Marshal::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (_tc_Marshal, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - CORBA::Object_var _tao_obj_var; - if (stream >> _tao_obj_var.out ()) - { - _tao_elem = Marshal::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; - - ((CORBA::Any *)&_tao_any)->_tao_replace ( - _tc_Marshal, - 1, - _tao_elem, - Marshal::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { - _tao_elem = Marshal::_nil (); - return 0; - } - ACE_ENDTRY; - _tao_elem = Marshal::_nil (); - return 0; - } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Marshal,Marshal_var>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<Marshal,Marshal_var> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - void operator<<= (CORBA::Any &_tao_any, const Marshal::Marshal_Struct &_tao_elem) // copying - { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - Marshal::_tc_Marshal_Struct, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - - void operator<<= (CORBA::Any &_tao_any, Marshal::Marshal_Struct *_tao_elem) // non copying - { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - Marshal::_tc_Marshal_Struct, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Marshal::Marshal_Struct::_tao_any_destructor - ); - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Marshal::Marshal_Struct *&_tao_elem) - { - return _tao_any >>= ACE_const_cast(const Marshal::Marshal_Struct*&,_tao_elem); - } - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Marshal::Marshal_Struct *&_tao_elem) - { - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Marshal::_tc_Marshal_Struct, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const Marshal::Marshal_Struct*, - _tao_any.value () - ); - return 1; - } - else - { - Marshal::Marshal_Struct *tmp; - ACE_NEW_RETURN (tmp, Marshal::Marshal_Struct, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Marshal::_tc_Marshal_Struct, - 1, - ACE_static_cast (void *, tmp), - Marshal::Marshal_Struct::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; - } - - void operator<<= (CORBA::Any &_tao_any, Marshal::discrim _tao_elem) - { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - Marshal::_tc_discrim, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Marshal::discrim &_tao_elem) - { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Marshal::_tc_discrim, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> _tao_elem) - { - return 1; - } - } - ACE_CATCHANY - { - return 0; - } - ACE_ENDTRY; - return 0; - } - - void operator<<= ( - CORBA::Any &_tao_any, - const Marshal::Marshal_Union &_tao_elem - ) - { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Marshal::_tc_Marshal_Union, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - } - - void operator<<= ( - CORBA::Any &_tao_any, - Marshal::Marshal_Union *_tao_elem - ) - { - TAO_OutputCDR stream; - if (stream << *_tao_elem) - { - _tao_any._tao_replace ( - Marshal::_tc_Marshal_Union, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Marshal::Marshal_Union::_tao_any_destructor - ); - } - } - - CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - Marshal::Marshal_Union *&_tao_elem - ) - { - return _tao_any >>= ACE_const_cast( - const Marshal::Marshal_Union*&, - _tao_elem - ); - } - -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const Marshal::Marshal_Union *&_tao_elem - ) - { - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Marshal::_tc_Marshal_Union, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const Marshal::Marshal_Union*, - _tao_any.value () - ); - return 1; - } - else - { - Marshal::Marshal_Union *tmp; - ACE_NEW_RETURN (tmp, Marshal::Marshal_Union, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Marshal::_tc_Marshal_Union, - 1, - ACE_static_cast (void *, tmp), - Marshal::Marshal_Union::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; - } - - void operator<<= ( - CORBA::Any &_tao_any, - const Marshal::AnySeq &_tao_elem - ) // copying - { - TAO_OutputCDR stream; - if (stream << _tao_elem) - { - _tao_any._tao_replace ( - Marshal::_tc_AnySeq, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - } - - void operator<<= (CORBA::Any &_tao_any, Marshal::AnySeq *_tao_elem) // non copying - { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - Marshal::_tc_AnySeq, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Marshal::AnySeq::_tao_any_destructor - ); - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Marshal::AnySeq *&_tao_elem) - { - return _tao_any >>= ACE_const_cast( - const Marshal::AnySeq*&, - _tao_elem - ); - } - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Marshal::AnySeq *&_tao_elem) - { - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Marshal::_tc_AnySeq, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const Marshal::AnySeq*, - _tao_any.value () - ); - return 1; - } - else - { - Marshal::AnySeq *tmp; - ACE_NEW_RETURN (tmp, Marshal::AnySeq, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Marshal::_tc_AnySeq, - 1, - ACE_static_cast (void *, tmp), - Marshal::AnySeq::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; - } - - void operator<<= (CORBA::Any &_tao_any, const Marshal::Marshal_Recursive &_tao_elem) // copying - { - TAO_OutputCDR stream; - stream << _tao_elem; - _tao_any._tao_replace ( - Marshal::_tc_Marshal_Recursive, - TAO_ENCAP_BYTE_ORDER, - stream.begin () - ); - } - - void operator<<= (CORBA::Any &_tao_any, Marshal::Marshal_Recursive *_tao_elem) // non copying - { - TAO_OutputCDR stream; - stream << *_tao_elem; - _tao_any._tao_replace ( - Marshal::_tc_Marshal_Recursive, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - Marshal::Marshal_Recursive::_tao_any_destructor - ); - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Marshal::Marshal_Recursive *&_tao_elem) - { - return _tao_any >>= ACE_const_cast(const Marshal::Marshal_Recursive*&,_tao_elem); - } - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Marshal::Marshal_Recursive *&_tao_elem) - { - _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (Marshal::_tc_Marshal_Recursive, ACE_TRY_ENV)) // not equal - { - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = ACE_static_cast( - const Marshal::Marshal_Recursive*, - _tao_any.value () - ); - return 1; - } - else - { - Marshal::Marshal_Recursive *tmp; - ACE_NEW_RETURN (tmp, Marshal::Marshal_Recursive, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *tmp) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - Marshal::_tc_Marshal_Recursive, - 1, - ACE_static_cast (void *, tmp), - Marshal::Marshal_Recursive::_tao_any_destructor - ); - _tao_elem = tmp; - return 1; - } - else - { - delete tmp; - } - } - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - return 0; - } - - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Marshal::AnySeq &_tao_sequence - ) - { - if (strm << _tao_sequence.length ()) - { - // encode all elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - return _tao_marshal_flag; - } - return 0; // error - } - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - Marshal::AnySeq &_tao_sequence - ) - { - CORBA::ULong _tao_seq_len; - if (strm >> _tao_seq_len) - { - // set the length of the sequence - _tao_sequence.length (_tao_seq_len); - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - return _tao_marshal_flag; - } - return 0; // error - } - - -#if !defined _TAO_CDR_OP_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive_CPP_ - #define _TAO_CDR_OP_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive &_tao_sequence - ) - { - if (strm << _tao_sequence.length ()) - { - // encode all elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - return _tao_marshal_flag; - } - return 0; // error - } - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive &_tao_sequence - ) - { - CORBA::ULong _tao_seq_len; - if (strm >> _tao_seq_len) - { - // set the length of the sequence - _tao_sequence.length (_tao_seq_len); - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - return _tao_marshal_flag; - } - return 0; // error - } - -#endif /* _TAO_CDR_OP_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive_CPP_ */ - diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h b/TAO/Benchmark/Marshal_Test/TAO/marshalC.h deleted file mode 100644 index 6c4d1def4b7..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h +++ /dev/null @@ -1,1018 +0,0 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef _TAO_IDL_MARSHALC_H_ -#define _TAO_IDL_MARSHALC_H_ - -#include "tao/corba.h" - -#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) -#include "ace/streams.h" -#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO - -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO -#endif /* TAO_EXPORT_NESTED_CLASSES */ - -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - - -#if !defined (_MARSHAL___PTR_CH_) -#define _MARSHAL___PTR_CH_ - -class Marshal; -typedef Marshal *Marshal_ptr; - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL___VAR_CH_) -#define _MARSHAL___VAR_CH_ - -class Marshal_var -{ -public: - Marshal_var (void); // default constructor - Marshal_var (Marshal_ptr); - Marshal_var (const Marshal_var &); // copy constructor - ~Marshal_var (void); // destructor - - Marshal_var &operator= (Marshal_ptr); - Marshal_var &operator= (const Marshal_var &); - Marshal_ptr operator-> (void) const; - - operator const Marshal_ptr &() const; - operator Marshal_ptr &(); - // in, inout, out, _retn - Marshal_ptr in (void) const; - Marshal_ptr &inout (void); - Marshal_ptr &out (void); - Marshal_ptr _retn (void); - Marshal_ptr ptr (void) const; - -private: - Marshal_ptr ptr_; -}; - - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL___OUT_CH_) -#define _MARSHAL___OUT_CH_ - -class Marshal_out -{ -public: - Marshal_out (Marshal_ptr &); - Marshal_out (Marshal_var &); - Marshal_out (const Marshal_out &); - Marshal_out &operator= (const Marshal_out &); - Marshal_out &operator= (const Marshal_var &); - Marshal_out &operator= (Marshal_ptr); - operator Marshal_ptr &(); - Marshal_ptr &ptr (void); - Marshal_ptr operator-> (void); - -private: - Marshal_ptr &ptr_; -}; - - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL_CH_) -#define _MARSHAL_CH_ - -class Marshal : public virtual ACE_CORBA_1 (Object) -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef Marshal_ptr _ptr_type; - typedef Marshal_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - // the static operations - static Marshal_ptr _duplicate (Marshal_ptr obj); - static Marshal_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &env = - TAO_default_environment () - ); - static Marshal_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &env = - TAO_default_environment () - ); - static Marshal_ptr _nil (void) - { - return (Marshal_ptr)0; - } - - static void _tao_any_destructor (void*); - - struct Marshal_Struct; - class Marshal_Struct_var; - - struct Marshal_Struct - { - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef Marshal_Struct_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static void _tao_any_destructor (void*); - - CORBA::Short s; - CORBA::Long l; - CORBA::Char c; - CORBA::Octet o; - CORBA::Double d; - }; - - class Marshal_Struct_var - { - public: - Marshal_Struct_var (void); // default constructor - Marshal_Struct_var (Marshal_Struct *); - Marshal_Struct_var (const Marshal_Struct_var &); // copy constructor - Marshal_Struct_var (const Marshal_Struct &); // fixed-size types only - ~Marshal_Struct_var (void); // destructor - - Marshal_Struct_var &operator= (Marshal_Struct *); - Marshal_Struct_var &operator= (const Marshal_Struct_var &); - Marshal_Struct_var &operator= (const Marshal_Struct &); // fixed-size types only - Marshal_Struct *operator-> (void); - const Marshal_Struct *operator-> (void) const; - - operator const Marshal_Struct &() const; - operator Marshal_Struct &(); - operator Marshal_Struct &() const; - - // in, inout, out, _retn - const Marshal_Struct &in (void) const; - Marshal_Struct &inout (void); - Marshal_Struct &out (void); - Marshal_Struct _retn (void); - Marshal_Struct *ptr (void) const; - - private: - Marshal_Struct *ptr_; - }; - - typedef Marshal_Struct &Marshal_Struct_out; - - static CORBA::TypeCode_ptr _tc_Marshal_Struct; - - enum discrim - { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th, - e_6th, - discrim_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF - }; - typedef discrim &discrim_out; - static CORBA::TypeCode_ptr _tc_discrim; - - -#if !defined (_MARSHAL_MARSHAL_UNION_CH_) -#define _MARSHAL_MARSHAL_UNION_CH_ - - class Marshal_Union; - class Marshal_Union_var; - - class Marshal_Union - { - public: - Marshal_Union (void); - Marshal_Union (const Marshal_Union &); - ~Marshal_Union (void); - static void _tao_any_destructor (void*); - - Marshal_Union &operator= (const Marshal_Union &); - - void _d (ACE_NESTED_CLASS (Marshal, discrim)); - ACE_NESTED_CLASS (Marshal, discrim) _d (void) const; - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef Marshal_Union_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - void s (CORBA::Short);// set - CORBA::Short s (void) const; // get method - - void l (CORBA::Long);// set - CORBA::Long l (void) const; // get method - - void c (CORBA::Char);// set - CORBA::Char c (void) const; // get method - - void o (CORBA::Octet);// set - CORBA::Octet o (void) const; // get method - - void d (CORBA::Double);// set - CORBA::Double d (void) const; // get method - - void ms (const ACE_NESTED_CLASS (Marshal, Marshal_Struct) &);// set - const ACE_NESTED_CLASS (Marshal, Marshal_Struct) &ms (void) const; // get method (read only) - ACE_NESTED_CLASS (Marshal, Marshal_Struct) &ms (void); // get method (read/write only) - - private: - ACE_NESTED_CLASS (Marshal, discrim) disc_; - ACE_NESTED_CLASS (Marshal, discrim) holder_; - union - { - CORBA::Short s_; - CORBA::Long l_; - CORBA::Char c_; - CORBA::Octet o_; - CORBA::Double d_; - ACE_NESTED_CLASS (Marshal, Marshal_Struct) ms_; - } u_; // end of union - // TAO extensions - void _reset (ACE_NESTED_CLASS (Marshal, discrim), CORBA::Boolean); - // Frees any allocated storage - - void _reset (void); - // calls the above reset with finalize=1 - - }; // Marshal::Marshal_Union - - static CORBA::TypeCode_ptr _tc_Marshal_Union; - - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL_MARSHAL_UNION___VAR_CH_) -#define _MARSHAL_MARSHAL_UNION___VAR_CH_ - - class Marshal_Union_var - { - public: - Marshal_Union_var (void); // default constructor - Marshal_Union_var (Marshal_Union *); - Marshal_Union_var (const Marshal_Union_var &); // copy constructor - Marshal_Union_var (const Marshal_Union &); // fixed-size types only - ~Marshal_Union_var (void); // destructor - - Marshal_Union_var &operator= (Marshal_Union *); - Marshal_Union_var &operator= (const Marshal_Union_var &); - Marshal_Union_var &operator= (const Marshal_Union &); // fixed-size types only - Marshal_Union *operator-> (void); - const Marshal_Union *operator-> (void) const; - - operator const Marshal_Union &() const; - operator Marshal_Union &(); - operator Marshal_Union &() const; - - // in, inout, out, _retn - const Marshal_Union &in (void) const; - Marshal_Union &inout (void); - Marshal_Union &out (void); - Marshal_Union _retn (void); - Marshal_Union *ptr(void) const; - - private: - Marshal_Union *ptr_; - }; - - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL_MARSHAL_UNION___OUT_CH_) -#define _MARSHAL_MARSHAL_UNION___OUT_CH_ - - typedef Marshal_Union &Marshal_Union_out; - - -#endif /* end #if !defined */ - - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_MARSHAL_ANYSEQ_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_MARSHAL_ANYSEQ_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_Marshal_AnySeq : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_Marshal_AnySeq (void); // Default constructor. - _TAO_Unbounded_Sequence_Marshal_AnySeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_Marshal_AnySeq (CORBA::ULong maximum, - CORBA::ULong length, - CORBA::Any *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_Marshal_AnySeq (const _TAO_Unbounded_Sequence_Marshal_AnySeq &rhs); - _TAO_Unbounded_Sequence_Marshal_AnySeq &operator= (const _TAO_Unbounded_Sequence_Marshal_AnySeq &rhs); - virtual ~_TAO_Unbounded_Sequence_Marshal_AnySeq (void); // Dtor. - // = Accessors. - CORBA::Any &operator[] (CORBA::ULong i); - const CORBA::Any &operator[] (CORBA::ULong i) const; - // = Static operations. - static CORBA::Any *allocbuf (CORBA::ULong size); - static void freebuf (CORBA::Any *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - CORBA::Any *get_buffer (CORBA::Boolean orphan = 0); - const CORBA::Any *get_buffer (void) const; - void replace (CORBA::ULong max, - CORBA::ULong length, - CORBA::Any *data, - CORBA::Boolean release); - }; - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_MARSHAL_ANYSEQ_CH_) -#define _MARSHAL_ANYSEQ_CH_ - - class AnySeq; - class AnySeq_var; - - // ************************************************************* - // AnySeq - // ************************************************************* - - class AnySeq : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_AnySeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Any> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - AnySeq (void); // default ctor - AnySeq (CORBA::ULong max); // uses max size - AnySeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Any *buffer, - CORBA::Boolean release=0 - ); - AnySeq (const AnySeq &); // copy ctor - ~AnySeq (void); - static void _tao_any_destructor (void*); - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef AnySeq_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - }; - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL_ANYSEQ___VAR_CH_) -#define _MARSHAL_ANYSEQ___VAR_CH_ - - // ************************************************************* - // class Marshal::AnySeq_var - // ************************************************************* - - class AnySeq_var - { - public: - AnySeq_var (void); // default constructor - AnySeq_var (AnySeq *); - AnySeq_var (const AnySeq_var &); // copy constructor - ~AnySeq_var (void); // destructor - - AnySeq_var &operator= (AnySeq *); - AnySeq_var &operator= (const AnySeq_var &); - AnySeq *operator-> (void); - const AnySeq *operator-> (void) const; - - operator const AnySeq &() const; - operator AnySeq &(); - operator AnySeq &() const; - operator AnySeq *&(); // variable-size base types only - - CORBA::Any &operator[] (CORBA::ULong index); - // in, inout, out, _retn - const AnySeq &in (void) const; - AnySeq &inout (void); - AnySeq *&out (void); - AnySeq *_retn (void); - AnySeq *ptr (void) const; - - private: - AnySeq *ptr_; - }; - - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL_ANYSEQ___OUT_CH_) -#define _MARSHAL_ANYSEQ___OUT_CH_ - - class AnySeq_out - { - public: - AnySeq_out (AnySeq *&); - AnySeq_out (AnySeq_var &); - AnySeq_out (const AnySeq_out &); - AnySeq_out &operator= (const AnySeq_out &); - AnySeq_out &operator= (AnySeq *); - operator AnySeq *&(); - AnySeq *&ptr (void); - AnySeq *operator-> (void); - CORBA::Any &operator[] (CORBA::ULong index); - - private: - AnySeq *&ptr_; - // assignment from T_var not allowed - void operator= (const AnySeq_var &); - }; - - -#endif /* end #if !defined */ - - static CORBA::TypeCode_ptr _tc_AnySeq; - - struct Marshal_Recursive; - class Marshal_Recursive_var; - - struct Marshal_Recursive - { - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef Marshal_Recursive_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - static void _tao_any_destructor (void*); - - CORBA::Any value; - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive (void); // Default constructor. - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive (CORBA::ULong maximum, - CORBA::ULong length, - ACE_NESTED_CLASS (Marshal, Marshal_Recursive) *data, - CORBA::Boolean release = 0); - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive (const _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive &rhs); - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive &operator= (const _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive &rhs); - virtual ~_TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive (void); // Dtor. - // = Accessors. - ACE_NESTED_CLASS (Marshal, Marshal_Recursive) &operator[] (CORBA::ULong i); - const ACE_NESTED_CLASS (Marshal, Marshal_Recursive) &operator[] (CORBA::ULong i) const; - // = Static operations. - static ACE_NESTED_CLASS (Marshal, Marshal_Recursive) *allocbuf (CORBA::ULong size); - static void freebuf (ACE_NESTED_CLASS (Marshal, Marshal_Recursive) *buffer); - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - - ACE_NESTED_CLASS (Marshal, Marshal_Recursive) *get_buffer (CORBA::Boolean orphan = 0); - const ACE_NESTED_CLASS (Marshal, Marshal_Recursive) *get_buffer (void) const; - void replace (CORBA::ULong max, - CORBA::ULong length, - ACE_NESTED_CLASS (Marshal, Marshal_Recursive) *data, - CORBA::Boolean release); - }; - -#endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CH_) -#define _MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE_CH_ - - class _tao_seq_Marshal_Recursive; - class _tao_seq_Marshal_Recursive_var; - - // ************************************************************* - // _tao_seq_Marshal_Recursive - // ************************************************************* - - class _tao_seq_Marshal_Recursive : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ACE_NESTED_CLASS (Marshal, Marshal_Recursive)> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - _tao_seq_Marshal_Recursive (void); // default ctor - _tao_seq_Marshal_Recursive (CORBA::ULong max); // uses max size - _tao_seq_Marshal_Recursive ( - CORBA::ULong max, - CORBA::ULong length, - ACE_NESTED_CLASS (Marshal, Marshal_Recursive) *buffer, - CORBA::Boolean release=0 - ); - _tao_seq_Marshal_Recursive (const _tao_seq_Marshal_Recursive &); // copy ctor - ~_tao_seq_Marshal_Recursive (void); - static void _tao_any_destructor (void*); - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Marshal_Recursive_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - }; - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE___VAR_CH_) -#define _MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE___VAR_CH_ - - // ************************************************************* - // class Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive_var - // ************************************************************* - - class _tao_seq_Marshal_Recursive_var - { - public: - _tao_seq_Marshal_Recursive_var (void); // default constructor - _tao_seq_Marshal_Recursive_var (_tao_seq_Marshal_Recursive *); - _tao_seq_Marshal_Recursive_var (const _tao_seq_Marshal_Recursive_var &); // copy constructor - ~_tao_seq_Marshal_Recursive_var (void); // destructor - - _tao_seq_Marshal_Recursive_var &operator= (_tao_seq_Marshal_Recursive *); - _tao_seq_Marshal_Recursive_var &operator= (const _tao_seq_Marshal_Recursive_var &); - _tao_seq_Marshal_Recursive *operator-> (void); - const _tao_seq_Marshal_Recursive *operator-> (void) const; - - operator const _tao_seq_Marshal_Recursive &() const; - operator _tao_seq_Marshal_Recursive &(); - operator _tao_seq_Marshal_Recursive &() const; - operator _tao_seq_Marshal_Recursive *&(); // variable-size base types only - - ACE_NESTED_CLASS (Marshal, Marshal_Recursive) &operator[] (CORBA::ULong index); - // in, inout, out, _retn - const _tao_seq_Marshal_Recursive &in (void) const; - _tao_seq_Marshal_Recursive &inout (void); - _tao_seq_Marshal_Recursive *&out (void); - _tao_seq_Marshal_Recursive *_retn (void); - _tao_seq_Marshal_Recursive *ptr (void) const; - - private: - _tao_seq_Marshal_Recursive *ptr_; - }; - - -#endif /* end #if !defined */ - - -#if !defined (_MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE___OUT_CH_) -#define _MARSHAL_MARSHAL_RECURSIVE__TAO_SEQ_MARSHAL_RECURSIVE___OUT_CH_ - - class _tao_seq_Marshal_Recursive_out - { - public: - _tao_seq_Marshal_Recursive_out (_tao_seq_Marshal_Recursive *&); - _tao_seq_Marshal_Recursive_out (_tao_seq_Marshal_Recursive_var &); - _tao_seq_Marshal_Recursive_out (const _tao_seq_Marshal_Recursive_out &); - _tao_seq_Marshal_Recursive_out &operator= (const _tao_seq_Marshal_Recursive_out &); - _tao_seq_Marshal_Recursive_out &operator= (_tao_seq_Marshal_Recursive *); - operator _tao_seq_Marshal_Recursive *&(); - _tao_seq_Marshal_Recursive *&ptr (void); - _tao_seq_Marshal_Recursive *operator-> (void); - ACE_NESTED_CLASS (Marshal, Marshal_Recursive) &operator[] (CORBA::ULong index); - - private: - _tao_seq_Marshal_Recursive *&ptr_; - // assignment from T_var not allowed - void operator= (const _tao_seq_Marshal_Recursive_var &); - }; - - -#endif /* end #if !defined */ - -#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef _tao_seq_Marshal_Recursive _next_seq; -#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ - - _tao_seq_Marshal_Recursive next; -}; - -class Marshal_Recursive_var -{ -public: - Marshal_Recursive_var (void); // default constructor - Marshal_Recursive_var (Marshal_Recursive *); - Marshal_Recursive_var (const Marshal_Recursive_var &); // copy constructor - ~Marshal_Recursive_var (void); // destructor - - Marshal_Recursive_var &operator= (Marshal_Recursive *); - Marshal_Recursive_var &operator= (const Marshal_Recursive_var &); - Marshal_Recursive *operator-> (void); - const Marshal_Recursive *operator-> (void) const; - - operator const Marshal_Recursive &() const; - operator Marshal_Recursive &(); - operator Marshal_Recursive &() const; - operator Marshal_Recursive *&(); // variable-size types only - - // in, inout, out, _retn - const Marshal_Recursive &in (void) const; - Marshal_Recursive &inout (void); - Marshal_Recursive *&out (void); - Marshal_Recursive *_retn (void); - Marshal_Recursive *ptr (void) const; - -private: - Marshal_Recursive *ptr_; -}; - -class Marshal_Recursive_out -{ -public: - Marshal_Recursive_out (Marshal_Recursive *&); - Marshal_Recursive_out (Marshal_Recursive_var &); - Marshal_Recursive_out (const Marshal_Recursive_out &); - Marshal_Recursive_out &operator= (const Marshal_Recursive_out &); - Marshal_Recursive_out &operator= (Marshal_Recursive *); - operator Marshal_Recursive *&(); - Marshal_Recursive *&ptr (void); - Marshal_Recursive *operator-> (void); - -private: - Marshal_Recursive *&ptr_; - // assignment from T_var not allowed - void operator= (const Marshal_Recursive_var &); -}; - -static CORBA::TypeCode_ptr _tc_Marshal_Recursive; - -virtual void test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = - TAO_default_environment () - ); -virtual void *_tao_QueryInterface (ptr_arith_t type); - -virtual const char* _interface_repository_id (void) const; - -protected: - Marshal (void); - Marshal (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, - CORBA::Boolean _tao_collocated = 0 - ); - virtual ~Marshal (void); -private: - Marshal (const Marshal &); - void operator= (const Marshal &); -}; - -class TAO_Marshal_Default_Proxy_Factory -{ -public: - - TAO_Marshal_Default_Proxy_Factory (int register_proxy_factory = 1); - - virtual ~TAO_Marshal_Default_Proxy_Factory (void); - - virtual Marshal_ptr create_proxy ( - Marshal_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); -}; - -class TAO_Marshal_Proxy_Factory_Adapter -{ -public: - - friend class ACE_Singleton<TAO_Marshal_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; - - int register_proxy_factory ( - TAO_Marshal_Default_Proxy_Factory *df, - CORBA::Environment &env = - TAO_default_environment () - ); - - int unregister_proxy_factory ( - CORBA::Environment &env = - TAO_default_environment () - ); - - Marshal_ptr create_proxy ( - Marshal_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); - -protected: - TAO_Marshal_Proxy_Factory_Adapter (void); - ~TAO_Marshal_Proxy_Factory_Adapter (void); - TAO_Marshal_Proxy_Factory_Adapter &operator= ( - const TAO_Marshal_Proxy_Factory_Adapter & - ); - TAO_Marshal_Default_Proxy_Factory *proxy_factory_; - int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; - -}; - -typedef ACE_Singleton<TAO_Marshal_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_Marshal_PROXY_FACTORY_ADAPTER; - -class TAO_Marshal_Smart_Proxy_Base - : public virtual Marshal, - public virtual TAO_Smart_Proxy_Base -{ -public: - TAO_Marshal_Smart_Proxy_Base (void); - ~TAO_Marshal_Smart_Proxy_Base (void); - virtual TAO_Stub *_stubobj (void) const; -virtual void test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -virtual void test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - -protected: - ::Marshal_ptr get_proxy (void); - ::Marshal_var proxy_; -}; - - -#endif /* end #if !defined */ - -extern CORBA::TypeCode_ptr _tc_Marshal; - -extern Marshal_ptr (*_TAO_collocation_Marshal_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ); -// Any operators for interface Marshal - void operator<<= (CORBA::Any &, Marshal_ptr); - CORBA::Boolean operator>>= (const CORBA::Any &, Marshal *&); - void operator<<= (CORBA::Any &, const Marshal::Marshal_Struct &); // copying version - void operator<<= (CORBA::Any &, Marshal::Marshal_Struct*); // noncopying version - CORBA::Boolean operator>>= (const CORBA::Any &, Marshal::Marshal_Struct *&); // deprecated - CORBA::Boolean operator>>= (const CORBA::Any &, const Marshal::Marshal_Struct *&); - void operator<<= (CORBA::Any &, Marshal::discrim); - CORBA::Boolean operator>>= (const CORBA::Any &, Marshal::discrim &); - void operator<<= (CORBA::Any &, const Marshal::Marshal_Union &); // copying version - void operator<<= (CORBA::Any &, Marshal::Marshal_Union*); // noncopying version - CORBA::Boolean operator>>= (const CORBA::Any &, Marshal::Marshal_Union *&); // deprecated - CORBA::Boolean operator>>= (const CORBA::Any &, const Marshal::Marshal_Union *&); - void operator<<= (CORBA::Any &, const Marshal::AnySeq &); // copying version - void operator<<= (CORBA::Any &, Marshal::AnySeq*); // noncopying version - CORBA::Boolean operator>>= (const CORBA::Any &, Marshal::AnySeq *&); // deprecated - CORBA::Boolean operator>>= (const CORBA::Any &, const Marshal::AnySeq *&); - void operator<<= (CORBA::Any &, const Marshal::Marshal_Recursive &); // copying version - void operator<<= (CORBA::Any &, Marshal::Marshal_Recursive*); // noncopying version - CORBA::Boolean operator>>= (const CORBA::Any &, Marshal::Marshal_Recursive *&); // deprecated - CORBA::Boolean operator>>= (const CORBA::Any &, const Marshal::Marshal_Recursive *&); - -#ifndef __ACE_INLINE__ - - CORBA::Boolean operator<< (TAO_OutputCDR &, const Marshal_ptr ); - CORBA::Boolean operator>> (TAO_InputCDR &, Marshal_ptr &); - CORBA::Boolean operator<< (TAO_OutputCDR &, const Marshal::Marshal_Struct &); - CORBA::Boolean operator>> (TAO_InputCDR &, Marshal::Marshal_Struct &); - CORBA::Boolean operator<< (TAO_OutputCDR &, const Marshal::discrim &); // - CORBA::Boolean operator>> (TAO_InputCDR &, Marshal::discrim &); - CORBA::Boolean operator<< (TAO_OutputCDR &, const Marshal::Marshal_Union &); // - CORBA::Boolean operator>> (TAO_InputCDR &, Marshal::Marshal_Union &); - -#if !defined _TAO_CDR_OP_Marshal_AnySeq_H_ -#define _TAO_CDR_OP_Marshal_AnySeq_H_ - - CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const Marshal::AnySeq & - ); - CORBA::Boolean operator>> ( - TAO_InputCDR &, - Marshal::AnySeq & - ); - -#endif /* _TAO_CDR_OP_Marshal_AnySeq_H_ */ - - CORBA::Boolean operator<< (TAO_OutputCDR &, const Marshal::Marshal_Recursive &); - CORBA::Boolean operator>> (TAO_InputCDR &, Marshal::Marshal_Recursive &); - -#if !defined _TAO_CDR_OP_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive_H_ -#define _TAO_CDR_OP_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive_H_ - - CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive & - ); - CORBA::Boolean operator>> ( - TAO_InputCDR &, - Marshal::Marshal_Recursive::_tao_seq_Marshal_Recursive & - ); - -#endif /* _TAO_CDR_OP_Marshal_Marshal_Recursive__tao_seq_Marshal_Recursive_H_ */ - - -#endif /* __ACE_INLINE__ */ - - -#if defined (__ACE_INLINE__) -#include "marshalC.i" -#endif /* defined INLINE */ - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* ifndef */ diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp deleted file mode 100644 index ec1870f6dfa..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp +++ /dev/null @@ -1,1586 +0,0 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#include "marshalS.h" - -#if !defined (__ACE_INLINE__) -#include "marshalS.i" -#endif /* !defined INLINE */ - -class TAO_Marshal_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; -/* starting time is 14:06:51 */ -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /export/kelvar/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Marshal_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_Marshal_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, - 20, 20, 20, 5, 20, 5, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 5, - 20, 20, 20, 0, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 0, 20, 20, 20, 20, 0, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, -#else - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 0, 20, 0, 20, 20, - 20, 5, 20, 5, 20, 20, 20, 20, 20, 20, - 5, 20, 20, 20, 0, 20, 0, 20, 20, 20, - 20, 0, 20, 20, 20, 20, 20, 20, -#endif /* ACE_MVS */ - }; - return len + asso_values[str[len - 1]] + asso_values[str[0]]; -} - -const class TAO_operation_db_entry * -TAO_Marshal_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 12, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 14, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 19, - HASH_VALUE_RANGE = 15, - DUPLICATES = 2 - }; - - static const class TAO_operation_db_entry wordlist[] = - { - {"",0},{"",0},{"",0},{"",0},{"",0}, - {"_is_a", &POA_Marshal::_is_a_skel}, - {"test_any", &POA_Marshal::test_any_skel}, - {"test_char", &POA_Marshal::test_char_skel}, - {"test_short", &POA_Marshal::test_short_skel}, - {"test_octet", &POA_Marshal::test_octet_skel}, - {"test_struct", &POA_Marshal::test_struct_skel}, - {"_non_existent", &POA_Marshal::_non_existent_skel}, - {"test_long", &POA_Marshal::test_long_skel}, - {"test_union", &POA_Marshal::test_union_skel}, - {"test_double", &POA_Marshal::test_double_skel}, - {"test_sequence", &POA_Marshal::test_sequence_skel}, - {"test_recursive", &POA_Marshal::test_recursive_skel}, - }; - - static const signed char lookup[] = - { - -1, -1, -1, -1, -1, 5, -8, -2, 6, 7, -23, 10, -1, 11, - 12, 13, 14, -1, 15, 16, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - int slot = lookup[key]; - - if (slot >= 0 && slot < MAX_HASH_VALUE) - { - const char *s = wordlist[slot].opname_; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[slot]; - } - else if (slot < 0 && slot >= -MAX_HASH_VALUE) - return 0; - else - { - unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE); - const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]]; - const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1]; - - while (--ptr >= base) - if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1)) - return ptr; - } - } - } - return 0; -} -/* ending time is 14:06:51 */ -static TAO_Marshal_Perfect_Hash_OpTable tao_Marshal_optable; - -Marshal_ptr _TAO_collocation_POA_Marshal_Stub_Factory ( - CORBA::Object_ptr obj - ) -{ - TAO_Stub *stub = obj->_stubobj (); - - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) - { - case TAO_ORB_Core::THRU_POA: - { - Marshal_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - _tao_thru_poa_collocated_Marshal (stub), - 0 - ); - return retval; - } - case TAO_ORB_Core::DIRECT: - break; - default: - break; - } - return 0; -} - -int _TAO_collocation_POA_Marshal_Stub_Factory_Initializer (long dummy) -{ - ACE_UNUSED_ARG (dummy); - - _TAO_collocation_Marshal_Stub_Factory_function_pointer = - _TAO_collocation_POA_Marshal_Stub_Factory; - - return 0; -} - -static int _TAO_collocation_POA_Marshal_Stub_Factory_Initializer_Scarecrow = - _TAO_collocation_POA_Marshal_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_Marshal_Stub_Factory_Initializer)); - -// skeleton constructor -POA_Marshal::POA_Marshal (void) -{ - this->optable_ = &tao_Marshal_optable; -} - -// copy ctor -POA_Marshal::POA_Marshal (const POA_Marshal& rhs) - : TAO_ServantBase (rhs) -{} - -// skeleton destructor -POA_Marshal::~POA_Marshal (void) -{ -} - -void POA_Marshal::test_short_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - CORBA::Short s1; - CORBA::Short s2; - if (!( - (_tao_in >> s1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_short", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_short ( - s1, - s2 - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_short", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_short", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << s2) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_long_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - CORBA::Long l1; - CORBA::Long l2; - if (!( - (_tao_in >> l1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_long", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_long ( - l1, - l2 - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_long", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_long", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << l2) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_octet_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - CORBA::Octet o1; - CORBA::Octet o2; - if (!( - (_tao_in >> CORBA::Any::to_octet (o1)) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_octet", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_octet ( - o1, - o2 - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_octet", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_octet", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << CORBA::Any::from_octet (o2)) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_char_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - CORBA::Char c1; - CORBA::Char c2; - if (!( - (_tao_in >> CORBA::Any::to_char (c1)) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_char", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_char ( - c1, - c2 - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_char", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_char", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << CORBA::Any::from_char (c2)) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_double_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - CORBA::Double d1; - CORBA::Double d2; - if (!( - (_tao_in >> d1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_double", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_double ( - d1, - d2 - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_double", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_double", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << d2) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_struct_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - Marshal::Marshal_Struct ms1; - Marshal::Marshal_Struct ms2; - if (!( - (_tao_in >> ms1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_struct", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_struct ( - ms1, - ms2 - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_struct", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_struct", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << ms2) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_union_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - Marshal::Marshal_Union u1; - Marshal::Marshal_Union u2; - if (!( - (_tao_in >> u1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_union", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_union ( - u1, - u2 - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_union", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_union", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << u2) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_any_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - CORBA::Any a1; - CORBA::Any_var a2; - if (!( - (_tao_in >> a1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_any", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_any ( - a1, - a2.out () - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_any", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_any", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << a2.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_sequence_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - Marshal::AnySeq as1; - Marshal::AnySeq_var as2; - if (!( - (_tao_in >> as1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_sequence", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_sequence ( - as1, - as2.out () - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_sequence", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_sequence", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << as2.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::test_recursive_skel ( - CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *)_tao_object_reference; - - Marshal::Marshal_Recursive mr1; - Marshal::Marshal_Recursive_var mr2; - if (!( - (_tao_in >> mr1) - )) - ACE_THROW (CORBA::MARSHAL () ); - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter - _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); - ACE_CHECK; - PortableInterceptor::Cookies _tao_cookies; - CORBA::NVList_var _tao_interceptor_args; - CORBA::Object_var _tao_objref; - if (_tao_vfr.valid ()) - { - _tao_server_request.orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_objref = _tao_server_request.objref (ACE_TRY_ENV); - ACE_CHECK; - } - - ACE_TRY - { - _tao_vfr.preinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_recursive", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_impl->test_recursive ( - mr1, - mr2.out () - ); - - TAO_INTERCEPTOR_CHECK; - -#if (TAO_HAS_INTERCEPTORS == 1) - _tao_vfr.postinvoke ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_recursive", - _tao_server_request.service_info (), - _tao_interceptor_args.inout (), - _tao_cookies, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; - } - ACE_CATCHANY - { - _tao_vfr.exception_occurred ( - _tao_server_request.request_id (), - 1, - _tao_objref.in (), - "test_recursive", - _tao_cookies, - ACE_TRY_ENV - ); - ACE_RETHROW; - } - ACE_ENDTRY; - ACE_CHECK; -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!( - (_tao_out << mr2.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); - -} - -void POA_Marshal::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_Marshal *_tao_impl = (POA_Marshal *) _tao_object_reference; - CORBA::Boolean _tao_retval = 0; - CORBA::String_var value; - if (!((_tao_in >> value.out ()))) - ACE_THROW (CORBA::MARSHAL ()); - - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -void POA_Marshal::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) -{ - POA_Marshal *_tao_impl = (POA_Marshal *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; - - _tao_server_request.init_reply (ACE_TRY_ENV); - ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) - ACE_THROW (CORBA::MARSHAL ()); -} - -CORBA::Boolean POA_Marshal::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:Marshal:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) - return 1; - else - return 0; -} - -void* POA_Marshal::_downcast ( - const char* logical_type_id - ) -{ -if (ACE_OS::strcmp (logical_type_id, "IDL:Marshal:1.0") == 0) - return ACE_static_cast (POA_Marshal_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) - return ACE_static_cast(PortableServer::Servant, this); - return 0; -} - -void POA_Marshal::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Skeleton skel; // pointer to skeleton for operation - const char *opname = req.operation (); // retrieve operation name - // find the skeleton corresponding to this opname - if (this->_find (opname, skel, req.operation_length ()) == -1) - { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION ()); - } - else - skel (req, this, context, ACE_TRY_ENV); -} - -const char* POA_Marshal::_interface_repository_id (void) const -{ - return "IDL:Marshal:1.0"; -} - -Marshal* -POA_Marshal::_this (CORBA_Environment &ACE_TRY_ENV) -{ - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) - { - case TAO_ORB_Core::THRU_POA: - { - ::Marshal_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - _tao_thru_poa_collocated_Marshal (stub), - 0 - ); - return retval; - } - case TAO_ORB_Core::DIRECT: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - default: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - } - else - { - // stub->_incr_refcnt (); - CORBA::Object_ptr tmp = CORBA::Object::_nil (); - ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0); - CORBA::Object_var obj = tmp; - return ::Marshal::_unchecked_narrow (obj.in ()); - } -} - -_tao_thru_poa_collocated_Marshal::_tao_thru_poa_collocated_Marshal ( - TAO_Stub *stub -) - : CORBA_Object (stub, 0, 1) -{ -} - -CORBA::Boolean _tao_thru_poa_collocated_Marshal::_is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV - ) - -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_is_a", - ACE_TRY_ENV - ); - ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->_is_a (logical_type_id, ACE_TRY_ENV); -} - - -CORBA::Boolean _tao_thru_poa_collocated_Marshal::_non_existent( - CORBA_Environment &ACE_TRY_ENV - ) - -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_non_existent", - ACE_TRY_ENV - ); - ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->_non_existent (ACE_TRY_ENV); -} - - -void _tao_thru_poa_collocated_Marshal::test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_short" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_short ( - s1, - s2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_long" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_long ( - l1, - l2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_octet" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_octet ( - o1, - o2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_char" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_char ( - c1, - c2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_double" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_double ( - d1, - d2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_struct" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_struct ( - ms1, - ms2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_union" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_union ( - u1, - u2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_any" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_any ( - a1, - a2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_sequence" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_sequence ( - as1, - as2 - ); - return; -} - -void _tao_thru_poa_collocated_Marshal::test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter () - ); - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "test_recursive" - ); - ACE_reinterpret_cast ( - POA_Marshal_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:Marshal:1.0" - ) - )->test_recursive ( - mr1, - mr2 - ); - return; -} - - - diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h b/TAO/Benchmark/Marshal_Test/TAO/marshalS.h deleted file mode 100644 index 2de835514b8..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h +++ /dev/null @@ -1,480 +0,0 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef _TAO_IDL_MARSHALS_H_ -#define _TAO_IDL_MARSHALS_H_ - -#include "marshalC.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -class POA_Marshal; -typedef POA_Marshal *POA_Marshal_ptr; -class POA_Marshal : public virtual PortableServer::ServantBase -{ -protected: - POA_Marshal (void); - -public: - POA_Marshal (const POA_Marshal& rhs); - virtual ~POA_Marshal (void); - - - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void* _downcast ( - const char* logical_type_id - ); - - static void _is_a_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - static void _non_existent_skel ( - CORBA::ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - ::Marshal *_this ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual const char* _interface_repository_id (void) const; - - virtual void test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_short_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_long_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_octet_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_char_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_double_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_struct_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_union_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_any_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_sequence_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - static void test_recursive_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - -}; - - -#if !defined (_MARSHAL___THRU_POA_COLLOCATED_SH_) -#define _MARSHAL___THRU_POA_COLLOCATED_SH_ - -class _tao_thru_poa_collocated_Marshal : public virtual ::Marshal -{ -public: - _tao_thru_poa_collocated_Marshal ( - TAO_Stub *stub - ); - virtual CORBA::Boolean _is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - - virtual CORBA::Boolean _non_existent( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - - virtual void test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -}; - - -#endif /* end #if !defined */ - -// TIE class: Refer to CORBA v2.2, Section 20.34.4 -template <class T> -class POA_Marshal_tie : public POA_Marshal -{ -public: - POA_Marshal_tie (T &t); - // the T& ctor - POA_Marshal_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - POA_Marshal_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - POA_Marshal_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~POA_Marshal_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = - TAO_default_environment () - ); - void test_short ( - CORBA::Short s1, - CORBA::Short_out s2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_long ( - CORBA::Long l1, - CORBA::Long_out l2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_octet ( - CORBA::Octet o1, - CORBA::Octet_out o2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_char ( - CORBA::Char c1, - CORBA::Char_out c2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_double ( - CORBA::Double d1, - CORBA::Double_out d2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_struct ( - const Marshal::Marshal_Struct & ms1, - Marshal::Marshal_Struct_out ms2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_union ( - const Marshal::Marshal_Union & u1, - Marshal::Marshal_Union_out u2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_any ( - const CORBA::Any & a1, - CORBA::Any_out a2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_sequence ( - const Marshal::AnySeq & as1, - Marshal::AnySeq_out as2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - void test_recursive ( - const Marshal::Marshal_Recursive & mr1, - Marshal::Marshal_Recursive_out mr2 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; - - // copy and assignment are not allowed - POA_Marshal_tie (const POA_Marshal_tie &); - void operator= (const POA_Marshal_tie &); -}; - - -#include "marshalS_T.h" - -#if defined (__ACE_INLINE__) -#include "marshalS.i" -#endif /* defined INLINE */ - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* ifndef */ diff --git a/TAO/Benchmark/Marshal_Test/TAO/server.cpp b/TAO/Benchmark/Marshal_Test/TAO/server.cpp deleted file mode 100644 index a992752cda8..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/server.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "tao_marshal_server.h" - -ACE_RCSID(TAO, server, "$Id$") - -int main (int argc, char *argv []) -{ - // instantiate a DRIVER with the Tao_Client_Proxy as the template - CORBA_Benchmark_Driver<Tao_Marshal_Server_Proxy> driver (new - Tao_Marshal_Server_Proxy ()); - - // let the driver do everything for us so that we remain very simple - return driver.run (argc, argv); -} diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp deleted file mode 100644 index 62bd609f343..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp +++ /dev/null @@ -1,1428 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Tao marshal benchmark -// -// = FILENAME -// tao_marshal_proxy.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#include <iostream.h> -#include <fstream.h> -#include "tao_marshal_client.h" - -#if !defined (__ACE_INLINE__) -#include "tao_marshal_client.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(TAO, tao_marshal_client, "$Id$") - -int -Tao_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - char **argv; - int argc; - CORBA_Object_ptr target; - CORBA_Environment env; - CORBA_String str; // IOR - fstream iorfile; // persistent storage - - // get the argument list to be passed on to the ORB_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->orb_ = CORBA_ORB_init (argc, (char *const *)argv, "IOR", env); - if (this->orb_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } - - str = CORBA_string_alloc(500); - - // read the IOR from the file ior.txt - iorfile.open("ior.txt", ios::in); - iorfile >> ((char *)str); - iorfile.close(); - - cout << "Read IOR string as: " << ((char *)str) << endl; - - target = this->orb_->string_to_object(str, env); - if (env.exception() != 0){ - ACE_DEBUG ((LM_ERROR, "str to obj failed")); - return 1; - } - CORBA_string_free(str); - -#if 0 - // get the obj ref by binding it to the specified host using the specified obj_name - target = Marshal::_bind (options.object_name (), options.hostname ()); - if (CORBA_is_nil (target)) - { - ACE_DEBUG ((LM_DEBUG, "bind call failed\n")); - return -1; - } -#endif - - this->ref_ = Marshal::_narrow (target); - if (CORBA_is_nil (this->ref_)) - { - ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n")); - return -1; - } - - // tell the "results" object what file it must store the results into - results.filename (options.filename ()); - - // use SII or DII accordingly - switch (options.policy ()) - { - case CORBA_Marshal_Options::STATIC : // use SII - return this->use_sii (options, results); - break; - case CORBA_Marshal_Options::DYNAMIC : // use DII - return this->use_dii (options, results); - break; - default: - ACE_DEBUG ((LM_DEBUG, "bad policy\n")); - return -1; - } - // hopefully we are never here, else something is seriously wrong - return -1; -} - -int -Tao_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - int i; - int status = 0; - // This method tests the static invocation interface - - for (i=0; i < options.iterations () && !status; i++) - { - switch (options.data_type ()) - { - // shorts - case CORBA_Marshal_Options::SHORT: - status = sii_test_short (options, results); - break; - // longs - case CORBA_Marshal_Options::LONG: - status = sii_test_long (options, results); - break; - // octets - case CORBA_Marshal_Options::OCTET: - status = sii_test_octet (options, results); - break; - // chars - case CORBA_Marshal_Options::CHAR: - status = sii_test_char (options, results); - break; - // doubles - case CORBA_Marshal_Options::DOUBLE: - status = sii_test_double (options, results); - break; - // Structs - case CORBA_Marshal_Options::STRUCT: - status = sii_test_struct (options, results); - break; - // unions - case CORBA_Marshal_Options::UNION: - status = sii_test_union (options, results); - break; - // anys - case CORBA_Marshal_Options::ANY: - status = sii_test_any (options, results); - break; - // sequences - case CORBA_Marshal_Options::SEQUENCE: - status = sii_test_sequence (options, results); - break; - // longs - case CORBA_Marshal_Options::RECURSIVE: - // status = sii_test_recursive (options, results); - // doesn't work - break; - default: - status = -1; - } // end of switch - } // for loop - - if (!status) - return 0; - else - return -1; -} - -int -Tao_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - int i; - int status = 0; - // This method tests the dynamic invocation interface - - for (i=0; i < options.iterations () && !status; i++) - { - switch (options.data_type ()) - { - // shorts - case CORBA_Marshal_Options::SHORT: - status = dii_test_short (options, results); - break; - // longs - case CORBA_Marshal_Options::LONG: - status = dii_test_long (options, results); - break; - // octets - case CORBA_Marshal_Options::OCTET: - status = dii_test_octet (options, results); - break; - // chars - case CORBA_Marshal_Options::CHAR: - status = dii_test_char (options, results); - break; - // doubles - case CORBA_Marshal_Options::DOUBLE: - status = dii_test_double (options, results); - break; - // Structs - case CORBA_Marshal_Options::STRUCT: - status = dii_test_struct (options, results); - break; - // unions - case CORBA_Marshal_Options::UNION: - status = dii_test_union (options, results); - break; - // anys - case CORBA_Marshal_Options::ANY: - status = dii_test_any (options, results); - break; - // sequences - case CORBA_Marshal_Options::SEQUENCE: - status = dii_test_sequence (options, results); - break; - // longs - case CORBA_Marshal_Options::RECURSIVE: - // status = dii_test_recursive (options, results); - // doesn't work - break; - default: - status = -1; - } // end of switch - } // for loop - - if (!status) - return 0; - else - return -1; -} - - -// all helper functions : SII -int -Tao_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - CORBA_Short s1, s2; - CORBA_Environment env; - - s1 = 3; - ref_->test_short (s1, s2, env); - if (s2 == 2*s1) - { - ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2)); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - CORBA_Long l1, l2; - CORBA_Environment env; - - l1 = 256; - ref_->test_long (l1, l2, env); - if (l2 == 3*l1) - { - ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2)); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // octets -{ - CORBA_Octet o1, o2; - CORBA_Environment env; - - o1 = (CORBA_Octet) 127; - ref_->test_octet (o1, o2, env); - if (o1 == o2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2)); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // chars -{ - CORBA_Char c1, c2; - CORBA_Environment env; - - c1 = 'B'; - ref_->test_char (c1, c2, env); - if (c1 == c2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2)); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // doubles -{ - CORBA_Double d1, d2; - CORBA_Environment env; - - d1 = 3.1415; - ref_->test_double (d1, d2, env); - if (d2 == d1/2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2)); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // structs -{ - Marshal::Marshal_Struct ms1, ms2; - CORBA_Environment env; - - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA_Octet) 127; - ms1.d = 3.1415; - - ref_->test_struct (ms1, ms2, env); - if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o && - ms1.d == ms2.d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n")); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // unions -{ - Marshal::Marshal_Union u1, u2; - Marshal::Marshal_Struct ms1, ms2; - CORBA_Environment env; - - // first test an enumerated case - u1._d (Marshal::e_1st); - u1.l (4567); - - ref_->test_union (u1, u2, env); - if ( (u1._d () == u2._d()) && (u1.l () == u2.l ())) - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n")); - } - - // now test the default case - u1._d (Marshal::e_6th); // this case doesn't exist which will lead to using - // the default case - - u1.ms ().s = 3; - u1.ms ().l = 256; - u1.ms ().c = 'B'; - u1.ms ().o = (CORBA_Octet) 127; - u1.ms ().d = 3.1415; - - ref_->test_union (u1, u2, env); - - if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o && - u1.ms ().d == u2.ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n")); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we send a struct thru the any - CORBA_Any a1, *a2; - Marshal::Marshal_Struct ms1, *ms2; - CORBA_Environment env; - - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA_Octet) 127; - ms1.d = 3.1415; - - // populate the any with a MarshalStruct - // a1 <<= ms1; // not in TAO yet - a1.replace (Marshal::_tc_Marshal_Struct, &ms1, 0, env); - - a2 = new CORBA_Any; - - // now test it - ref_->test_any (a1, a2, env); - - // check if the two typecodes are equal - if (a2->type ()->equal (Marshal::_tc_Marshal_Struct, env)) - { - // now see if the values are same - ms2 = (Marshal::Marshal_Struct *)a2->value (); - if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o && - ms1.d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_any success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n")); - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n")); - } - return 0; -} - -int -Tao_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // make a sequence of Anys and fill each one with a different data type - Marshal::AnySeq as1 (7), *as2; - Marshal::Marshal_Struct ms; - Marshal::Marshal_Union u; - CORBA_Environment env; - - - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA_Octet) 127; - ms.d = 3.1415; - - u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to - // work here - u.ms ().s = 3; - u.ms ().l = 256; - u.ms ().c = 'B'; - u.ms ().o = (CORBA_Octet) 127; - u.ms ().d = 3.1415; - - // it looks like we must tell the sequence how many elements it is going to - // carry. By just fixing the max value does not work. - - as1.length (7); - -#if 0 // to be supported later - as1[0] <<= (CORBA_Short)3; - as1[1] <<= (CORBA_Long) 256; - as1[2] <<= CORBA_Any::from_octet ((CORBA_Octet)127); - as1[3] <<= CORBA_Any::from_char ('B'); - as1[4] <<= (CORBA_Double)3.1415; // double - as1[5] <<= ms; // struct - as1[6] <<= u; // union -#endif - as1[0].replace (_tc_CORBA_Short, new CORBA_Short (3), 1, env); - as1[1].replace (_tc_CORBA_Long, new CORBA_Long (256), 1, env); - as1[2].replace (_tc_CORBA_Octet, new CORBA_Octet ((CORBA_Octet)127), 1, env); - as1[3].replace (_tc_CORBA_Char, new CORBA_Char ('B'), 1, env); - as1[4].replace (_tc_CORBA_Double, new CORBA_Double (3.1415), 1, env); - as1[5].replace (Marshal::_tc_Marshal_Struct, new Marshal::Marshal_Struct - (ms), 1, env); - as1[6].replace (Marshal::_tc_Marshal_Union, new Marshal::Marshal_Union (u), 1, env); - - as2 = new Marshal::AnySeq; - - ref_->test_sequence (as1, as2, env); - - ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n")); - if (as1.length () == as2->length ()) - { - // now make sure that the elements are same - for (int i=0; i < as1.length (); i++) - { - if (as1[i].type ()->equal ((*as2)[i].type (), env)) - { - // now see if the values are same - switch (i) - { - case 0: - if (*(CORBA_Short *)as1[i].value () == *(CORBA_Short - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n")); - } - break; - case 1: - if (*(CORBA_Long *)as1[i].value () == *(CORBA_Long - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n")); - } - break; - case 2: - if (*(CORBA_Octet *)as1[i].value () == *(CORBA_Octet - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n")); - } - break; - case 3: - if (*(CORBA_Char *)as1[i].value () == *(CORBA_Char - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n")); - } - break; - case 4: - if (*(CORBA_Double *)as1[i].value () == *(CORBA_Double - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n")); - } - break; - case 5: - { - Marshal::Marshal_Struct *ms1, *ms2; - - ms1 = (Marshal::Marshal_Struct *)as1[i].value (); - ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value (); - - if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o && - ms1->d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n")); - } - } - break; - case 6: - { - Marshal::Marshal_Union *u1, *u2; - - u1 = (Marshal::Marshal_Union *)as1[i].value (); - u2 = (Marshal::Marshal_Union *)(*as2)[i].value (); - - if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s && - u1->ms ().l == u2->ms ().l && - u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o && - u1->ms ().d == u2->ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n")); - } - } - break; - } - } - else - { - ACE_DEBUG ((LM_DEBUG, - "SII test_sequence: typecode mismatch for element %d\n", i)); - break; - } - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n", - as2->length ())); - } - return 0; -} - -#if 0 -int -Tao_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we will try a simple one here - Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2; - CORBA_Environment env; - - - mr1.value <<= (CORBA_Long)1; - mr1.next.length (1); // sequence of length 1 - - // fill the element - elem1 = &mr1.next[0]; - elem1->value <<= CORBA_Any::from_char ('D'); - elem1->next.length (0); // end of seq - - mr2 = new Marshal::Marshal_Recursive; - - try { - ref_->test_recursive (mr1, mr2, env); - } - catch (CORBA_SystemException &se){ - cerr << "error invoking request: " << se << endl; - } - - elem2 = &mr2->next[0]; - - if ((*(CORBA_Long *)mr1.value.value () == *(CORBA_Long*)mr2->value.value ()) - && (mr1.next.length () == mr2->next.length ()) // same length sequence - && (*(CORBA_Char *)elem1->value.value () == *(CORBA_Char *)elem2->value.value ()) - && (elem1->next.length () == elem2->next.length ())) - { - ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n")); - } - - return 0; -} -#endif - -// ------------------------------------------------------- -// all helper functions : DII -// ------------------------------------------------------- - -int -Tao_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - CORBA_Short s1, s2; - CORBA_Environment env; - - s1 = 3; - s2 = 0; - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add (CORBA_ARG_IN)->value ()) <<= s1; - arglist->add_value ("s1", CORBA_Any (_tc_CORBA_Short, &s1, 0), - CORBA_ARG_IN, env); - // this usage is also correct. All we care is to supply a storage area for - // the OUT parameter - // arglist->add (CORBA_ARG_OUT)->value ()->replace (CORBA__tc_short, &s2); - // *(arglist->add (CORBA_ARG_OUT)->value ()) <<= s2; - arglist->add_value ("s2", CORBA_Any (_tc_CORBA_Short, &s2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item (0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_short", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= s2; - s2 = *(CORBA_Short *)arglist->item(1)->value()->value(); - - if (s2 == 2*s1) - { - ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2)); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - CORBA_Long l1, l2; - CORBA_Environment env; - - l1 = 256; - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= l1; - arglist->add_value ("l1", CORBA_Any (_tc_CORBA_Long, &l1, 0), - CORBA_ARG_IN, env); - // arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_long, &l2); - arglist->add_value ("l2", CORBA_Any (_tc_CORBA_Long, &l2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_long", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= l2; - l2 = *(CORBA_Long *)arglist->item (1)->value ()->value (); - - if (l2 == 3*l1) - { - ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2)); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // octets -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - CORBA_Octet o1, o2; - CORBA_Environment env; - - o1 = (CORBA_Octet) 127; - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= CORBA_Any::from_octet (o1); - // arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_octet, &o2); - arglist->add_value ("o1", CORBA_Any (_tc_CORBA_Octet, &o1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("o2", CORBA_Any (_tc_CORBA_Octet, &o2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_octet", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= CORBA_Any::to_octet (o2); - o2 = *(CORBA_Octet *)arglist->item (1)->value ()->value (); - - if (o1 == o2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2)); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // chars -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - CORBA_Char c1, c2; - CORBA_Environment env; - - c1 = 'B'; - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= CORBA_Any::from_char (c1); - // arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_char, &c2); - arglist->add_value ("c1", CORBA_Any (_tc_CORBA_Char, &c1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("c2", CORBA_Any (_tc_CORBA_Char, &c2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_char", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= CORBA_Any::to_char (c2); - c2 = *(CORBA_Char *)arglist->item (1)->value ()->value (); - - if (c1 == c2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2)); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // doubles -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - CORBA_Double d1, d2; - CORBA_Environment env; - - d1 = 3.1415; - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= d1; - // arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_double, &d2); - arglist->add_value ("d1", CORBA_Any (_tc_CORBA_Double, &d1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("d2", CORBA_Any (_tc_CORBA_Double, &d2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_double", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= d2; - d2 = *(CORBA_Double *)arglist->item (1)->value ()->value (); - - if (d2 == d1/2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2)); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // structs -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - Marshal::Marshal_Struct ms1, ms2; - CORBA_Environment env; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA_Octet) 127; - ms1.d = 3.1415; - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= ms1; - // arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, &ms2); - arglist->add_value ("ms1", CORBA_Any (Marshal::_tc_Marshal_Struct, &ms1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("ms2", CORBA_Any (Marshal::_tc_Marshal_Struct, &ms2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_struct", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= ms2; - ms2 = *(Marshal::Marshal_Struct *)arglist->item (1)->value ()->value (); - - if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o && - ms1.d == ms2.d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n")); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // unions -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - Marshal::Marshal_Union u1, u2; - Marshal::Marshal_Struct ms1, ms2; - CORBA_Environment env; - - - // first test an enumerated case - u1._d (Marshal::e_1st); - u1.l (4567); - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= u1; - // arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2); - arglist->add_value ("u1", CORBA_Any (Marshal::_tc_Marshal_Union, &u1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_union", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= u2; - u2 = *(Marshal::Marshal_Union *)arglist->item (1)->value ()->value (); - - if ( (u1._d () == u2._d()) && (u1.l () == u2.l ())) - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n")); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - - // now test the default case - u1._d (Marshal::e_5th); // e_6th doesn't work - - u1.ms ().s = 3; - u1.ms ().l = 256; - u1.ms ().c = 'B'; - u1.ms ().o = (CORBA_Octet) 127; - u1.ms ().d = 3.1415; - - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= u1; - //arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2); - arglist->add_value ("u1", CORBA_Any (Marshal::_tc_Marshal_Union, &u1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_union", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= u2; - u2 = *(Marshal::Marshal_Union *)arglist->item (1)->value ()->value (); - - if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o && - u1.ms ().d == u2.ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n")); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - // we send a struct thru the any - CORBA_Any a1, *a2; - Marshal::Marshal_Struct ms1, *ms2; - CORBA_Environment env; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA_Octet) 127; - ms1.d = 3.1415; - - // populate the any with a MarshalStruct - // a1 <<= ms1; - a1.replace (Marshal::_tc_Marshal_Struct, &ms1, 0, env); - - a2 = new CORBA_Any; - - // now test it - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= a1; - // arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_any, a2); - arglist->add_value ("a1", CORBA_Any (_tc_CORBA_Any, &a1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("a2", CORBA_Any (_tc_CORBA_Any, a2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_any", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= (*a2); - a2->replace (_tc_CORBA_Any, (CORBA_Any *)arglist->item (1)->value ()->value - (), 1, env); - - // check if the two typecodes are equal - if (a2->type ()->equal (Marshal::_tc_Marshal_Struct, env)) - { - // now see if the values are same - ms2 = (Marshal::Marshal_Struct *)a2->value (); - if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o && - ms1.d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_any success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n")); - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n")); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -int -Tao_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA_Request_ptr request = 0; //CORBA_Request::_nil(); // DII request - CORBA_NVList_ptr arglist = 0; //CORBA_NVList::_nil(); // argument list - // CORBA_Context_ptr ctx = CORBA_Context::_nil(); // context - CORBA_NVList_ptr result_list = 0; //CORBA_NVList::_nil(); // result list - CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result - // make a sequence of Anys and fill each one with a different data type - Marshal::AnySeq as1 (7), *as2; - Marshal::Marshal_Struct ms; - Marshal::Marshal_Union u; - CORBA_Environment env; - - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA_Octet) 127; - ms.d = 3.1415; - - u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to - // work here - u.ms ().s = 3; - u.ms ().l = 256; - u.ms ().c = 'B'; - u.ms ().o = (CORBA_Octet) 127; - u.ms ().d = 3.1415; - - // it looks like we must tell the sequence how many elements it is going to - // carry. By just fixing the max value does not work. - - as1.length (7); - -#if 0 - as1[0] <<= (CORBA_Short)3; - as1[1] <<= (CORBA_Long) 256; - as1[2] <<= CORBA_Any::from_octet ((CORBA_Octet)127); - as1[3] <<= CORBA_Any::from_char ('B'); - as1[4] <<= (CORBA_Double)3.1415; // double - as1[5] <<= ms; // struct - as1[6] <<= u; // union -#endif - as1[0].replace (_tc_CORBA_Short, new CORBA_Short (3), 1, env); - as1[1].replace (_tc_CORBA_Long, new CORBA_Long (256), 1, env); - as1[2].replace (_tc_CORBA_Octet, new CORBA_Octet ((CORBA_Octet)127), 1, env); - as1[3].replace (_tc_CORBA_Char, new CORBA_Char ('B'), 1, env); - as1[4].replace (_tc_CORBA_Double, new CORBA_Double (3.1415), 1, env); - as1[5].replace (Marshal::_tc_Marshal_Struct, new Marshal::Marshal_Struct - (ms), 1, env); - as1[6].replace (Marshal::_tc_Marshal_Union, new Marshal::Marshal_Union (u), 1, env); - - as2 = new Marshal::AnySeq; - - orb_->create_list(0, arglist); // 2 arguments to be added - // *(arglist->add(CORBA_ARG_IN)->value()) <<= as1; - // arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2); - arglist->add_value ("as1", CORBA_Any (Marshal::_tc_AnySeq, &as1, 0), - CORBA_ARG_IN, env); - arglist->add_value ("o2", CORBA_Any (Marshal::_tc_AnySeq, as2, 0), - CORBA_ARG_OUT, env); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(CORBA_Context::_nil (), - "test_sequence", - arglist, - result, - request, - 0, env); - - request->invoke (); // 2 way - // *(arglist->item(1)->value()) >>= (*as2); - *as2 = *(Marshal::AnySeq *)arglist->item (1)->value ()->value (); - - ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n")); - if (as1.length () == as2->length ()) - { - // now make sure that the elements are same - for (int i=0; i < as1.length (); i++) - { - if (as1[i].type ()->equal ((*as2)[i].type (), env)) - { - // now see if the values are same - switch (i) - { - case 0: - if (*(CORBA_Short *)as1[i].value () == *(CORBA_Short - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n")); - } - break; - case 1: - if (*(CORBA_Long *)as1[i].value () == *(CORBA_Long - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n")); - } - break; - case 2: - if (*(CORBA_Octet *)as1[i].value () == *(CORBA_Octet - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n")); - } - break; - case 3: - if (*(CORBA_Char *)as1[i].value () == *(CORBA_Char - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n")); - } - break; - case 4: - if (*(CORBA_Double *)as1[i].value () == *(CORBA_Double - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n")); - } - break; - case 5: - { - Marshal::Marshal_Struct *ms1, *ms2; - - ms1 = (Marshal::Marshal_Struct *)as1[i].value (); - ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value (); - - if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o && - ms1->d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n")); - } - } - break; - case 6: - { - Marshal::Marshal_Union *u1, *u2; - - u1 = (Marshal::Marshal_Union *)as1[i].value (); - u2 = (Marshal::Marshal_Union *)(*as2)[i].value (); - - if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s && - u1->ms ().l == u2->ms ().l && - u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o && - u1->ms ().d == u2->ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n")); - } - } - break; - } - } - else - { - ACE_DEBUG ((LM_DEBUG, - "DII test_sequence: typecode mismatch for element %d\n", i)); - break; - } - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n", - as2->length ())); - } - CORBA_release (request); - CORBA_release (arglist); - CORBA_release (result); - CORBA_release (result_list); - return 0; -} - -#if 0 -int -Tao_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we will try a simple one here - Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2; - - mr1.value <<= (CORBA_Long)1; - mr1.next.length (1); // sequence of length 1 - - // fill the element - elem1 = &mr1.next[0]; - elem1->value <<= CORBA_Any::from_char ('D'); - elem1->next.length (0); // end of seq - - mr2 = new Marshal::Marshal_Recursive; - - try { - ref_->test_recursive (mr1, mr2); - } - catch (CORBA_SystemException &se){ - cerr << "error invoking request: " << se << endl; - } - - elem2 = &mr2->next[0]; - - if ((*(CORBA_Long *)mr1.value.value () == *(CORBA_Long*)mr2->value.value ()) - && (mr1.next.length () == mr2->next.length ()) // same length sequence - && (*(CORBA_Char *)elem1->value.value () == *(CORBA_Char *)elem2->value.value ()) - && (elem1->next.length () == elem2->next.length ())) - { - ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n")); - } - - return 0; -} -#endif diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h deleted file mode 100644 index b55e3f309de..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h +++ /dev/null @@ -1,126 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Marshal Tao Benchmark -// -// = FILENAME -// tao_marshal_client.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _TAO_MARSHAL_CLIENT_H_ -#define _TAO_MARSHAL_CLIENT_H_ - -// benchmark library includes -#include "benchmark/marshal_options.h" -#include "benchmark/marshal_results.h" -#include "benchmark/marshal_proxy.h" - -// include Tao specific include files -#include "marshalC.h" // generated by IDL compiler -#include "tao/nvlist.h" - -class Tao_Marshal_Client_Proxy : public CORBA_Marshal_Proxy -{ - // =TITLE - // Tao_Marshal_Client_Proxy - // =DESCRIPTION - // Tao client size specialization of the CORBA Marshal proxy class -public: - Tao_Marshal_Client_Proxy (void); - // constructor - - ~Tao_Marshal_Client_Proxy (void); - // destructor - - virtual int run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // do the actual work - - virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // use the static invocation interface - - virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // use the dynamic invocation interface -private: - // =helper functions - int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - // all the DII helpers - int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - CORBA_ORB_ptr orb_; - // handle to the underlying orb - - Marshal_ptr ref_; - // the object reference -}; - -#if defined (__ACE_INLINE__) -#include "tao_marshal_client.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i deleted file mode 100644 index 5fcdc2e209f..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - - -ACE_INLINE -Tao_Marshal_Client_Proxy::Tao_Marshal_Client_Proxy (void) - : orb_ (0), - ref_ (0) -{ -} - -ACE_INLINE -Tao_Marshal_Client_Proxy::~Tao_Marshal_Client_Proxy (void) -{ - // releasing order is important - - // release the reference - CORBA_release (ref_); - - // release the ORB - CORBA_release (orb_); -} - - diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp deleted file mode 100644 index cdf7e4541ee..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp +++ /dev/null @@ -1,653 +0,0 @@ -// $Id$ - -#include "tao_marshal_impl.h" - -#if !defined (__ACE_INLINE__) -#include "tao_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(TAO, tao_marshal_impl, "$Id$") - -// All the methods of the SSI class -void -Marshal_SSI_Impl::test_short (CORBA_Short s1, - CORBA_Short &s2, - CORBA_Environment &env) -{ - s2 = 2*s1; -} - -void -Marshal_SSI_Impl::test_long (CORBA_Long l1, - CORBA_Long &l2, - CORBA_Environment &env) -{ - l2 = 3*l1; -} - -void -Marshal_SSI_Impl::test_octet (CORBA_Octet o1, - CORBA_Octet &o2, - CORBA_Environment &env) -{ - o2 = o1; -} - -void -Marshal_SSI_Impl::test_char (CORBA_Char c1, - CORBA_Char &c2, - CORBA_Environment &env) -{ - c2 = c1; -} - -void -Marshal_SSI_Impl::test_double (CORBA_Double d1, - CORBA_Double &d2, - CORBA_Environment &env) -{ - d2 = d1/2; -} - -void -Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA_Environment &env) -{ - ms2.s = ms1.s; - ms2.l = ms1.l; - ms2.c = ms1.c; - ms2.o = ms1.o; - ms2.d = ms1.d; -} - -void -Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA_Environment &env) -{ - u2._d (u1._d ()); // set the discriminant value - - switch (u1._d ()) - { - case Marshal::e_0th: - u2.s (u1.s ()); // set short - break; - case Marshal::e_1st: - u2.l (u1.l ()); // set long - break; - case Marshal::e_2nd: - u2.c (u1.c ()); // set char - break; - case Marshal::e_3rd: - u2.o (u1.o ()); // set octet - break; - case Marshal::e_4th: - u2.d (u1.d ()); // set double - break; - case Marshal::e_5th: - default: - u2.ms (u1. ms ()); // set structs - break; - } -} - -void -Marshal_SSI_Impl::test_any (const CORBA_Any &a1, - CORBA_Any *&a2, - CORBA_Environment &env) -{ - a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy -} - -void -Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2, - CORBA_Environment &env) -{ - as2 = new Marshal::AnySeq (as1); -} - -#if 0 -void -Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1, - Marshal::Marshal_Recursive *&mr2, - CORBA_Environment &env) -{ -} -#endif - -//---------------------------------------------------------------------------- -//the methods of the DSI implementation class - -static const TAO_operation_db_entry Marshal_DSI_operations[] = { - {"_is_a", &Marshal_DSI_Impl::_Marshal_is_a_skel}, - { "test_short", &Marshal_DSI_Impl::_Marshal_test_short_skel}, - { "test_long", &Marshal_DSI_Impl::_Marshal_test_long_skel}, - { "test_octet", &Marshal_DSI_Impl::_Marshal_test_octet_skel}, - { "test_char", &Marshal_DSI_Impl::_Marshal_test_char_skel}, - { "test_double", &Marshal_DSI_Impl::_Marshal_test_double_skel}, - { "test_struct", &Marshal_DSI_Impl::_Marshal_test_struct_skel}, - { "test_union", &Marshal_DSI_Impl::_Marshal_test_union_skel}, - { "test_any", &Marshal_DSI_Impl::_Marshal_test_any_skel}, - { "test_sequence", &Marshal_DSI_Impl::_Marshal_test_sequence_skel}, - { 0, 0 } -}; - -// Note that we use a linear table because rest of the DSI implementations we -// compare with also use linear search in their "invoke" method. -TAO_Linear_OpTable tao_Marshal_DSI_optable (Marshal_DSI_operations, 10); - -// constructor -Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *obj_name) - : orb_ (orb) - //,CORBA_DynamicImplementation ("Marshal", obj_name) // interface name is necessary -{ - // Note that this is a HACK to achieve DSI behavior. But this way we can - // cleanly integrate ourselves with the dispatch mechanism of the OA. - - const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID - STUB_Object *data; // IIOP object - CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA - this->optable_ = &tao_Marshal_DSI_optable; // operation database - CORBA_Long i; - - // setup an IIOP object - data = new STUB_Object (CORBA_string_dup (repoID)); - data->profile.iiop_version.major = IIOP::MY_MAJOR; - data->profile.iiop_version.minor = IIOP::MY_MINOR; - data->profile.host = ACE_OS::strdup (oa->get_addr ().get_host_name ()); - data->profile.port = oa->get_addr ().get_port_number (); - data->profile.object_key.length = ACE_OS::strlen (obj_name); - data->profile.object_key.maximum = data->profile.object_key.length; - data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1]; - ACE_OS::memcpy (data->profile.object_key.buffer, obj_name, - data->profile.object_key.length); // set the object key - this->set_parent (data); // store the IIOP obj reference with ourselves - this->sub_ = this; // set the most derived class to be ourselves - if (oa) oa->bind (data->profile.object_key, this);// register ourselves -} - -void -Marshal_DSI_Impl::invoke (CORBA_ServerRequest& req, CORBA_Environment &env) -{ - // parse the incoming request and find out for what operation it is. We use a - // simple linear search here - if (!ACE_OS::strcmp (req.op_name (), "test_short")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_long")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_octet")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_char")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_double")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_struct")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_union")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_any")) - { - } - else if (!ACE_OS::strcmp (req.op_name (), "test_sequence")) - { - } -} - -// simulate the skeletons -void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (_tc_CORBA_String); - char *type_id = "IDL:Marshal:1.0"; - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - - req.params (nvlist, env); - if (env.exception () != 0) { - dexc (env, "is_a_skel, get params"); - return; - } - - CORBA_Boolean *retval; - CORBA_String value = *(CORBA_String *)nv->value ()->value (); - - cout << "object id = " << ((char *)value) << endl; - if (strcmp ((char *)value, (char *)type_id) == 0 - || strcmp ((char *)value, _tc_CORBA_Object->id(env)) == 0) - retval = new CORBA_Boolean (1); - else - retval = new CORBA_Boolean (0); - - CORBA_Any *any = - new CORBA_Any (_tc_CORBA_Boolean, retval, 1); - - req.result (any, env); - dexc (env, "_is_a, result"); -} - -void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_s1 (_tc_CORBA_Short); - CORBA_Any any_s2 (_tc_CORBA_Short); - Marshal_DSI_Impl* impl; - CORBA_Short s1, s2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_s1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_s2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - s1 = *(CORBA_Short *) nv1->value ()->value (); - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_short (s1, s2, env); - - nv2->value ()->replace (_tc_CORBA_Short, &s2, 0, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_l1 (_tc_CORBA_Long); - CORBA_Any any_l2 (_tc_CORBA_Long); - Marshal_DSI_Impl* impl; - CORBA_Long l1, l2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_l1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_l2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - l1 = *(CORBA_Long *) nv1->value ()->value (); - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_long (l1, l2, env); - - nv2->value ()->replace (_tc_CORBA_Long, &l2, 0, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_o1 (_tc_CORBA_Octet); - CORBA_Any any_o2 (_tc_CORBA_Octet); - Marshal_DSI_Impl* impl; - CORBA_Octet o1, o2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_o1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_o2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - o1 = *(CORBA_Octet *) nv1->value ()->value (); - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_octet (o1, o2, env); - - nv2->value ()->replace (_tc_CORBA_Octet, &o2, 0, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_c1 (_tc_CORBA_Char); - CORBA_Any any_c2 (_tc_CORBA_Char); - Marshal_DSI_Impl* impl; - CORBA_Char c1, c2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_c1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_c2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - c1 = *(CORBA_Char *) nv1->value ()->value (); - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_char (c1, c2, env); - - nv2->value ()->replace (_tc_CORBA_Char, &c2, 0, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_d1 (_tc_CORBA_Double); - CORBA_Any any_d2 (_tc_CORBA_Double); - Marshal_DSI_Impl* impl; - CORBA_Double d1, d2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_d1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_d2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - d1 = *(CORBA_Double *) nv1->value ()->value (); - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_double (d1, d2, env); - - nv2->value ()->replace (_tc_CORBA_Double, &d2, 0, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_ms1 (Marshal::_tc_Marshal_Struct); - CORBA_Any any_ms2 (Marshal::_tc_Marshal_Struct); - Marshal_DSI_Impl* impl; - Marshal::Marshal_Struct ms1, *ms2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_ms1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_ms2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - // note that the second parameter being an out parameter, we are allocating - // it from heap and filling it up. We will then insert it into the Any that - // will get written to the stream. We should have done this for the - // primitives too, but somehow they worked (because nothing got written onto - // the stack frame onto which they existed, but this phenomenon was occuring - // here and possibly will occur for the rest of the case - ms1 = *(Marshal::Marshal_Struct *) nv1->value ()->value (); - ms2 = new Marshal::Marshal_Struct; - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_struct (ms1, *ms2, env); - - nv2->value ()->replace (Marshal::_tc_Marshal_Struct, ms2, 1, env); - - // result - NO result - // CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - // req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_u1 (Marshal::_tc_Marshal_Union); - CORBA_Any any_u2 (Marshal::_tc_Marshal_Union); - Marshal_DSI_Impl* impl; - Marshal::Marshal_Union u1, *u2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_u1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_u2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - u1 = *(Marshal::Marshal_Union *) nv1->value ()->value (); - u2 = new Marshal::Marshal_Union; - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_union (u1, *u2, env); - - nv2->value ()->replace (Marshal::_tc_Marshal_Union, u2, 0, env); - - // result - NO result - // CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - // req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any *a1=0, *a2=0; - CORBA_Any any_a1 (_tc_CORBA_Any, &a1); - CORBA_Any any_a2 (_tc_CORBA_Any); - Marshal_DSI_Impl* impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_a1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_a2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - a1 = (CORBA_Any *) nv1->value ()->value (); - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_any (*a1, a2, env); - - nv2->value ()->replace (_tc_CORBA_Any, a2, 1, env); - - // result - NO result - // CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - // req.result(any, env); -} - -void Marshal_DSI_Impl::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv1, nv2; - CORBA_Any any_as1 (Marshal::_tc_AnySeq); - CORBA_Any any_as2 (Marshal::_tc_AnySeq); - Marshal_DSI_Impl* impl; - Marshal::AnySeq *as1, *as2; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv1 = nvlist->add_value (0, any_as1, CORBA_ARG_IN, env); - nv2 = nvlist->add_value (0, any_as2, CORBA_ARG_OUT, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - as1 = (Marshal::AnySeq *) nv1->value ()->value (); - - // now invoke the implementation - impl = (Marshal_DSI_Impl *)(obj->get_subclass ()); - // now the magic of dynamic binding - impl->test_sequence (*as1, as2, env); - - nv2->value ()->replace (Marshal::_tc_AnySeq, as2, 1, env); - - // result - NO result - // CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, 1); - // req.result(any, env); -} - -// private methods of our DSI class -void -Marshal_DSI_Impl::test_short (CORBA_Short s1, - CORBA_Short &s2, - CORBA_Environment &env) -{ - s2 = 2*s1; -} - -void -Marshal_DSI_Impl::test_long (CORBA_Long l1, - CORBA_Long &l2, - CORBA_Environment &env) -{ - l2 = 3*l1; -} - -void -Marshal_DSI_Impl::test_octet (CORBA_Octet o1, - CORBA_Octet &o2, - CORBA_Environment &env) -{ - o2 = o1; -} - -void -Marshal_DSI_Impl::test_char (CORBA_Char c1, - CORBA_Char &c2, - CORBA_Environment &env) -{ - c2 = c1; -} - -void -Marshal_DSI_Impl::test_double (CORBA_Double d1, - CORBA_Double &d2, - CORBA_Environment &env) -{ - d2 = d1/2; -} - -void -Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA_Environment &env) -{ - ms2.s = ms1.s; - ms2.l = ms1.l; - ms2.c = ms1.c; - ms2.o = ms1.o; - ms2.d = ms1.d; -} - -void -Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA_Environment &env) -{ - u2._d (u1._d ()); // set the discriminant value - - switch (u1._d ()) - { - case Marshal::e_0th: - u2.s (u1.s ()); // set short - break; - case Marshal::e_1st: - u2.l (u1.l ()); // set long - break; - case Marshal::e_2nd: - u2.c (u1.c ()); // set char - break; - case Marshal::e_3rd: - u2.o (u1.o ()); // set octet - break; - case Marshal::e_4th: - u2.d (u1.d ()); // set double - break; - case Marshal::e_5th: - default: - u2.ms (u1. ms ()); // set structs - break; - } -} - -void -Marshal_DSI_Impl::test_any (const CORBA_Any &a1, - CORBA_Any *&a2, - CORBA_Environment &env) -{ - a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy -} - -void -Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2, - CORBA_Environment &env) -{ - as2 = new Marshal::AnySeq (as1); -} - -#if 0 -void -Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1, - Marshal::Marshal_Recursive *&mr2, - CORBA_Environment &env) -{ -} -#endif diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h deleted file mode 100644 index 9c5d9047120..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h +++ /dev/null @@ -1,196 +0,0 @@ -// $Id$ - -#ifndef TAO_MARSHAL_IMPL_H -#define TAO_MARSHAL_IMPL_H - -// to include DSI related files - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "marshalS.h" -//#include "tao/dynimpl.h" - -class Marshal_SSI_Impl - : public virtual _skel_Marshal -{ - // =TITLE - // Marshal_SSI_Impl - // =DESCRIPTION - // Implementation of the interface using the static skeleton interface -public: - Marshal_SSI_Impl (const char *object_name = (const char *)NULL); - // constructor - - ~Marshal_SSI_Impl (void); - // destructor - - virtual void test_short (CORBA_Short s1, - CORBA_Short& s2, - CORBA_Environment &env); - // test short - - virtual void test_long (CORBA_Long l1, - CORBA_Long& l2, - CORBA_Environment &env); - // test long - - virtual void test_octet (CORBA_Octet o1, - CORBA_Octet& o2, - CORBA_Environment &env); - // test octet - - virtual void test_char (CORBA_Char c1, - CORBA_Char& c2, - CORBA_Environment &env); - // test char - - virtual void test_double (CORBA_Double d1, - CORBA_Double& d2, - CORBA_Environment &env); - // test double - - virtual void test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA_Environment &env); - // test struct - - virtual void test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA_Environment &env); - // test union - - virtual void test_any (const CORBA_Any& a1, - CORBA_Any *& a2, - CORBA_Environment &env); - // test any - - virtual void test_sequence (const Marshal::AnySeq& a1, - Marshal::AnySeq *& a2, - CORBA_Environment &env); - // test sequence - -#if 0 - virtual void test_recursive (const Marshal::Marshal_Recursive& mr1, - Marshal::Marshal_Recursive *& mr2, - CORBA_Environment &env); - // test struct -#endif - -}; - -class Marshal_DSI_Impl : public CORBA_Object //: public CORBA_DynamicImplementation -{ - // =TITLE - // Marshal_DSI_Impl - // =DESCRIPTION - // Implementation of the interface using the dynamic skeleton interface - // =NOTES - // We do not have a DynamicImplementation as yet. So we do a trick here. We - // simulate the skeletons here and these call the private methods defined below: -public: - Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *object_name = (const char *)NULL); - // constructor - - ~Marshal_DSI_Impl (void); - // destructor - - virtual void invoke (CORBA_ServerRequest & req, CORBA_Environment &env); - // This method is a must, but of no use - - // skeletons that do the upcall - static void _Marshal_is_a_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_short_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_long_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_octet_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_char_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_double_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_struct_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_union_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_any_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _Marshal_test_sequence_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); -private: - void test_short (CORBA_Short s1, - CORBA_Short& s2, - CORBA_Environment &env); - // test short - - void test_long (CORBA_Long l1, - CORBA_Long& l2, - CORBA_Environment &env); - // test long - - void test_octet (CORBA_Octet o1, - CORBA_Octet& o2, - CORBA_Environment &env); - // test octet - - void test_char (CORBA_Char c1, - CORBA_Char& c2, - CORBA_Environment &env); - // test char - - void test_double (CORBA_Double d1, - CORBA_Double& d2, - CORBA_Environment &env); - // test double - - void test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA_Environment &env); - // test struct - - void test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA_Environment &env); - // test union - - void test_any (const CORBA_Any& a1, - CORBA_Any *& a2, - CORBA_Environment &env); - // test any - - void test_sequence (const Marshal::AnySeq& a1, - Marshal::AnySeq *& a2, - CORBA_Environment &env); - // test sequence - -#if 0 - void test_recursive (const Marshal::Marshal_Recursive& mr1, - Marshal::Marshal_Recursive *& mr2, - CORBA_Environment &env); - // test struct -#endif - - // we need the orb to create argument lists (NVList) for us - CORBA_ORB_ptr orb_; // not owned by us -}; - -#if defined (__ACE_INLINE__) -#include "tao_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -#endif // defined (TAO_MARSHAL_IMPL_H) diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i deleted file mode 100644 index a730daf8106..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - -// constructor -ACE_INLINE -Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name) - : _skel_Marshal (obj_name) -{ -} - -// destructor -ACE_INLINE -Marshal_SSI_Impl::~Marshal_SSI_Impl (void) -{ -} - -// destructor -ACE_INLINE -Marshal_DSI_Impl::~Marshal_DSI_Impl (void) -{ - orb_ = 0;//CORBA::ORB::_nil (); -} - - diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp deleted file mode 100644 index 9966b292e7f..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp +++ /dev/null @@ -1,114 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Tao marshal benchmark -// -// = FILENAME -// tao_marshal_server.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#include "tao_marshal_server.h" -#include <iostream.h> -#include <fstream.h> - -#if !defined (__ACE_INLINE__) -#include "tao_marshal_server.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(TAO, tao_marshal_server, "$Id$") - -int -Tao_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - char **argv; - int argc; - CORBA_Environment env; - CORBA_String str; // for the IOR string - fstream iorfile; // persistent storage for IOR - - // get the argument list to be passed on to the ORB_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->orb_ = CORBA_ORB_init (argc, (char *const *)argv, "IOR", env); - if (this->orb_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } - - // get the argument list to be passed on to the BOA_init method - argv = options.boa_init_args (argc); - - char *foo [] = {"-OAhost","mambo"}; argc = 2; - // get the orb. Pass any ORB_init arguments - this->boa_ = this->orb_->BOA_init (argc, foo, "ROA");//(argc, (char *const *)argv); - if (this->boa_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } - - // tell the "results" object what file it must store the results into - results.filename (options.filename ()); - - // use SII or DII accordingly - switch (options.policy ()) - { - case CORBA_Marshal_Options::STATIC : // use SSI - this->ssi_ = new Marshal_SSI_Impl (options.object_name ()); - // register with the BOA - // this->boa_->obj_is_ready (this->ssi_); - - // get a stringified representation of the object reference created above - str = this->orb_->object_to_string (this->dsi_, env); - if (env.exception() != 0) - { - // print_exception (env.exception(), "object_to_string", stdout); - return 1; - } - - // save the IOR in persistent storage so that clients can read this and obtain - // object references. We need to do this since we do not yet have some kind - // of a naming service that will allow clients to "bind" to desired objects - iorfile.open ("./ior.txt", ios::out); - iorfile << ((char *)str) << endl; - iorfile.close (); - break; - case CORBA_Marshal_Options::DYNAMIC : // use DSI - this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ())); - // register with the BOA - // this->boa_->obj_is_ready (this->dsi_); - - // get a stringified representation of the object reference created above - str = this->orb_->object_to_string (this->dsi_, env); - if (env.exception() != 0) - { - ACE_DEBUG ((LM_ERROR, "cannot get IOR from DSI object" )); - // print_exception (env.exception(), "object_to_string", stdout); - return 1; - } - - // save the IOR in persistent storage so that clients can read this and obtain - // object references. We need to do this since we do not yet have some kind - // of a naming service that will allow clients to "bind" to desired objects - iorfile.open ("./ior.txt", ios::out); - iorfile << ((char *)str) << endl; - iorfile.close (); - break; - default: - ACE_DEBUG ((LM_DEBUG, "bad policy\n")); - return -1; - } - - ACE_Reactor::run_event_loop (); // should be replaced by impl_is_ready - return 0; -} - diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h deleted file mode 100644 index 10442253e06..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Marshal Tao Benchmark -// -// = FILENAME -// tao_marshal_server.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _TAO_MARSHAL_SERVER_H_ -#define _TAO_MARSHAL_SERVER_H_ - -// benchmark library includes -#include "benchmark/marshal_options.h" -#include "benchmark/marshal_results.h" -#include "benchmark/marshal_proxy.h" - -// implementation classes -#include "tao_marshal_impl.h" - -// include Tao specific include files -#include "marshalS.h" // generated by IDL compiler - -class Tao_Marshal_Server_Proxy : public CORBA_Marshal_Proxy -{ -public: - Tao_Marshal_Server_Proxy (void); - // constructor - - ~Tao_Marshal_Server_Proxy (void); - // destructor - - virtual int run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // do the actual work -private: - CORBA_ORB_ptr orb_; - // underlying orb; - - CORBA_BOA_ptr boa_; - // underlying boa; - - Marshal_SSI_Impl *ssi_; - Marshal_DSI_Impl *dsi_; - // the implementation (SSI or DSI) -}; - - -#if defined (__ACE_INLINE__) -#include "tao_marshal_server.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i deleted file mode 100644 index 446b96cf468..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -// constructor -ACE_INLINE -Tao_Marshal_Server_Proxy::Tao_Marshal_Server_Proxy (void) - : orb_ (0), - boa_ (0), - ssi_ (0), - dsi_ (0) -{ -} - -// destructor -ACE_INLINE -Tao_Marshal_Server_Proxy::~Tao_Marshal_Server_Proxy (void) -{ - // releasing order is important - - // release the impl - delete ssi_; - delete dsi_; - - // release the BOA - CORBA_release (boa_); - - // release the ORB - CORBA_release (orb_); -} diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile deleted file mode 100644 index 83e60fa86cf..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the VisiBroker Marshal Benchmark -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lACE -lbenchmark -lorb - -PROG_SRCS = marshalC.cpp marshalS.cpp visi_marshal_client.cpp visi_marshal_server.cpp \ - visi_marshal_impl.cpp client.cpp server.cpp - -LSRC = $(PROG_SRCS) - -MARSHAL_CLIENT_OBJS = marshalC.o visi_marshal_client.o client.o - -MARSHAL_SERVER_OBJS = marshalC.o marshalS.o visi_marshal_impl.o visi_marshal_server.o server.o - -BIN = client server - -ifndef TAO_ROOT - TAO_ROOT = $(ACE_ROOT)/TAO -endif - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(TAO_ROOT)/rules.tao.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 -# include VisiBroker specific file -include /project/mambo/gokhale/CONFIG/orbeline_defaults.mk - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -D_PMC_INCLUDE_DSI - -server: $(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -client: $(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -marshalC.h marshalS.h marshalC.cpp marshalS.cpp: marshal.idl - $(IDL) $(IDLFLAGS) $< - -clean: - $(RM) core *.o *~ client server *C.cpp *S.cpp *S.h *C.h - $(MAKE) realclean diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp deleted file mode 100644 index fca289e19e4..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "visi_marshal_client.h" - -ACE_RCSID(VisiBroker, client, "$Id$") - -int main (int argc, char *argv []) -{ - // instantiate a DRIVER with the Visi_Client_Proxy as the template - CORBA_Benchmark_Driver<Visi_Marshal_Client_Proxy> driver (new - Visi_Marshal_Client_Proxy ()); - - // let the driver do everything for us so that we remain very simple - return driver.run (argc, argv); -} diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl b/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl deleted file mode 100644 index 077a98e58fd..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl +++ /dev/null @@ -1,91 +0,0 @@ -// $Id$ - -// Interface for the marshal benchmark - -interface Marshal -{ - struct Marshal_Struct - { - short s; - long l; - char c; - octet o; - double d; - }; - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th}; - - union Marshal_Union - switch (discrim) - { - case e_0th: - short s; - case e_1st: - long l; - case e_2nd: - char c; - case e_3rd: - octet o; - case e_4th: - double d; - case e_5th: - default: // this will test typecode indirection - Marshal_Struct ms; - }; - - /* - typedef sequence<short> ShortSeq; - typedef sequence<long> LongSeq; - typedef sequence<octet> OctetSeq; - typedef sequence<char> CharSeq; - typedef sequence<double> DoubleSeq; - typedef sequence<Marshal_Struct> StructSeq; - typedef sequence<Marshal_Union> UnionSeq; - */ - // for testing sequences of Any - typedef sequence<any> AnySeq; - - // testing recursive behavior - // complex. - struct Marshal_Recursive - { - // we use this to test the limited recursion allowed by IDL. This is an - // ideal test for indirected typecodes. - - // simulate a behavior of a list node - any value; - sequence <Marshal_Recursive> next; - }; - - void test_short (in short s1, out short s2); // test a short - void test_long (in long l1, out long l2); // test a long - void test_octet (in octet o1, out octet o2); // test an octet - void test_char (in char c1, out char c2); // test a char - void test_double (in double d1, out double d2); // test a double - void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a - // struct - void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a - // union. - void test_any (in any a1, out any a2); // test an Any - /* - void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in - CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in - UnionSeq us1, in AnySeq as1, - out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out - CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out - UnionSeq us2, out AnySeq as2); - */ - void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a - // 3 level indirection - - // sequence, any, and its - // value type - void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); // - // very complicated -}; - - - - - - - diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/run_client b/TAO/Benchmark/Marshal_Test/VisiBroker/run_client deleted file mode 100755 index 2a35700495f..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/run_client +++ /dev/null @@ -1,23 +0,0 @@ -echo "********* Static Invocation Interface **********" -client -i 1 -h mambo -R s -P S -o marshal -T s -client -i 1 -h mambo -R s -P S -o marshal -T l -client -i 1 -h mambo -R s -P S -o marshal -T o -client -i 1 -h mambo -R s -P S -o marshal -T c -client -i 1 -h mambo -R s -P S -o marshal -T d -client -i 1 -h mambo -R s -P S -o marshal -T S -client -i 1 -h mambo -R s -P S -o marshal -T U -client -i 1 -h mambo -R s -P S -o marshal -T A -client -i 1 -h mambo -R s -P S -o marshal -T Q -#client -i 1 -h mambo -R s -P S -o marshal -T R -# -echo "********* Dynamic Invocation Interface **********" -client -i 1 -h mambo -R s -P D -o marshal -T s -client -i 1 -h mambo -R s -P D -o marshal -T l -client -i 1 -h mambo -R s -P D -o marshal -T o -client -i 1 -h mambo -R s -P D -o marshal -T c -client -i 1 -h mambo -R s -P D -o marshal -T d -client -i 1 -h mambo -R s -P D -o marshal -T S -client -i 1 -h mambo -R s -P D -o marshal -T U -client -i 1 -h mambo -R s -P D -o marshal -T A -client -i 1 -h mambo -R s -P D -o marshal -T Q - diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/run_server b/TAO/Benchmark/Marshal_Test/VisiBroker/run_server deleted file mode 100755 index c5ff4cdc2f0..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/run_server +++ /dev/null @@ -1 +0,0 @@ -server -R r -P S -I V -o marshal
\ No newline at end of file diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp deleted file mode 100644 index edb0dd286ff..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "visi_marshal_server.h" - -ACE_RCSID(VisiBroker, server, "$Id$") - -int main (int argc, char *argv []) -{ - // instantiate a DRIVER with the Visi_Client_Proxy as the template - CORBA_Benchmark_Driver<Visi_Marshal_Server_Proxy> driver (new - Visi_Marshal_Server_Proxy ()); - - // let the driver do everything for us so that we remain very simple - return driver.run (argc, argv); -} diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp deleted file mode 100644 index a7719ad647a..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp +++ /dev/null @@ -1,1348 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Visibroker marshal benchmark -// -// = FILENAME -// visi_marshal_proxy.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#include "visi_marshal_client.h" - -#if !defined (__ACE_INLINE__) -#include "visi_marshal_client.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(VisiBroker, visi_marshal_client, "$Id$") - -int -Visi_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - char **argv; - int argc; - CORBA::Object_ptr target; - - // get the argument list to be passed on to the ORB_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->orb_ = CORBA::ORB_init (argc, (char *const *)argv); - if (this->orb_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } - - // get the obj ref by binding it to the specified host using the specified obj_name - target = Marshal::_bind (options.object_name (), options.hostname ()); - if (CORBA::is_nil (target)) - { - ACE_DEBUG ((LM_DEBUG, "bind call failed\n")); - return -1; - } - - this->ref_ = Marshal::_narrow (target); - if (CORBA::is_nil (this->ref_)) - { - ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n")); - return -1; - } - - // tell the "results" object what file it must store the results into - results.filename (options.filename ()); - - // use SII or DII accordingly - switch (options.policy ()) - { - case CORBA_Marshal_Options::STATIC : // use SII - return this->use_sii (options, results); - break; - case CORBA_Marshal_Options::DYNAMIC : // use DII - return this->use_dii (options, results); - break; - default: - ACE_DEBUG ((LM_DEBUG, "bad policy\n")); - return -1; - } - // hopefully we are never here, else something is seriously wrong - return -1; -} - -int -Visi_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - int i; - int status = 0; - // This method tests the static invocation interface - - for (i=0; i < options.iterations () && !status; i++) - { - switch (options.data_type ()) - { - // shorts - case CORBA_Marshal_Options::SHORT: - status = sii_test_short (options, results); - break; - // longs - case CORBA_Marshal_Options::LONG: - status = sii_test_long (options, results); - break; - // octets - case CORBA_Marshal_Options::OCTET: - status = sii_test_octet (options, results); - break; - // chars - case CORBA_Marshal_Options::CHAR: - status = sii_test_char (options, results); - break; - // doubles - case CORBA_Marshal_Options::DOUBLE: - status = sii_test_double (options, results); - break; - // Structs - case CORBA_Marshal_Options::STRUCT: - status = sii_test_struct (options, results); - break; - // unions - case CORBA_Marshal_Options::UNION: - status = sii_test_union (options, results); - break; - // anys - case CORBA_Marshal_Options::ANY: - status = sii_test_any (options, results); - break; - // sequences - case CORBA_Marshal_Options::SEQUENCE: - status = sii_test_sequence (options, results); - break; - // longs - case CORBA_Marshal_Options::RECURSIVE: - // status = sii_test_recursive (options, results); - // doesn't work - break; - default: - status = -1; - } // end of switch - } // for loop - - if (!status) - return 0; - else - return -1; -} - -int -Visi_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - int i; - int status = 0; - // This method tests the dynamic invocation interface - - for (i=0; i < options.iterations () && !status; i++) - { - switch (options.data_type ()) - { - // shorts - case CORBA_Marshal_Options::SHORT: - status = dii_test_short (options, results); - break; - // longs - case CORBA_Marshal_Options::LONG: - status = dii_test_long (options, results); - break; - // octets - case CORBA_Marshal_Options::OCTET: - status = dii_test_octet (options, results); - break; - // chars - case CORBA_Marshal_Options::CHAR: - status = dii_test_char (options, results); - break; - // doubles - case CORBA_Marshal_Options::DOUBLE: - status = dii_test_double (options, results); - break; - // Structs - case CORBA_Marshal_Options::STRUCT: - status = dii_test_struct (options, results); - break; - // unions - case CORBA_Marshal_Options::UNION: - status = dii_test_union (options, results); - break; - // anys - case CORBA_Marshal_Options::ANY: - status = dii_test_any (options, results); - break; - // sequences - case CORBA_Marshal_Options::SEQUENCE: - status = dii_test_sequence (options, results); - break; - // longs - case CORBA_Marshal_Options::RECURSIVE: - // status = dii_test_recursive (options, results); - // doesn't work - break; - default: - status = -1; - } // end of switch - } // for loop - - if (!status) - return 0; - else - return -1; -} - - -// all helper functions : SII -int -Visi_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - CORBA::Short s1, s2; - s1 = 3; - ref_->test_short (s1, s2); - if (s1 == s2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2)); - return -1; - } -} - -int -Visi_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - CORBA::Long l1, l2; - l1 = 256; - ref_->test_long (l1, l2); - if (l1 == l2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2)); - return -1; - } -} - -int -Visi_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // octets -{ - CORBA::Octet o1, o2; - o1 = (CORBA::Octet) 127; - ref_->test_octet (o1, o2); - if (o1 == o2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2)); - return -1; - } -} - -int -Visi_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // chars -{ - CORBA::Char c1, c2; - c1 = 'B'; - ref_->test_char (c1, c2); - if (c1 == c2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2)); - return -1; - } -} - -int -Visi_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // doubles -{ - CORBA::Double d1, d2; - d1 = 3.1415; - ref_->test_double (d1, d2); - if (d1 == d2) - { - ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2)); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2)); - return -1; - } -} - -int -Visi_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // structs -{ - Marshal::Marshal_Struct ms1, ms2; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - ref_->test_struct (ms1, ms2); - if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o && - ms1.d == ms2.d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n")); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n")); - return -1; - } -} - -int -Visi_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // unions -{ - Marshal::Marshal_Union u1, u2; - Marshal::Marshal_Struct ms1, ms2; - - - // first test an enumerated case - u1._d (Marshal::e_1st); - u1.l (4567); - - ref_->test_union (u1, u2); - if ( (u1._d () == u2._d()) && (u1.l () == u2.l ())) - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n")); - return -1; - } - - // now test the default case - u1._d (Marshal::e_6th); // this case doesn't exist which will lead to using - // the default case - - u1.ms ().s = 3; - u1.ms ().l = 256; - u1.ms ().c = 'B'; - u1.ms ().o = (CORBA::Octet) 127; - u1.ms ().d = 3.1415; - - ref_->test_union (u1, u2); - - if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o && - u1.ms ().d == u2.ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n")); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n")); - return -1; - } -} - -int -Visi_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we send a struct thru the any - CORBA::Any a1, *a2; - Marshal::Marshal_Struct ms1, *ms2; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - // populate the any with a MarshalStruct - a1 <<= ms1; - - a2 = new CORBA::Any; - - // now test it - ref_->test_any (a1, a2); - - // check if the two typecodes are equal - if (a2->type ()->equal (Marshal::_tc_Marshal_Struct)) - { - // now see if the values are same - ms2 = (Marshal::Marshal_Struct *)a2->value (); - if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o && - ms1.d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "SII test_any success\n")); - return 0; - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n")); - return -1; - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n")); - } - return 0; -} - -int -Visi_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // make a sequence of Anys and fill each one with a different data type - Marshal::AnySeq as1 (7), *as2; - Marshal::Marshal_Struct ms; - Marshal::Marshal_Union u; - - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA::Octet) 127; - ms.d = 3.1415; - - u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to - // work here - u.ms ().s = 3; - u.ms ().l = 256; - u.ms ().c = 'B'; - u.ms ().o = (CORBA::Octet) 127; - u.ms ().d = 3.1415; - - // it looks like we must tell the sequence how many elements it is going to - // carry. By just fixing the max value does not work. - - as1.length (7); - - as1[0] <<= (CORBA::Short)3; - as1[1] <<= (CORBA::Long) 256; - as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127); - as1[3] <<= CORBA::Any::from_char ('B'); - as1[4] <<= (CORBA::Double)3.1415; // double - as1[5] <<= ms; // struct - as1[6] <<= u; // union - - as2 = new Marshal::AnySeq; - - ref_->test_sequence (as1, as2); - -#if 0 - // the following is extremely weird. I do not understand why it is not the - // same as _tc_Marshal_Union, but its _kind field does have _tk_union in it. - if ((*as2)[6].type ()->equal (Marshal::_tc_Marshal_Union)) - { - cerr << "6th elem has union typecode" << endl; - } - else - { - cerr << "6th elem doesnot have union typecode" << endl; - cerr << "its typecode kind = " << (*as2)[6].type ()->kind () << endl; - } -#endif - - ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n")); - if (as1.length () == as2->length ()) - { - // now make sure that the elements are same - for (int i=0; i < as1.length (); i++) - { -#if 0 - if (as1[i].type ()->equal ((*as2)[i].type ())) - { -#endif - // now see if the values are same - switch (i) - { - case 0: - if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n")); - } - break; - case 1: - if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n")); - } - break; - case 2: - if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n")); - } - break; - case 3: - if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n")); - } - break; - case 4: - if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n")); - } - break; - case 5: - { - Marshal::Marshal_Struct *ms1, *ms2; - - ms1 = (Marshal::Marshal_Struct *)as1[i].value (); - ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value (); - - if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o && - ms1->d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n")); - } - } - break; - case 6: - { - Marshal::Marshal_Union *u1, *u2; - - u1 = (Marshal::Marshal_Union *)as1[i].value (); - u2 = (Marshal::Marshal_Union *)(*as2)[i].value (); - - if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s && - u1->ms ().l == u2->ms ().l && - u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o && - u1->ms ().d == u2->ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n")); - } - } - break; - } -#if 0 - } - else - { - ACE_DEBUG ((LM_DEBUG, - "SII test_sequence: typecode mismatch for element %d\n", i)); - break; - } -#endif - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n", - as2->length ())); - } - return 0; -} - -int -Visi_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we will try a simple one here - Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2; - - mr1.value <<= (CORBA::Long)1; - mr1.next.length (1); // sequence of length 1 - - // fill the element - elem1 = &mr1.next[0]; - elem1->value <<= CORBA::Any::from_char ('D'); - elem1->next.length (0); // end of seq - - mr2 = new Marshal::Marshal_Recursive; - - try { - ref_->test_recursive (mr1, mr2); - } - catch (CORBA::SystemException &se){ - cerr << "error invoking request: " << se << endl; - } - - elem2 = &mr2->next[0]; - - if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ()) - && (mr1.next.length () == mr2->next.length ()) // same length sequence - && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ()) - && (elem1->next.length () == elem2->next.length ())) - { - ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n")); - } - - return 0; -} - -// ------------------------------------------------------- -// all helper functions : DII -// ------------------------------------------------------- - -int -Visi_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Short s1, s2; - - s1 = 3; - s2 = 0; - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add (CORBA::ARG_IN)->value ()) <<= s1; - // this usage is also correct. All we care is to supply a storage area for - // the OUT parameter - // arglist->add (CORBA::ARG_OUT)->value ()->replace (CORBA::_tc_short, &s2); - *(arglist->add (CORBA::ARG_OUT)->value ()) <<= s2; - orb_->create_list(1, result_list); // 1 result - result = result_list->item (0); - - // create a request - ref_->_create_request(ctx, - "test_short", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= s2; - - if (s1 == s2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Long l1, l2; - - l1 = 256; - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= l1; - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_long, &l2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_long", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= l2; - - if (l1 == l2) - { - ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // octets -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Octet o1, o2; - - o1 = (CORBA::Octet) 127; - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_octet (o1); - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_octet, &o2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_octet", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= CORBA::Any::to_octet (o2); - - if (o1 == o2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // chars -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Char c1, c2; - - c1 = 'B'; - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_char (c1); - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_char, &c2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_char", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= CORBA::Any::to_char (c2); - - if (c1 == c2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // doubles -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - CORBA::Double d1, d2; - - d1 = 3.1415; - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= d1; - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_double, &d2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_double", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= d2; - - if (d1 == d2) - { - ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2)); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // structs -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - Marshal::Marshal_Struct ms1, ms2; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= ms1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, &ms2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_struct", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= ms2; - - if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o && - ms1.d == ms2.d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n")); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) - // unions -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - Marshal::Marshal_Union u1, u2; - Marshal::Marshal_Struct ms1, ms2; - - - // first test an enumerated case - u1._d (Marshal::e_1st); - u1.l (4567); - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= u1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_union", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= u2; - - if ( (u1._d () == u2._d()) && (u1.l () == u2.l ())) - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n")); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - - // now test the default case - u1._d (Marshal::e_5th); // e_6th doesn't work - - u1.ms ().s = 3; - u1.ms ().l = 256; - u1.ms ().c = 'B'; - u1.ms ().o = (CORBA::Octet) 127; - u1.ms ().d = 3.1415; - - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= u1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_union", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= u2; - - if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o && - u1.ms ().d == u2.ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n")); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - // we send a struct thru the any - CORBA::Any a1, *a2; - Marshal::Marshal_Struct ms1, *ms2; - - ms1.s = 3; - ms1.l = 256; - ms1.c = 'B'; - ms1.o = (CORBA::Octet) 127; - ms1.d = 3.1415; - - // populate the any with a MarshalStruct - a1 <<= ms1; - - a2 = new CORBA::Any; - - // now test it - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= a1; - arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_any, a2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_any", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= (*a2); - - // check if the two typecodes are equal - if (a2->type ()->equal (Marshal::_tc_Marshal_Struct)) - { - // now see if the values are same - ms2 = (Marshal::Marshal_Struct *)a2->value (); - if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o && - ms1.d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "DII test_any success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n")); - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n")); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // DII variables - CORBA::Request_ptr request = CORBA::Request::_nil(); // DII request - CORBA::NVList_ptr arglist = CORBA::NVList::_nil(); // argument list - CORBA::Context_ptr ctx = CORBA::Context::_nil(); // context - CORBA::NVList_ptr result_list = CORBA::NVList::_nil(); // result list - CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result - // make a sequence of Anys and fill each one with a different data type - Marshal::AnySeq as1 (7), *as2; - Marshal::Marshal_Struct ms; - Marshal::Marshal_Union u; - - ms.s = 3; - ms.l = 256; - ms.c = 'B'; - ms.o = (CORBA::Octet) 127; - ms.d = 3.1415; - - u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to - // work here - u.ms ().s = 3; - u.ms ().l = 256; - u.ms ().c = 'B'; - u.ms ().o = (CORBA::Octet) 127; - u.ms ().d = 3.1415; - - // it looks like we must tell the sequence how many elements it is going to - // carry. By just fixing the max value does not work. - - as1.length (7); - - as1[0] <<= (CORBA::Short)3; - as1[1] <<= (CORBA::Long) 256; - as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127); - as1[3] <<= CORBA::Any::from_char ('B'); - as1[4] <<= (CORBA::Double)3.1415; // double - as1[5] <<= ms; // struct - as1[6] <<= u; // union - - as2 = new Marshal::AnySeq; - - orb_->create_list(0, arglist); // 2 arguments to be added - *(arglist->add(CORBA::ARG_IN)->value()) <<= as1; - arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2); - orb_->create_list(1, result_list); // 1 result - result = result_list->item(0); - - // create a request - ref_->_create_request(ctx, - "test_sequence", - arglist, - result, - request, - 0); - - request->invoke (); // 2 way - *(arglist->item(1)->value()) >>= (*as2); - -#if 0 - // the following is extremely weird. I do not understand why it is not the - // same as _tc_Marshal_Union, but its _kind field does have _tk_union in it. - if ((*as2)[6].type ()->equal (Marshal::_tc_Marshal_Union)) - { - cerr << "6th elem has union typecode" << endl; - } - else - { - cerr << "6th elem doesnot have union typecode" << endl; - cerr << "its typecode kind = " << (*as2)[6].type ()->kind () << endl; - } -#endif - - ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n")); - if (as1.length () == as2->length ()) - { - // now make sure that the elements are same - for (int i=0; i < as1.length (); i++) - { -#if 0 - if (as1[i].type ()->equal ((*as2)[i].type ())) - { -#endif - // now see if the values are same - switch (i) - { - case 0: - if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n")); - } - break; - case 1: - if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n")); - } - break; - case 2: - if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n")); - } - break; - case 3: - if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n")); - } - break; - case 4: - if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double - *)(*as2)[i].value ()) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n")); - } - break; - case 5: - { - Marshal::Marshal_Struct *ms1, *ms2; - - ms1 = (Marshal::Marshal_Struct *)as1[i].value (); - ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value (); - - if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o && - ms1->d == ms2->d) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n")); - } - } - break; - case 6: - { - Marshal::Marshal_Union *u1, *u2; - - u1 = (Marshal::Marshal_Union *)as1[i].value (); - u2 = (Marshal::Marshal_Union *)(*as2)[i].value (); - - if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s && - u1->ms ().l == u2->ms ().l && - u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o && - u1->ms ().d == u2->ms ().d) - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n")); - } - } - break; - } -#if 0 - } - else - { - ACE_DEBUG ((LM_DEBUG, - "DII test_sequence: typecode mismatch for element %d\n", i)); - break; - } -#endif - } - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n", - as2->length ())); - } - CORBA::release (request); - CORBA::release (arglist); - CORBA::release (result); - CORBA::release (result_list); - return 0; -} - -int -Visi_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - // we will try a simple one here - Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2; - - mr1.value <<= (CORBA::Long)1; - mr1.next.length (1); // sequence of length 1 - - // fill the element - elem1 = &mr1.next[0]; - elem1->value <<= CORBA::Any::from_char ('D'); - elem1->next.length (0); // end of seq - - mr2 = new Marshal::Marshal_Recursive; - - try { - ref_->test_recursive (mr1, mr2); - } - catch (CORBA::SystemException &se){ - cerr << "error invoking request: " << se << endl; - } - - elem2 = &mr2->next[0]; - - if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ()) - && (mr1.next.length () == mr2->next.length ()) // same length sequence - && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ()) - && (elem1->next.length () == elem2->next.length ())) - { - ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n")); - } - - return 0; -} - diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h deleted file mode 100644 index 30e14db39a6..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h +++ /dev/null @@ -1,142 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Marshal Visibroker Benchmark -// -// = FILENAME -// visi_marshal_client.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _VISI_MARSHAL_CLIENT_H_ -#define _VISI_MARSHAL_CLIENT_H_ - -// benchmark library includes -#include "benchmark/marshal_options.h" -#include "benchmark/marshal_results.h" -#include "benchmark/marshal_proxy.h" - -// include VisiBroker specific include files -#include "marshalC.h" // generated by IDL compiler -#include "pmcext.h" // VisiBroker extensions - -#if 0 -// Define an event handler specific to this class -class marshal_event_handler: public PMC_EXT::ClientEventHandler -{ - // =TITLE - // marshal_event_handler - // =DESCRIPTION - // event handler. Specifically, we use this to set socket buffer and no delay - // flags -public: - void bind_succeeded(CORBA::Object_ptr obj, - const PMC_EXT::ConnectionInfo &); - // on success from a bind call, set the desired quantities -}; -#endif - -class Visi_Marshal_Client_Proxy : public CORBA_Marshal_Proxy -{ - // =TITLE - // Visi_Marshal_Client_Proxy - // =DESCRIPTION - // VisiBroker client size specialization of the CORBA Marshal proxy class -public: - Visi_Marshal_Client_Proxy (void); - // constructor - - ~Visi_Marshal_Client_Proxy (void); - // destructor - - virtual int run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // do the actual work - - virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // use the static invocation interface - - virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // use the dynamic invocation interface -private: - // =helper functions - int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - // all the DII helpers - int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - - CORBA::ORB_ptr orb_; - // handle to the underlying orb - - Marshal_ptr ref_; - // the object reference -}; - -#if defined (__ACE_INLINE__) -#include "visi_marshal_client.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i deleted file mode 100644 index 30c73abb503..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - - -ACE_INLINE -Visi_Marshal_Client_Proxy::Visi_Marshal_Client_Proxy (void) - : orb_ (CORBA_ORB::_nil ()), - ref_ (0) -{ -} - -ACE_INLINE -Visi_Marshal_Client_Proxy::~Visi_Marshal_Client_Proxy (void) -{ - // releasing order is important - - // release the reference - CORBA::release (ref_); - - // release the ORB - CORBA::release (orb_); -} - - diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp deleted file mode 100644 index d9425e9c4b3..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp +++ /dev/null @@ -1,333 +0,0 @@ -// $Id$ - -#include "visi_marshal_impl.h" - -#if !defined (__ACE_INLINE__) -#include "visi_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(VisiBroker, visi_marshal_impl, "$Id$") - -// All the methods of the SSI class -void -Marshal_SSI_Impl::test_short (CORBA::Short s1, - CORBA::Short &s2) -{ - s2 = s1; -} - -void -Marshal_SSI_Impl::test_long (CORBA::Long l1, - CORBA::Long &l2) -{ - l2 = l1; -} - -void -Marshal_SSI_Impl::test_octet (CORBA::Octet o1, - CORBA::Octet &o2) -{ - o2 = o1; -} - -void -Marshal_SSI_Impl::test_char (CORBA::Char c1, - CORBA::Char &c2) -{ - c2 = c1; -} - -void -Marshal_SSI_Impl::test_double (CORBA::Double d1, - CORBA::Double &d2) -{ - d2 = d1; -} - -void -Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2) -{ - ms2.s = ms1.s; - ms2.l = ms1.l; - ms2.c = ms1.c; - ms2.o = ms1.o; - ms2.d = ms1.d; -} - -void -Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2) -{ - u2._d (u1._d ()); // set the discriminant value - - switch (u1._d ()) - { - case Marshal::e_0th: - u2.s (u1.s ()); // set short - break; - case Marshal::e_1st: - u2.l (u1.l ()); // set long - break; - case Marshal::e_2nd: - u2.c (u1.c ()); // set char - break; - case Marshal::e_3rd: - u2.o (u1.o ()); // set octet - break; - case Marshal::e_4th: - u2.d (u1.d ()); // set double - break; - case Marshal::e_5th: - default: - u2.ms (u1. ms ()); // set structs - break; - } -} - -void -Marshal_SSI_Impl::test_any (const CORBA::Any &a1, - CORBA::Any *&a2) -{ - a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy -} - -void -Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2) -{ - as2 = new Marshal::AnySeq (as1); -} - -void -Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1, - Marshal::Marshal_Recursive *&mr2) -{ -} - -//---------------------------------------------------------------------------- -//the methods of the DSI implementation class - -void -Marshal_DSI_Impl::invoke (CORBA::ServerRequest_ptr req) -{ - // parse the incoming request and find out for what operation it is. We use a - // simple linear search here - if (!ACE_OS::strcmp (req->op_name (), "test_short")) - { - test_short_skel (req); - } - else if (!ACE_OS::strcmp (req->op_name (), "test_long")) - { - } - else if (!ACE_OS::strcmp (req->op_name (), "test_octet")) - { - } - else if (!ACE_OS::strcmp (req->op_name (), "test_char")) - { - } - else if (!ACE_OS::strcmp (req->op_name (), "test_double")) - { - } - else if (!ACE_OS::strcmp (req->op_name (), "test_struct")) - { - } - else if (!ACE_OS::strcmp (req->op_name (), "test_union")) - { - } - else if (!ACE_OS::strcmp (req->op_name (), "test_any")) - { - } - else if (!ACE_OS::strcmp (req->op_name (), "test_sequence")) - { - } -} - -void -Marshal_DSI_Impl::test_short (CORBA::Short s1, - CORBA::Short &s2) -{ - s2 = 5*s1; -} - -void -Marshal_DSI_Impl::test_long (CORBA::Long l1, - CORBA::Long &l2) -{ - l2 = l1; -} - -void -Marshal_DSI_Impl::test_octet (CORBA::Octet o1, - CORBA::Octet &o2) -{ - o2 = o1; -} - -void -Marshal_DSI_Impl::test_char (CORBA::Char c1, - CORBA::Char &c2) -{ - c2 = c1; -} - -void -Marshal_DSI_Impl::test_double (CORBA::Double d1, - CORBA::Double &d2) -{ - d2 = d1; -} - -void -Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2) -{ - ms2.s = ms1.s; - ms2.l = ms1.l; - ms2.c = ms1.c; - ms2.o = ms1.o; - ms2.d = ms1.d; -} - -void -Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2) -{ - u2._d (u1._d ()); // set the discriminant value - - switch (u1._d ()) - { - case Marshal::e_0th: - u2.s (u1.s ()); // set short - break; - case Marshal::e_1st: - u2.l (u1.l ()); // set long - break; - case Marshal::e_2nd: - u2.c (u1.c ()); // set char - break; - case Marshal::e_3rd: - u2.o (u1.o ()); // set octet - break; - case Marshal::e_4th: - u2.d (u1.d ()); // set double - break; - case Marshal::e_5th: - default: - u2.ms (u1. ms ()); // set structs - break; - } -} - -void -Marshal_DSI_Impl::test_any (const CORBA::Any &a1, - CORBA::Any *&a2) -{ - a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy -} - -void -Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2) -{ - as2 = new Marshal::AnySeq (as1); -} - -void -Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1, - Marshal::Marshal_Recursive *&mr2) -{ -} - -// all the helper functions for the DSI class -void -Marshal_DSI_Impl::test_short_skel (CORBA::ServerRequest_ptr req) -{ - CORBA::NVList_var short_nv_; - CORBA::Any *any_s1, *any_s2; - CORBA::Short s1=0, - *s2=0; - - orb_->create_list (0, short_nv_); - - ACE_DEBUG ((LM_DEBUG, "short_nv_ created with %d nodes\n", short_nv_->count ())); - - any_s1 = new CORBA::Any (CORBA::_tc_short, &s1, 0); - s2 = new CORBA::Short; - any_s2 = new CORBA::Any (CORBA::_tc_short, s2, 1); - - short_nv_->add_value ("s1", *any_s1, CORBA::ARG_IN); - // if I do the next line, I get CORBA::Marshal exception from - // req->params. I don't know why - short_nv_->add_value ("s2", *any_s2, CORBA::ARG_OUT); - // However, the following line works. I think I know what is the - // problem. Since the 2nd argument is a ARG_OUT, we cannot add_value. We must - // just tell it what type to expect and leave it to the ORB to allocate the - // memory - //short_nv_->add_item ("s2", CORBA::ARG_OUT); - // My explanation is confirmed if I use the following in which case I get a - // marshaling exception. Thus, for OUT args, only add_item works. - // *(short_nv_->add (CORBA::ARG_OUT)->value ()) <<= s2; - - ACE_DEBUG ((LM_DEBUG, "short_nv_ created with %d nodes\n", short_nv_->count ())); - - try { - req->params (short_nv_); - } - catch (CORBA::SystemException &se) - { - cerr << "System Exception doing params: " << se << endl; - } - cout << "after params" << endl; - *(short_nv_->item (0)->value ()) >>= s1; - ACE_DEBUG ((LM_DEBUG, "s1 = %d\n", s1)); - test_short (s1, *s2); - // *(short_nv_->item (1)->value ()) <<= s2; - ACE_DEBUG ((LM_DEBUG, "s1 = %d, s2 = %d\n", s1, *s2)); - ACE_DEBUG ((LM_DEBUG, "short_nv_ after the call has %d nodes\n", short_nv_->count ())); -} - -void -Marshal_DSI_Impl::test_long_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_octet_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_char_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_double_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_struct_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_union_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_any_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_sequence_skel (CORBA::ServerRequest_ptr req) -{ -} - -void -Marshal_DSI_Impl::test_recursive_skel (CORBA::ServerRequest_ptr req) -{ -} diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h deleted file mode 100644 index 6599c5ae276..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h +++ /dev/null @@ -1,183 +0,0 @@ -// $Id$ - -#ifndef VISI_MARSHAL_IMPL_H -#define VISI_MARSHAL_IMPL_H - -// to include DSI related files - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "marshalS.h" - - -class Marshal_SSI_Impl - : public virtual _sk_Marshal -{ - // =TITLE - // Marshal_SSI_Impl - // =DESCRIPTION - // Implementation of the interface using the static skeleton interface -public: - Marshal_SSI_Impl (const char *object_name = (const char *)NULL); - // constructor - - ~Marshal_SSI_Impl (void); - // destructor - - virtual void test_short (CORBA::Short s1, - CORBA::Short& s2); - // test short - - virtual void test_long (CORBA::Long l1, - CORBA::Long& l2); - // test long - - virtual void test_octet (CORBA::Octet o1, - CORBA::Octet& o2); - // test octet - - virtual void test_char (CORBA::Char c1, - CORBA::Char& c2); - // test char - - virtual void test_double (CORBA::Double d1, - CORBA::Double& d2); - // test double - - virtual void test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2); - // test struct - - virtual void test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2); - // test union - - virtual void test_any (const CORBA::Any& a1, - CORBA::Any *& a2); - // test any - - /* - virtual void test_sequence (const Marshal::ShortSeq& s1, - const Marshal::LongSeq& l1, - const Marshal::OctetSeq& o1, - const Marshal::CharSeq& c1, - const Marshal::DoubleSeq& d1, - const Marshal::StructSeq& S1, - const Marshal::UnionSeq& U1, - const Marshal::AnySeq& a1, - Marshal::ShortSeq *& s2, - Marshal::LongSeq *& l2, - Marshal::OctetSeq *& o2, - Marshal::CharSeq *& c2, - Marshal::DoubleSeq *& d2, - Marshal::StructSeq *& S2, - Marshal::UnionSeq *& U2, - Marshal::AnySeq *& a2); - */ - virtual void test_sequence (const Marshal::AnySeq& a1, - Marshal::AnySeq *& a2); - // test sequence - - virtual void test_recursive (const Marshal::Marshal_Recursive& mr1, - Marshal::Marshal_Recursive *& mr2); - // test struct - -}; - -class Marshal_DSI_Impl : public CORBA::DynamicImplementation -{ - // =TITLE - // Marshal_DSI_Impl - // =DESCRIPTION - // Implementation of the interface using the dynamic skeleton interface -public: - Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *object_name = (const char *)NULL); - // constructor - - ~Marshal_DSI_Impl (void); - // destructor - - virtual void invoke (CORBA::ServerRequest_ptr req); - // This method is a must - -private: - void test_short (CORBA::Short s1, - CORBA::Short& s2); - // test short - - void test_long (CORBA::Long l1, - CORBA::Long& l2); - // test long - - void test_octet (CORBA::Octet o1, - CORBA::Octet& o2); - // test octet - - void test_char (CORBA::Char c1, - CORBA::Char& c2); - // test char - - void test_double (CORBA::Double d1, - CORBA::Double& d2); - // test double - - void test_struct (const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2); - // test struct - - void test_union (const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2); - // test union - - void test_any (const CORBA::Any& a1, - CORBA::Any *& a2); - // test any - - void test_sequence (const Marshal::AnySeq& a1, - Marshal::AnySeq *& a2); - // test sequence - - void test_recursive (const Marshal::Marshal_Recursive& mr1, - Marshal::Marshal_Recursive *& mr2); - // test struct - -private: - //= helper functions - they behave as if they were skeletons - void test_short_skel (CORBA::ServerRequest_ptr req); - void test_long_skel (CORBA::ServerRequest_ptr req); - void test_octet_skel (CORBA::ServerRequest_ptr req); - void test_char_skel (CORBA::ServerRequest_ptr req); - void test_double_skel (CORBA::ServerRequest_ptr req); - void test_struct_skel (CORBA::ServerRequest_ptr req); - void test_union_skel (CORBA::ServerRequest_ptr req); - void test_any_skel (CORBA::ServerRequest_ptr req); - void test_sequence_skel (CORBA::ServerRequest_ptr req); - void test_recursive_skel (CORBA::ServerRequest_ptr req); - - // we need the orb to create argument lists (NVList) for us - CORBA::ORB_ptr orb_; // not owned by us - -#if 0 - CORBA::NVList_ptr short_nv_; - CORBA::NVList_ptr long_nv_; - CORBA::NVList_ptr octet_nv_; - CORBA::NVList_ptr char_nv_; - CORBA::NVList_ptr double_nv_; - CORBA::NVList_ptr struct_nv_; - CORBA::NVList_ptr union_nv_; - CORBA::NVList_ptr any_nv_; - CORBA::NVList_ptr seq_nv_; - CORBA::NVList_ptr recursive_nv_; - CORBA::Any_ptr result_; // void result -#endif -}; - -#if defined (__ACE_INLINE__) -#include "visi_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -#endif // defined (VISI_MARSHAL_IMPL_H) diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i deleted file mode 100644 index 7e9405f734b..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ - -// constructor -ACE_INLINE -Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name) - : _sk_Marshal (obj_name) -{ -} - -// destructor -ACE_INLINE -Marshal_SSI_Impl::~Marshal_SSI_Impl (void) -{ -} - -// constructor -ACE_INLINE -Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *obj_name) - : orb_ (orb), - CORBA::DynamicImplementation ("Marshal", obj_name) // interface name is necessary -{ -} - -// destructor -ACE_INLINE -Marshal_DSI_Impl::~Marshal_DSI_Impl (void) -{ - orb_ = CORBA::ORB::_nil (); -} - diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp deleted file mode 100644 index def599b3a02..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Visibroker marshal benchmark -// -// = FILENAME -// visi_marshal_server.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#include "visi_marshal_server.h" - -#if !defined (__ACE_INLINE__) -#include "visi_marshal_server.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(VisiBroker, visi_marshal_server, "$Id$") - -int -Visi_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results) -{ - char **argv; - int argc; - - // get the argument list to be passed on to the ORB_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->orb_ = CORBA::ORB_init (argc, (char *const *)argv); - if (this->orb_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } - - // get the argument list to be passed on to the BOA_init method - argv = options.orb_init_args (argc); - - // get the orb. Pass any ORB_init arguments - this->boa_ = this->orb_->BOA_init (argc, (char *const *)argv); - if (this->boa_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n")); - return -1; - } - - // tell the "results" object what file it must store the results into - results.filename (options.filename ()); - - // use SII or DII accordingly - switch (options.policy ()) - { - case CORBA_Marshal_Options::STATIC : // use SSI - this->ssi_ = new Marshal_SSI_Impl (options.object_name ()); - // register with the BOA - this->boa_->obj_is_ready (this->ssi_); - break; - case CORBA_Marshal_Options::DYNAMIC : // use DSI - this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ())); - // register with the BOA - try { - this->boa_->obj_is_ready (this->dsi_); - } - catch (CORBA::SystemException &se) - { - cerr << "system exception in obj_is_ready" << se << endl; - } - break; - default: - ACE_DEBUG ((LM_DEBUG, "bad policy\n")); - return -1; - } - - try { - // call impl_is_ready - this->boa_->impl_is_ready (); - } - catch (CORBA::SystemException &se) - { - cerr << "system exception: " << se << endl; - } - return 0; -} - diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h deleted file mode 100644 index d18feb277ea..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Marshal Visibroker Benchmark -// -// = FILENAME -// visi_marshal_server.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _VISI_MARSHAL_SERVER_H_ -#define _VISI_MARSHAL_SERVER_H_ - -// benchmark library includes -#include "benchmark/marshal_options.h" -#include "benchmark/marshal_results.h" -#include "benchmark/marshal_proxy.h" - -// implementation classes -#include "visi_marshal_impl.h" - -// include VisiBroker specific include files -#include "marshalS.h" // generated by IDL compiler -#include "pmcext.h" // VisiBroker extensions - -class Visi_Marshal_Server_Proxy : public CORBA_Marshal_Proxy -{ -public: - Visi_Marshal_Server_Proxy (void); - // constructor - - ~Visi_Marshal_Server_Proxy (void); - // destructor - - virtual int run (CORBA_Marshal_Proxy::OPTIONS &options, - CORBA_Marshal_Proxy::RESULTS &results); - // do the actual work -private: - CORBA::ORB_ptr orb_; - // underlying orb; - - CORBA::BOA_ptr boa_; - // underlying boa; - - Marshal_SSI_Impl *ssi_; - Marshal_DSI_Impl *dsi_; - // the implementation (SSI or DSI) -}; - - -#if defined (__ACE_INLINE__) -#include "visi_marshal_server.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i deleted file mode 100644 index d43226e0f57..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -// constructor -ACE_INLINE -Visi_Marshal_Server_Proxy::Visi_Marshal_Server_Proxy (void) - : orb_ (0), - boa_ (0), - ssi_ (0), - dsi_ (0) -{ -} - -// destructor -ACE_INLINE -Visi_Marshal_Server_Proxy::~Visi_Marshal_Server_Proxy (void) -{ - // releasing order is important - - // release the impl - delete ssi_; - delete dsi_; - - // release the BOA - CORBA::release (boa_); - - // release the ORB - CORBA::release (orb_); -} diff --git a/TAO/Benchmark/benchmark/Makefile b/TAO/Benchmark/benchmark/Makefile deleted file mode 100644 index 870e712a15c..00000000000 --- a/TAO/Benchmark/benchmark/Makefile +++ /dev/null @@ -1,123 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the CORBA_Benchmark -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LIBNAME = libbenchmark -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) - -FILES = driver \ - marshal_options \ - marshal_results \ - marshal_proxy - -LSRC = $(addsuffix .cpp,$(FILES)) - -ACE_SHLIBS = -lACE -LDLIBS = -lbenchmark - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -#---------------------------------------------------------------------------- -# 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.lib.GNU -#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -CPPFLAGS += -I$(TAO_ROOT)/Benchmark/ - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/driver.o .shobj/driver.so: driver.cpp \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/driver.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i -.obj/marshal_options.o .shobj/marshal_options.so: marshal_options.cpp \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(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/Log_Record.i \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i -.obj/marshal_results.o .shobj/marshal_results.so: marshal_results.cpp \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.h \ - $(ACE_ROOT)/ace/Profile_Timer.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(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/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.i -.obj/marshal_proxy.o .shobj/marshal_proxy.so: marshal_proxy.cpp \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_proxy.h \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/streams.h \ - $(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/Log_Record.i \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.i \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.h \ - $(ACE_ROOT)/ace/Profile_Timer.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.i \ - $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_proxy.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/Benchmark/benchmark/driver.cpp b/TAO/Benchmark/benchmark/driver.cpp deleted file mode 100644 index 2569f03ad56..00000000000 --- a/TAO/Benchmark/benchmark/driver.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" - -ACE_RCSID(benchmark, driver, "$Id$") - -template <class T> -CORBA_Benchmark_Driver<T>::CORBA_Benchmark_Driver (T *proxy) - : proxy_ (proxy) -{ -} - -template <class T> -CORBA_Benchmark_Driver<T>::~CORBA_Benchmark_Driver (void) -{ - delete proxy_; -} - -template <class T> -int -CORBA_Benchmark_Driver<T>::run (int argc, char *argv[]) -{ - // The run method delegates the task of parsing the command line options to - // the options data member - if (this->options_.parse_args (argc, argv) == -1) - { - ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot parse arguments\n")); - return -1; - } - -#if 0 - // get a handle to the proxy - this->proxy_ = this->options_.make_proxy (); - if (this->proxy_ == 0) - { - ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot make proxy\n")); - return -1; - } -#endif - - // The driver delegates the task of running the test to the newly created - // proxy - if (this->proxy_->run (this->options_, this->results_) == -1) - { - ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot run\n")); - return -1; - } - - // The driver delegates the task of printing the results to the TTCP_Results - // class - if (this->results_.print_results () == -1) - { - ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot print results\n")); - return -1; - } - - return 0; -} - - diff --git a/TAO/Benchmark/benchmark/driver.h b/TAO/Benchmark/benchmark/driver.h deleted file mode 100644 index cb69ea098ce..00000000000 --- a/TAO/Benchmark/benchmark/driver.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark -// -// = FILENAME -// driver.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _CORBA_BENCHMARK_DRIVER_H_ -#define _CORBA_BENCHMARK_DRIVER_H_ - -#include "ace/Log_Msg.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template <class PROXY> -class CORBA_Benchmark_Driver -{ - // = TITLE - // CORBA Benchmark Driver. - // - // = DESCRIPTION - // This class encapsulates all the driver common to the CORBA benchmark - // tests. It provides a template to run the benchmarking code. The real - // work will be done by the PROXY class. -public: - - CORBA_Benchmark_Driver (PROXY *p); - // Constructor. - - ~CORBA_Benchmark_Driver (void); - // Destructor - - int run (int argc, char *argv[]); - // This is the starting point of all CORBA benchmark tests. - // Returns 0 on success, -1 on error. - -private: - PROXY *proxy_; - // the actual object that will do the work - - PROXY::RESULTS results_; - // Storage of test results. - - PROXY::OPTIONS options_; - // CORBA test command line options -}; - -#endif /* CORBA_BENCHMARK_DRIVER_H */ diff --git a/TAO/Benchmark/benchmark/marshal_options.cpp b/TAO/Benchmark/benchmark/marshal_options.cpp deleted file mode 100644 index 93fb039be0c..00000000000 --- a/TAO/Benchmark/benchmark/marshal_options.cpp +++ /dev/null @@ -1,282 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark -// -// = FILENAME -// marshal_options.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#include "benchmark/marshal_options.h" -#include "ace/Get_Opt.h" - -#if !defined (__ACE_INLINE__) -#include "benchmark/marshal_options.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(benchmark, marshal_options, "$Id$") - -static char *usage_string = -"Marshal_Test available options: \n\ --d : set debug ON \n\ --D : set TCP NO DELAY on \n\ --n <service name> : set the service name\n\ --s <snd sock bufsize> : set sender sock buf \n\ --r <rcv sock bufsize> : set recv sock buf \n\ --h <hostname> : hostname to listen/connect \n\ --p <portnum> : port num to listen \n\ --i <iters> : number of iters \n\ --R <ROLE> : s(ender)/r(eceiver) \n\ --T <datatype> : s(hort)/l(ong)/d(ouble)/o(ctet)/c(har)/\n\ - S(truct)/U(nion)/A(ny)/(se)Q/R(ecursive)\n\ --P <policy> : S(II/SI)/D(II/SI) depending on role \n\ --I <CORBA impl> : O(rbix)/V(isiBroker)/T(AO)\n\ --o <obj name> : obj to bind to \n\ --f <filename> : filename to store results \n\ -"; - -int -CORBA_Marshal_Options::Usage (void) -{ - ACE_DEBUG ((LM_DEBUG, "%s\n", usage_string)); - return -1; -} - -int -CORBA_Marshal_Options::parse_args (int argc, char *argv []) -{ - int c; // option letter used - ACE_Get_Opt get_opt (argc, argv, "dDn:s:r:h:p:i:R:T:P:I:o:f:"); - - // ACE_DEBUG ((LM_DEBUG, "CORBA_Marshal_Options::parse_args\n")); - - while ((c = get_opt ()) != -1) - { - switch (c) - { - case 'd': // debug - this->debug (1); - break; - case 'D': // TCP NODELAY - this->disable_nagle (1); - break; - case 'n': - this->service_name (get_opt.optarg); - break; - case 's': // sender socket size - this->snd_socket_queue_size (ACE_OS::atoi (get_opt.optarg)); - break; - case 'r': // receive socket size - this->rcv_socket_queue_size (ACE_OS::atoi (get_opt.optarg)); - break; - case 'h': // hostname - this->hostname (ACE_OS::strdup (get_opt.optarg)); - break; - case 'p': // port number - this->port (ACE_OS::atoi (get_opt.optarg)); - break; - case 'i': // port number - this->iterations (ACE_OS::atoi (get_opt.optarg)); - break; - case 'R': // role - switch (*get_opt.optarg) - { - case 'S': // sender - case 's': // sender - this->role (SENDER); - break; - case 'R': // receiver - case 'r': // receiver - this->role (RECEIVER); - break; - default: - return this->Usage (); - } - break; - case 'T': // data type to test - switch (*get_opt.optarg) - { - case 's': // short - this->data_type (SHORT); - break; - case 'd': // double - this->data_type (DOUBLE); - break; - case 'o': // octet - this->data_type (OCTET); - break; - case 'c': // char - this->data_type (CHAR); - break; - case 'S': // Struct - this->data_type (STRUCT); - break; - case 'U': // Union - this->data_type (UNION); - break; - case 'A': // Any - this->data_type (ANY); - break; - case 'Q': // Sequence - this->data_type (SEQUENCE); - break; - case 'R': // Recursive - this->data_type (RECURSIVE); - break; - case 'l': // long, also the default - default: - this->data_type (LONG); - break; - } - break; - case 'P': // policy - switch (*get_opt.optarg) - { - case 'S': - case 's': - this->policy (STATIC); - break; - case 'D': - case 'd': - this->policy (DYNAMIC); - break; - default: - return this->Usage (); - } - break; - case 'I': // impl - switch (*get_opt.optarg) - { - case 'O': // Orbix - this->proxy_type (ORBIX); - break; - case 'V': // VisiBroker - this->proxy_type (VISIBROKER); - break; - case 'T': // TAO - this->proxy_type (TAO); - break; - } - break; - case 'o': // obj name - this->object_name (ACE_OS::strdup (get_opt.optarg)); - break; - case 'f': // file name to save results - this->filename (ACE_OS::strdup (get_opt.optarg)); - break; - default: // error - return this->Usage (); - } - } - return 0; -} - -int -CORBA_Marshal_Options::orb_init_args (int &argc, char *argv []) -{ - char buffer [200]; - - argc = 0; - switch (this->proxy_type_) - { - case ORBIX: - break; - case VISIBROKER: - { - ACE_OS::memset (buffer, '\0', 200); - if (snd_socket_queue_size_ > 0) - { - ACE_OS::sprintf (buffer, "-ORBsendbufsize %d", snd_socket_queue_size_); - orb_init_args_ += ACE_CString (buffer); - argc ++; - } - - ACE_OS::memset (buffer, '\0', 200); - if (rcv_socket_queue_size_ > 0) - { - ACE_OS::sprintf (buffer, "-ORBrcvbufsize %d", rcv_socket_queue_size_); - orb_init_args_ += ACE_CString (buffer); - argc ++; - } - } - break; - case TAO: - break; - } - ACE_OS::memset (buffer, '\0', 200); - ACE_OS::memcpy (buffer, boa_init_args_.rep (), boa_init_args_.length ()); - return 0; -} - -static char buffer [20][200]; - -int -CORBA_Marshal_Options::boa_init_args (int &argc, char *argv []) -{ - argc = 0; - switch (this->proxy_type_) - { - case ORBIX: - break; - case VISIBROKER: - { - ACE_OS::memset (buffer[argc], '\0', 200); - if (snd_socket_queue_size_ > 0) - { - ACE_OS::sprintf (buffer[argc], "-OAsendbufsize %d", snd_socket_queue_size_); - // boa_init_args_ += ACE_CString (buffer[argc]); - argc ++; - } - ACE_OS::memset (buffer[argc], '\0', 200); - if (rcv_socket_queue_size_ > 0) - { - ACE_OS::sprintf (buffer[argc], "-OArcvbufsize %d", rcv_socket_queue_size_); - // boa_init_args_ += ACE_CString (buffer[argc]); - argc ++; - } - ACE_OS::memset (buffer[argc], '\0', 200); - if (port_ > 0) - { - ACE_OS::sprintf (buffer[argc], "-OAport %d", port_); - // boa_init_args_ += ACE_CString (buffer[argc]); - argc ++; - } - ACE_OS::memset (buffer[argc], '\0', 200); - if (hostname_ != 0 && role_ == RECEIVER) - { - ACE_OS::sprintf (buffer[argc], "-OAipaddr %s", hostname_); - // boa_init_args_ += ACE_CString (buffer[argc]); - argc ++; - } - } - break; - case TAO: - { - ACE_OS::memset (buffer[argc], '\0', 200); - if (port_ > 0) - { - ACE_OS::sprintf (buffer[argc], "-OAport %d", port_); - // boa_init_args_ += ACE_CString (buffer); - argc ++; - } - ACE_OS::memset (buffer[argc], '\0', 200); - if (hostname_ != 0 && role_ == RECEIVER) - { - ACE_OS::sprintf (buffer[argc], "-OAhostname %s", hostname_); - // boa_init_args_ += ACE_CString (buffer); - argc ++; - } - } - break; - } - // ACE_OS::memset (buffer, '\0', 200); - // ACE_OS::memcpy (buffer, boa_init_args_.rep (), boa_init_args_.length ()); - return 0; -} - diff --git a/TAO/Benchmark/benchmark/marshal_options.h b/TAO/Benchmark/benchmark/marshal_options.h deleted file mode 100644 index 654b87070e0..00000000000 --- a/TAO/Benchmark/benchmark/marshal_options.h +++ /dev/null @@ -1,214 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark/Marshal -// -// = FILENAME -// marshal_options.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _CORBA_MARSHAL_OPTIONS_H_ -#define _CORBA_MARSHAL_OPTIONS_H_ - -#include "ace/OS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" - -class CORBA_Marshal_Options -{ - // = TITLE - // CORBA_Marshal_Options - // = DESCRIPTION - // An encapsulation of all the CORBA_MARSHAL test parameters. This is - // used to communicate between the ACE_CORBA_Marshal_Driver and all - // specializations of CORBA_Marshal_Proxy. It must be noted that not all - // options will be valid for a given specialization of CORBA_Marshal_Proxy. This is - // a "all-encompassing" class. -public: - // The following data types will be tested - enum DATATYPE - { - NO_DATATYPE, - SHORT, - LONG, - DOUBLE, - CHAR, - OCTET, - STRUCT, - UNION, - ANY, - SEQUENCE, - RECURSIVE - }; - - // The following CORBA implementations will be tested - enum PROXY_TYPE - { - NO_PROXY, - TAO, - ORBIX, - VISIBROKER - }; - - // Invocation policy - enum POLICY - { - NO_POLICY, - STATIC, // SII, SSI - DYNAMIC // DII, DSI - }; - - // what role do we play? - enum ROLE - { - NO_ROLE, - SENDER, - RECEIVER - }; - - CORBA_Marshal_Options (void); - // Construction. Sets default values. - - ~CORBA_Marshal_Options (void); - // Destructor - - int parse_args (int argc, char *argv[]); - // Parse command line arguments. This decides what type of CORBA_MARSHAL - // test to run. - - // All the command line options - - //= Get/Set the data type to be sent/received - CORBA_Marshal_Options::DATATYPE data_type (void); - void data_type (CORBA_Marshal_Options::DATATYPE); - - //= Get/set the proxy type - CORBA_Marshal_Options::PROXY_TYPE proxy_type (void); - void proxy_type (CORBA_Marshal_Options::PROXY_TYPE); - - //= Get/Set the policy used by clients/servers for communication - CORBA_Marshal_Options::POLICY policy (void); - void policy (CORBA_Marshal_Options::POLICY); - - //= Get/Set whether we are client or server (sender/receiver) - CORBA_Marshal_Options::ROLE role (void); - void role (CORBA_Marshal_Options::ROLE); - - //= Get/Set the hostname client connects to or the interface on which the - //server listens to - const char *hostname (void); - void hostname (const char *); - - //= Get/set the port number on which the server listens - short port (void); - void port (short); - - //= Get/Set the object name (to which to connect to) - const char *object_name (void); - void object_name (const char *); - - //= Get/Set the service name (for impl is ready) - const char *service_name (void); - void service_name (const char *); - - // = Get/set receive sockbufsize. - int rcv_socket_queue_size (void); - void rcv_socket_queue_size (int); - - // = Get/set send sockbufsize. - int snd_socket_queue_size (void); - void snd_socket_queue_size (int); - - // = Get/set whether to use TCP_NODELAY or not - unsigned short disable_nagle (void); - void disable_nagle (unsigned short); - - // = Get/set whether to print debug messages. - unsigned short debug (void); - void debug (unsigned short); - - // =Get/Set filename to store results - const char *filename (void); - void filename (const char *fname); - - // =Get/set number of iterations - int iterations (void); - void iterations (int iter); - - int Usage (void); - // prints a usage message and always returns -1 - - int orb_init_args (int &argc, char * argv []); - // return a string that will be passed to the ORB init method based on the - // other options and proxy type - - int boa_init_args (int &argc, char * argv []); - // return a string that will be passed to the BOA init method based on the - // other options and proxy type - -private: - const char *object_name_; - // name of the object. - - const char *service_name_; - // name of the service. - - CORBA_Marshal_Options::DATATYPE data_type_; - // data type to send/receive - - CORBA_Marshal_Options::PROXY_TYPE proxy_type_; - // the proxy type, e.g., ACE, Orbix, VisiBroker, etc - - CORBA_Marshal_Options::POLICY policy_; - // communications policy used by the communicating entity - - CORBA_Marshal_Options::ROLE role_; - // Are we creating a sender or receiver? - - int rcv_socket_queue_size_; - // Size of socket queue. - - int snd_socket_queue_size_; - // Size of socket queue. - - unsigned short disable_nagle_; - // Nagle must be stopped. - - unsigned short debug_; - // Should we print debug messages? - - short port_; - // Port for socket connections to use. - - const char *hostname_; - // Host for senders to connect to. and servers to listen on - - const char *filename_; - // filename in which to store the results - - int iterations_; - // number of times to run the same test - - ACE_CString orb_init_args_; - // arguments to orb_init - - ACE_CString boa_init_args_; - // arguments to boa_init - -}; - -#if defined (__ACE_INLINE__) -#include "benchmark/marshal_options.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/benchmark/marshal_options.i b/TAO/Benchmark/benchmark/marshal_options.i deleted file mode 100644 index 6c860fac93c..00000000000 --- a/TAO/Benchmark/benchmark/marshal_options.i +++ /dev/null @@ -1,235 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark/Marshal -// -// = FILENAME -// marshal_options.i -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -// constructor -ACE_INLINE -CORBA_Marshal_Options::CORBA_Marshal_Options (void) - : object_name_ (0), - data_type_ (CORBA_Marshal_Options::NO_DATATYPE), - proxy_type_ (CORBA_Marshal_Options::NO_PROXY), - policy_ (CORBA_Marshal_Options::NO_POLICY), - role_ (CORBA_Marshal_Options::NO_ROLE), - rcv_socket_queue_size_ (-1), - snd_socket_queue_size_ (-1), - disable_nagle_ (0), - debug_ (0), - hostname_ (0), - port_ (-1), - iterations_ (0) -{ -} - - -// destructor -ACE_INLINE -CORBA_Marshal_Options::~CORBA_Marshal_Options (void) -{ -} - -// set the data type to be transferred -ACE_INLINE void -CORBA_Marshal_Options::data_type (CORBA_Marshal_Options::DATATYPE dt) -{ - data_type_ = dt; -} - -// get the data type to be transferred -ACE_INLINE CORBA_Marshal_Options::DATATYPE -CORBA_Marshal_Options::data_type (void) -{ - return data_type_; -} - -// set the proxy type to be transferred -ACE_INLINE void -CORBA_Marshal_Options::proxy_type (CORBA_Marshal_Options::PROXY_TYPE pt) -{ - proxy_type_ = pt; -} - -// get the data type to be transferred -ACE_INLINE CORBA_Marshal_Options::PROXY_TYPE -CORBA_Marshal_Options::proxy_type (void) -{ - return proxy_type_; -} - -// set the policy type to be transferred -ACE_INLINE void -CORBA_Marshal_Options::policy (CORBA_Marshal_Options::POLICY inv) -{ - policy_ = inv; -} - -// get the policy type to be transferred -ACE_INLINE CORBA_Marshal_Options::POLICY -CORBA_Marshal_Options::policy (void) -{ - return policy_; -} - -// set the role type to be transferred -ACE_INLINE void -CORBA_Marshal_Options::role (CORBA_Marshal_Options::ROLE my_role) -{ - role_ = my_role; -} - -// get the role type to be transferred -ACE_INLINE CORBA_Marshal_Options::ROLE -CORBA_Marshal_Options::role (void) -{ - return role_; -} - -// set the hostname -ACE_INLINE void -CORBA_Marshal_Options::hostname (const char *hname) -{ - hostname_ = hname; -} - -// get the hostname -ACE_INLINE const char* -CORBA_Marshal_Options::hostname (void) -{ - return hostname_; -} - -// set the post -ACE_INLINE void -CORBA_Marshal_Options::port (short portnum) -{ - port_ = portnum; -} - -// get the port -ACE_INLINE short -CORBA_Marshal_Options::port (void) -{ - return port_; -} - -// set the object name -ACE_INLINE void -CORBA_Marshal_Options::object_name (const char *objname) -{ - object_name_ = objname; -} - -// get the object name -ACE_INLINE const char * -CORBA_Marshal_Options::object_name (void) -{ - return object_name_; -} - -// set the service name -ACE_INLINE void -CORBA_Marshal_Options::service_name (const char *srvname) -{ - service_name_ = srvname; -} - -// get the service name -ACE_INLINE const char * -CORBA_Marshal_Options::service_name (void) -{ - return service_name_; -} - -// set the receive sock size -ACE_INLINE void -CORBA_Marshal_Options::rcv_socket_queue_size (int socksize) -{ - rcv_socket_queue_size_ = socksize; -} - -// get the receive sock size -ACE_INLINE int -CORBA_Marshal_Options::rcv_socket_queue_size (void) -{ - return rcv_socket_queue_size_; -} - -// set the sender sock size -ACE_INLINE void -CORBA_Marshal_Options::snd_socket_queue_size (int socksize) -{ - snd_socket_queue_size_ = socksize; -} - -// get the snd sock size -ACE_INLINE int -CORBA_Marshal_Options::snd_socket_queue_size (void) -{ - return snd_socket_queue_size_; -} - -// set whether Nagle algo is to be disabled -ACE_INLINE void -CORBA_Marshal_Options::disable_nagle (unsigned short val) -{ - disable_nagle_ = (val ? 1 : 0); -} - -// get whether Nagle algo is disabled -ACE_INLINE unsigned short -CORBA_Marshal_Options::disable_nagle (void) -{ - return disable_nagle_; -} - -// set whether debug is to be disabled -ACE_INLINE void -CORBA_Marshal_Options::debug (unsigned short val) -{ - debug_ = (val ? 1 : 0); -} - -// get whether debug is disabled -ACE_INLINE unsigned short -CORBA_Marshal_Options::debug (void) -{ - return debug_; -} - -// set the filename -ACE_INLINE void -CORBA_Marshal_Options::filename (const char *fname) -{ - filename_ = fname; -} - -// get the filename -ACE_INLINE const char* -CORBA_Marshal_Options::filename (void) -{ - return filename_; -} - -// set the iterations -ACE_INLINE void -CORBA_Marshal_Options::iterations (int iter) -{ - iterations_ = iter; -} - -// get the iterations -ACE_INLINE int -CORBA_Marshal_Options::iterations (void) -{ - return iterations_; -} diff --git a/TAO/Benchmark/benchmark/marshal_proxy.cpp b/TAO/Benchmark/benchmark/marshal_proxy.cpp deleted file mode 100644 index 9c2d4cf61d8..00000000000 --- a/TAO/Benchmark/benchmark/marshal_proxy.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark -// -// = FILENAME -// marshal_proxy.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#include "benchmark/marshal_proxy.h" - -#if !defined (__ACE_INLINE__) -#include "benchmark/marshal_proxy.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(benchmark, marshal_proxy, "$Id$") - diff --git a/TAO/Benchmark/benchmark/marshal_proxy.h b/TAO/Benchmark/benchmark/marshal_proxy.h deleted file mode 100644 index 3152a62f17d..00000000000 --- a/TAO/Benchmark/benchmark/marshal_proxy.h +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark -// -// = FILENAME -// marshal_proxy.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _CORBA_MARSHAL_PROXY_H_ -#define _CORBA_MARSHAL_PROXY_H_ - -#include "benchmark/marshal_options.h" -#include "benchmark/marshal_results.h" - -class CORBA_Marshal_Proxy -{ - // = TITLE - // Abstract handle for all CORBA_Marshal tests. - // = DESCRIPTION - // The IMPL class is the CORBA specific class which does the real work. The - // IMPL class must support the run method -public: - typedef CORBA_Marshal_Options OPTIONS; - typedef CORBA_Marshal_Results RESULTS; - - CORBA_Marshal_Proxy (void); - // constructor - - virtual ~CORBA_Marshal_Proxy (void); - // destructor - - virtual int run (OPTIONS &, RESULTS &) = 0; - // run the test - -}; - -#if defined (__ACE_INLINE__) -#include "benchmark/marshal_proxy.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/benchmark/marshal_proxy.i b/TAO/Benchmark/benchmark/marshal_proxy.i deleted file mode 100644 index a5e95d393cd..00000000000 --- a/TAO/Benchmark/benchmark/marshal_proxy.i +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - - -ACE_INLINE -CORBA_Marshal_Proxy::CORBA_Marshal_Proxy (void) -{ -} - -ACE_INLINE -CORBA_Marshal_Proxy::~CORBA_Marshal_Proxy (void) -{ -} diff --git a/TAO/Benchmark/benchmark/marshal_results.cpp b/TAO/Benchmark/benchmark/marshal_results.cpp deleted file mode 100644 index 1c102d49eed..00000000000 --- a/TAO/Benchmark/benchmark/marshal_results.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark/Marshal -// -// = FILENAME -// marshal_results.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#include "benchmark/marshal_results.h" - -#if !defined (__ACE_INLINE__) -#include "benchmark/marshal_results.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(benchmark, marshal_results, "$Id$") - -int -CORBA_Marshal_Results::log_results (void) -{ - return 0; -} - -int -CORBA_Marshal_Results::print_results (void) -{ - // ACE_DEBUG ((LM_DEBUG, "CORBA_Marshal_Results::print_results\n")); - - return 0; // success -} diff --git a/TAO/Benchmark/benchmark/marshal_results.h b/TAO/Benchmark/benchmark/marshal_results.h deleted file mode 100644 index 66de29e13bd..00000000000 --- a/TAO/Benchmark/benchmark/marshal_results.h +++ /dev/null @@ -1,76 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark -// -// = FILENAME -// marshal_results.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#ifndef _CORBA_MARSHAL_RESULTS_H_ -#define _CORBA_MARSHAL_RESULTS_H_ - -#include "ace/Profile_Timer.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -class CORBA_Marshal_Results -{ -public: - CORBA_Marshal_Results (void); - // Construction. - - ~CORBA_Marshal_Results (void); - // destructor. - - void clear (void); - // Clear all results. - - ACE_Profile_Timer::ACE_Elapsed_Time & elapsed_time (void); - // Get the elapsed time. - - ACE_Profile_Timer::Rusage elapsed_rusage (void); - // compute the rusage - - int start_timer (void); - // starts a profile timer. - - int stop_timer (void); - // stops the profile timer. - - void filename (const char *fname); - // set the name of the file to store results - - int log_results (void); - // log results - - int print_results (void); - // prints the results - -private: - - // = Used for performance statistics - ACE_Profile_Timer timer_; - ACE_Profile_Timer::ACE_Elapsed_Time et_; - ACE_Profile_Timer::Rusage rusage_; - - double elapsed_time_; - // Real elapsed time in seconds. - - const char *filename_; - // filename -}; - -#if defined (__ACE_INLINE__) -#include "benchmark/marshal_results.i" -#endif /* __ACE_INLINE__ */ - -#endif diff --git a/TAO/Benchmark/benchmark/marshal_results.i b/TAO/Benchmark/benchmark/marshal_results.i deleted file mode 100644 index aa914b2f3d3..00000000000 --- a/TAO/Benchmark/benchmark/marshal_results.i +++ /dev/null @@ -1,61 +0,0 @@ -// $Id$ - - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark/Marshal -// -// = FILENAME -// marshal_results.i -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -ACE_INLINE -CORBA_Marshal_Results::CORBA_Marshal_Results (void) - : filename_ (0), - elapsed_time_ (0) -{ -} - -ACE_INLINE -CORBA_Marshal_Results::~CORBA_Marshal_Results (void) -{ -} - -ACE_INLINE int -CORBA_Marshal_Results::start_timer (void) -{ - return this->timer_.start (); -} - -ACE_INLINE int -CORBA_Marshal_Results::stop_timer (void) -{ - return this->timer_.stop (); -} - -ACE_INLINE ACE_Profile_Timer::ACE_Elapsed_Time & -CORBA_Marshal_Results::elapsed_time (void) -{ - (void) this->timer_.elapsed_time (this->et_); - return this->et_; -} - -ACE_INLINE ACE_Profile_Timer::Rusage -CORBA_Marshal_Results::elapsed_rusage (void) -{ - (void) this->timer_.elapsed_rusage (this->rusage_); - return this->rusage_; -} - -ACE_INLINE void -CORBA_Marshal_Results::filename (const char *fname) -{ - this->filename_ = fname; -} - - diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d57e47b93ad..d04cb507a1a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,98 @@ +Thu Nov 16 13:19:02 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/AMI/FL_Callback/Makefile: + * examples/AMI/FL_Callback/Peer_i.cpp: + * examples/AMI/FL_Callback/Progress_i.cpp: + * orbsvcs/Makefile: + * orbsvcs/TAO_Service/Makefile: + * orbsvcs/examples/Makefile: + * orbsvcs/examples/Security/Send_File/Makefile: + * orbsvcs/orbsvcs/Makefile: + * orbsvcs/tests/Makefile: + * orbsvcs/tests/FaultTolerance/Makefile: + * orbsvcs/tests/LoadBalancing/Makefile: + * orbsvcs/tests/Notify/Makefile: + * orbsvcs/tests/Notify/performance-tests/Makefile: + * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile: + * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile: + * orbsvcs/tests/ior_corbaname/Makefile: + * orbsvcs/tests/tests_svc_loader/Makefile: + * tests/Makefile: + * tests/QtTests/Makefile: + * tests/QtTests/client.cpp: + * tests/Xt_Stopwatch/Makefile: + * tests/ior_corbaloc/Makefile: + Update makefiles, several directories were not listed in their + top-level Makefiles, and they were not compiled nor was their + dependencies ever updated. + + * Benchmark/Marshal_Test/Orbix/Makefile: + * Benchmark/Marshal_Test/Orbix/client.cpp: + * Benchmark/Marshal_Test/Orbix/marshal.h: + * Benchmark/Marshal_Test/Orbix/marshal.idl: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h: + * Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i: + * Benchmark/Marshal_Test/Orbix/run_client: + * Benchmark/Marshal_Test/Orbix/run_dsi: + * Benchmark/Marshal_Test/Orbix/run_dsi_server: + * Benchmark/Marshal_Test/Orbix/run_ssi: + * Benchmark/Marshal_Test/Orbix/run_ssi_server: + * Benchmark/Marshal_Test/Orbix/server.cpp: + * Benchmark/Marshal_Test/TAO/Makefile: + * Benchmark/Marshal_Test/TAO/client.cpp: + * Benchmark/Marshal_Test/TAO/marshal.idl: + * Benchmark/Marshal_Test/TAO/marshalC.cpp: + * Benchmark/Marshal_Test/TAO/marshalC.h: + * Benchmark/Marshal_Test/TAO/marshalS.cpp: + * Benchmark/Marshal_Test/TAO/marshalS.h: + * Benchmark/Marshal_Test/TAO/server.cpp: + * Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp: + * Benchmark/Marshal_Test/TAO/tao_marshal_client.h: + * Benchmark/Marshal_Test/TAO/tao_marshal_client.i: + * Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp: + * Benchmark/Marshal_Test/TAO/tao_marshal_impl.h: + * Benchmark/Marshal_Test/TAO/tao_marshal_impl.i: + * Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp: + * Benchmark/Marshal_Test/TAO/tao_marshal_server.h: + * Benchmark/Marshal_Test/TAO/tao_marshal_server.i: + * Benchmark/Marshal_Test/VisiBroker/Makefile: + * Benchmark/Marshal_Test/VisiBroker/client.cpp: + * Benchmark/Marshal_Test/VisiBroker/marshal.idl: + * Benchmark/Marshal_Test/VisiBroker/run_client: + * Benchmark/Marshal_Test/VisiBroker/run_server: + * Benchmark/Marshal_Test/VisiBroker/server.cpp: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h: + * Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i: + * Benchmark/benchmark/Makefile: + * Benchmark/benchmark/driver.cpp: + * Benchmark/benchmark/driver.h: + * Benchmark/benchmark/marshal_options.cpp: + * Benchmark/benchmark/marshal_options.h: + * Benchmark/benchmark/marshal_options.i: + * Benchmark/benchmark/marshal_proxy.cpp: + * Benchmark/benchmark/marshal_proxy.h: + * Benchmark/benchmark/marshal_proxy.i: + * Benchmark/benchmark/marshal_results.cpp: + * Benchmark/benchmark/marshal_results.h: + * Benchmark/benchmark/marshal_results.i: + Remove everything in these directories. The test do not + compile, we don't have access to the other ORBs, and in general + they just confuse people. + Thu Nov 16 11:29:27 2000 Darrell Brunsch <brunsch@uci.edu> * orbsvcs/ImplRepo_Service/README.txt: @@ -11,10 +106,10 @@ Thu Nov 16 11:29:27 2000 Darrell Brunsch <brunsch@uci.edu> Thu Nov 16 11:23:44 2000 Ossama Othman <ossama@uci.edu> - * tao/Cleanup_Func_Registry.cpp (cleanup): + * tao/Cleanup_Func_Registry.cpp (cleanup): - Make sure that the cleanup function pointer is non-zero prior to - invoking it. + Make sure that the cleanup function pointer is non-zero prior to + invoking it. Thu Nov 16 09:36:43 2000 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/examples/AMI/FL_Callback/Makefile b/TAO/examples/AMI/FL_Callback/Makefile index 3289392052d..5cac00ded1d 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile +++ b/TAO/examples/AMI/FL_Callback/Makefile @@ -69,6 +69,719 @@ realclean: clean # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. +.obj/progress.o .obj/progress.so .shobj/progress.o .shobj/progress.so: progress.cpp Progress_i.h testS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + testC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + testS_T.h testS_T.i testS_T.cpp testS.i Progress_i.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +.obj/peer.o .obj/peer.so .shobj/peer.o .shobj/peer.so: peer.cpp Peer_i.h testS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + testC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + testS_T.h testS_T.i testS_T.cpp testS.i \ + $(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.cpp \ + Peer_i.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Sched_Params.h \ + $(ACE_ROOT)/ace/Sched_Params.i + .obj/Peer_i.o .obj/Peer_i.so .shobj/Peer_i.o .shobj/Peer_i.so: Peer_i.cpp Peer_i.h testS.h \ $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ $(ACE_ROOT)/ace/pre.h \ @@ -774,7 +1487,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ - testS_T.h testS_T.i testS_T.cpp testS.i + testS_T.h testS_T.i testS_T.cpp testS.i Progress_i.i .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp index 39561b7f759..71cd4edcd4e 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp @@ -14,7 +14,7 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer) } void -Peer_Handler_i::request (CORBA::Long retval, +Peer_Handler_i::request (CORBA::Long retval, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26,10 +26,11 @@ Peer_Handler_i::request (CORBA::Long retval, } -void +void Peer_Handler_i::request_excep ( AMI_PeerExceptionHolder * excep_holder, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (excep_holder); ACE_UNUSED_ARG (ACE_TRY_ENV); @@ -118,6 +119,7 @@ Peer_i::start (const PeerSet &the_peers, void Peer_i::shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0, ACE_TRY_ENV); } diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp index c0768505549..70e81b48ad8 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp @@ -8,7 +8,7 @@ #include <FL/Fl_Button.h> #if !defined(__ACE_INLINE__) -#include "test_i.i" +#include "Progress_i.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(FL_Cube, test_i, "$Id$") @@ -22,7 +22,7 @@ void Progress_i::sent_request (CORBA::Long id, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) -{ +{ //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id)); this->window_->sent_request (id); } diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile index 892948b1533..e966c2ee222 100644 --- a/TAO/orbsvcs/Makefile +++ b/TAO/orbsvcs/Makefile @@ -23,6 +23,7 @@ DIRS = orbsvcs \ Logging_Service \ Trading_Service \ LoadBalancer \ + TAO_Service \ tests \ examples diff --git a/TAO/orbsvcs/TAO_Service/Makefile b/TAO/orbsvcs/TAO_Service/Makefile index b9af8b5d758..bb45f9955a8 100644 --- a/TAO/orbsvcs/TAO_Service/Makefile +++ b/TAO/orbsvcs/TAO_Service/Makefile @@ -13,25 +13,13 @@ ifndef TAO_ROOT endif LDLIBS = -lTAO -ACE_SHLIBS = -lTAO -lACE PROG_SRCS = TAO_Service.cpp -# @@ We have to add the NT project files once you commit these files. SRC = $(PROG_SRCS) -SIMPLE_SVR_OBJS = TAO_Service.o +BIN = TAO_Service -BIN2 = TAO_Service - -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming - -TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -41,7 +29,7 @@ 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.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk @@ -49,18 +37,6 @@ include $(TAO_ROOT)/taoconfig.mk # Local targets #---------------------------------------------------------------------------- -LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs - -.PRECIOUS: $(foreach ext, $(IDL_EXT), Time_Date$(ext)) - -TAO_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS)) $(SHLIB) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -$(BIN): - -realclean: clean - -$(RM) $(foreach ext, $(IDL_EXT), Time_Date$(ext)) #---------------------------------------------------------------------------- # Dependencies @@ -73,13 +49,22 @@ realclean: clean .obj/TAO_Service.o .obj/TAO_Service.so .shobj/TAO_Service.o .shobj/TAO_Service.so: TAO_Service.cpp \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -89,55 +74,51 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.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/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -147,14 +128,16 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -165,33 +148,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -201,25 +160,21 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/Interceptor.h \ - $(TAO_ROOT)/tao/InterceptorC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/InterceptorC.i \ - $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ @@ -229,59 +184,29 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/Object_Adapter.h \ - $(TAO_ROOT)/tao/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServerC.i \ - $(TAO_ROOT)/tao/Key_Adapters.i \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/Object_Adapter.i \ - $(TAO_ROOT)/tao/POAManager.h \ - $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -291,10 +216,46 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -302,6 +263,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -314,44 +277,70 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(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/Stub.i \ $(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/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/Priority_Mapping.i \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ @@ -359,25 +348,24 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/MessagingS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/tao/MessagingS_T.h \ - $(TAO_ROOT)/tao/MessagingS_T.i \ - $(TAO_ROOT)/tao/MessagingS_T.cpp \ - $(TAO_ROOT)/tao/MessagingS.i + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/examples/Makefile b/TAO/orbsvcs/examples/Makefile index 24fbeb3292a..07682383bc4 100644 --- a/TAO/orbsvcs/examples/Makefile +++ b/TAO/orbsvcs/examples/Makefile @@ -11,15 +11,8 @@ DIRS = CosEC \ RtEC \ Notify \ - Log - -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Security, $(findstring Security, $(TAO_ORBSVCS))) - DIRS += Security -endif # Security - + Log \ + Security ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile b/TAO/orbsvcs/examples/Security/Send_File/Makefile index 8cede8e2c17..a91b7c3fb30 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Makefile +++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile @@ -19,7 +19,7 @@ IDL_SRC = \ $(addsuffix S.cpp, $(IDL_FILES)) \ $(addsuffix C.cpp, $(IDL_FILES)) -BIN = client server +BIN_UNCHECKED = client server SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) $(IDL_SRC) @@ -35,6 +35,14 @@ TAO_IDLFLAGS += -Ge 1 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Security, $(findstring Security, $(TAO_ORBSVCS))) + BIN = $(BIN_UNCHECKED) +endif # Security + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index b24dc4be92a..8408f213113 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -171,7 +171,19 @@ endif all: ORBSVCS_COMPONENTS -all debug profile optimize install deinstall clean realclean clobber depend rcs_info idl_stubs: +realclean:: +ifneq ($(MKLIST),) + ifeq (Windows,$(findstring Windows,$(OS))) + @cmd /c "FOR /D %m IN ($(MKLIST)) DO $(MAKE) -f %m MAKEFILE=$$m $(@:.nested=)" + else # ! Windows + @for m in $(MKLIST); do \ + echo $$m; \ + $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \ + done + endif # ! Windows +endif # MKLIST + +all debug profile optimize install deinstall clean clobber depend rcs_info idl_stubs: ifneq ($(MKLIST),) ifeq (Windows,$(findstring Windows,$(OS))) @cmd /c "FOR /D %m IN ($(MKLIST)) DO $(MAKE) -f %m MAKEFILE=$$m $(@:.nested=)" @@ -187,7 +199,8 @@ endif # MKLIST ORBSVCS_COMPONENTS: @sh $(ACE_ROOT)/bin/ace_components --orbsvcs --set ' $(TAO_ORBSVCS) ' -realclean: + +realclean:: -$(RM) ORBSVCS_COMPONENTS.list #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile b/TAO/orbsvcs/tests/FaultTolerance/Makefile new file mode 100644 index 00000000000..be3c2fdfba8 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/Makefile @@ -0,0 +1,27 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +DIRS = IOGR \ + IOGRManipulation + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile b/TAO/orbsvcs/tests/LoadBalancing/Makefile index 2c783c404a5..8caece2700a 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Makefile +++ b/TAO/orbsvcs/tests/LoadBalancing/Makefile @@ -60,13 +60,22 @@ realclean: clean .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Hash_ReplicaC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -76,55 +85,51 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -134,14 +139,16 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -152,33 +159,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -188,56 +171,53 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -247,12 +227,46 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -260,6 +274,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -272,14 +288,13 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ @@ -287,12 +302,44 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -300,13 +347,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -319,19 +359,31 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - Hash_ReplicaC.i $(ACE_ROOT)/ace/Get_Opt.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + Hash_ReplicaC.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ $(ACE_ROOT)/ace/Stats.i \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i @@ -340,13 +392,22 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -356,55 +417,51 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -414,14 +471,16 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -432,33 +491,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -468,56 +503,53 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -527,12 +559,46 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -540,6 +606,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -552,14 +620,13 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ @@ -567,12 +634,44 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -580,13 +679,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -599,24 +691,34 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ Hash_ReplicaControl.h Hash_Replica_i.h Hash_ReplicaS.h \ Hash_ReplicaC.h Hash_ReplicaC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ @@ -634,13 +736,22 @@ realclean: clean .obj/Hash_ReplicaC.o .obj/Hash_ReplicaC.so .shobj/Hash_ReplicaC.o .shobj/Hash_ReplicaC.so: Hash_ReplicaC.cpp Hash_ReplicaC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -650,55 +761,51 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -708,14 +815,16 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -726,33 +835,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -762,56 +847,53 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -821,12 +903,46 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -834,6 +950,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -846,14 +964,13 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ @@ -861,12 +978,44 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -874,13 +1023,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -893,28 +1035,46 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ Hash_ReplicaC.i .obj/Hash_ReplicaS.o .obj/Hash_ReplicaS.so .shobj/Hash_ReplicaS.o .shobj/Hash_ReplicaS.so: Hash_ReplicaS.cpp Hash_ReplicaS.h Hash_ReplicaC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -924,55 +1084,51 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -982,14 +1138,16 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -1000,33 +1158,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -1036,56 +1170,53 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1095,12 +1226,46 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -1108,6 +1273,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -1120,14 +1287,13 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ @@ -1135,12 +1301,44 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -1148,13 +1346,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1167,21 +1358,31 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ Hash_ReplicaC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ @@ -1214,13 +1415,22 @@ realclean: clean Hash_Replica_i.h Hash_ReplicaS.h Hash_ReplicaC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1230,55 +1440,51 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1288,14 +1494,16 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -1306,33 +1514,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -1342,56 +1526,53 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1401,12 +1582,46 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -1414,6 +1629,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -1426,14 +1643,13 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ @@ -1441,12 +1657,44 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -1454,13 +1702,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1473,21 +1714,31 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ Hash_ReplicaC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ @@ -1511,8 +1762,11 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1526,52 +1780,54 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/ACE.i Hash_Replica_i.h \ - Hash_ReplicaS.h Hash_ReplicaC.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + Hash_Replica_i.h Hash_ReplicaS.h Hash_ReplicaC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1581,14 +1837,16 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -1599,33 +1857,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -1635,56 +1869,53 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1694,12 +1925,46 @@ realclean: clean $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -1707,6 +1972,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -1719,14 +1986,13 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ @@ -1734,12 +2000,44 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -1747,13 +2045,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1766,21 +2057,31 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ Hash_ReplicaC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile index 796d6a78262..2d9e16ca3be 100644 --- a/TAO/orbsvcs/tests/Makefile +++ b/TAO/orbsvcs/tests/Makefile @@ -22,12 +22,16 @@ DIRS = Simple_Naming \ Event \ CosEvent \ Concurrency \ + FaultTolerance \ ImplRepo \ InterfaceRepo \ Trading \ AVStreams \ Notify \ - Interoperable_Naming + Interoperable_Naming \ + LoadBalancing \ + ior_corbaname \ + tests_svc_loader ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/Notify/Makefile b/TAO/orbsvcs/tests/Notify/Makefile index 55f51374da2..7b641f0369b 100644 --- a/TAO/orbsvcs/tests/Notify/Makefile +++ b/TAO/orbsvcs/tests/Notify/Makefile @@ -9,7 +9,8 @@ #---------------------------------------------------------------------------- DIRS = lib \ - Basic + Basic \ + performance-tests ifndef TAO_ROOT diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile new file mode 100644 index 00000000000..e2de8d53af4 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile @@ -0,0 +1,27 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +DIRS = RedGreen \ + Throughput + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif + +#---------------------------------------------------------------------------- +# 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.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile index 388bce3faeb..be184426ce0 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile @@ -70,12 +70,14 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -84,7 +86,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -96,23 +97,29 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(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_Adapter.h \ @@ -122,21 +129,17 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -166,6 +169,8 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -178,56 +183,49 @@ realclean: clean $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ @@ -244,14 +242,15 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -260,6 +259,14 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -289,12 +296,6 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -311,10 +312,42 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -324,7 +357,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -337,22 +369,32 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ @@ -365,6 +407,7 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -409,6 +452,8 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ $(ACE_ROOT)/ace/Stats.i \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ @@ -429,12 +474,14 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -443,7 +490,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -455,23 +501,29 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(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_Adapter.h \ @@ -481,21 +533,17 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -525,6 +573,8 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -537,56 +587,49 @@ realclean: clean $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ @@ -603,14 +646,15 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -619,6 +663,14 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -648,12 +700,6 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -670,10 +716,42 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -683,7 +761,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -696,22 +773,32 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ @@ -724,6 +811,7 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -768,6 +856,8 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ $(ACE_ROOT)/ace/Stats.i \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile index 266482aa9fd..2102b1f1508 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile @@ -67,21 +67,29 @@ endif # Notify # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Latency.o .obj/Latency.so .shobj/Latency.o .shobj/Latency.so: Latency.cpp Latency.h ../lib/Notify_Test_Client.h \ +.obj/Throughput.o .obj/Throughput.so .shobj/Throughput.o .shobj/Throughput.so: Throughput.cpp Throughput.h \ + ../../lib/Notify_Test_Client.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -91,61 +99,51 @@ endif # Notify $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Thread_Hook.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(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_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -155,14 +153,16 @@ endif # Notify $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/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/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -173,33 +173,9 @@ endif # Notify $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_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/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -209,56 +185,53 @@ endif # Notify $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -268,10 +241,46 @@ endif # Notify $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -279,6 +288,8 @@ endif # Notify $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -291,14 +302,13 @@ endif # Notify $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ @@ -306,12 +316,44 @@ endif # Notify $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -319,13 +361,6 @@ endif # Notify $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -338,22 +373,32 @@ endif # Notify $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ @@ -366,6 +411,7 @@ endif # Notify $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ @@ -399,8 +445,9 @@ endif # Notify $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - ../lib/Notify_StructuredPushConsumer.h ../lib/notify_test_export.h \ - ../lib/Notify_StructuredPushSupplier.h \ + ../../lib/Notify_StructuredPushConsumer.h \ + ../../lib/notify_test_export.h \ + ../../lib/Notify_StructuredPushSupplier.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -412,6 +459,8 @@ endif # Notify $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ $(ACE_ROOT)/ace/Stats.i \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile index 8388cfa958b..5f2dd5c435c 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/Makefile +++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile @@ -63,6 +63,10 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -71,7 +75,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -83,23 +86,29 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(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_Adapter.h \ @@ -109,21 +118,17 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -153,6 +158,8 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -165,56 +172,49 @@ realclean: clean $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ @@ -231,14 +231,15 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -247,6 +248,14 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -276,12 +285,6 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -298,12 +301,42 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -313,7 +346,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -326,18 +358,27 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i corbanameC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + corbanameC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ @@ -358,6 +399,10 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -366,7 +411,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -378,23 +422,29 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(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_Adapter.h \ @@ -404,21 +454,17 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -448,6 +494,8 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -460,56 +508,49 @@ realclean: clean $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ @@ -526,14 +567,15 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -542,6 +584,14 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -571,12 +621,6 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -593,12 +637,42 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -608,7 +682,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -621,16 +694,26 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i corbanameC.i \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + corbanameC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i @@ -642,6 +725,10 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -650,7 +737,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -662,23 +748,29 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(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_Adapter.h \ @@ -688,21 +780,17 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -732,6 +820,8 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -744,56 +834,49 @@ realclean: clean $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ @@ -810,14 +893,15 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -826,6 +910,14 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -855,12 +947,6 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -877,12 +963,42 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -892,7 +1008,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -905,16 +1020,26 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i corbanameC.i + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + corbanameC.i .obj/corbanameS.o .obj/corbanameS.so .shobj/corbanameS.o .shobj/corbanameS.so: corbanameS.cpp corbanameS.h corbanameC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -923,6 +1048,10 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -931,7 +1060,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -943,23 +1071,29 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(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_Adapter.h \ @@ -969,21 +1103,17 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1013,6 +1143,8 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1025,56 +1157,49 @@ realclean: clean $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ @@ -1091,14 +1216,15 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -1107,6 +1233,14 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1136,12 +1270,6 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1158,12 +1286,42 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1173,7 +1331,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1186,18 +1343,27 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i corbanameC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + corbanameC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ @@ -1215,9 +1381,6 @@ realclean: clean $(ACE_ROOT)/ace/Pair_T.h \ $(ACE_ROOT)/ace/Pair_T.i \ $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Active_Map_Manager.h \ $(ACE_ROOT)/ace/Active_Map_Manager.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ @@ -1239,6 +1402,10 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1247,7 +1414,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1259,23 +1425,29 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(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_Adapter.h \ @@ -1285,21 +1457,17 @@ realclean: clean $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1329,6 +1497,8 @@ realclean: clean $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1341,56 +1511,49 @@ realclean: clean $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/Request_Info.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.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/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ @@ -1407,14 +1570,15 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -1423,6 +1587,14 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1452,12 +1624,6 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1474,12 +1640,42 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1489,7 +1685,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1502,18 +1697,27 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i corbanameC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + corbanameC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile b/TAO/orbsvcs/tests/tests_svc_loader/Makefile index c02cb2240dc..c745c2e223f 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile +++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile @@ -80,8 +80,11 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -95,10 +98,16 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Event_Handler.h \ @@ -106,17 +115,23 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Signal.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/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -124,20 +139,10 @@ realclean: clean $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.h \ - $(ACE_ROOT)/ace/Based_Pointer_T.i \ - $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ - $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(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/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -146,6 +151,10 @@ realclean: clean $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ + $(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/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/SString.h \ @@ -156,6 +165,9 @@ realclean: clean $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ @@ -163,13 +175,13 @@ realclean: clean $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(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 \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ @@ -181,16 +193,6 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/IOR_LookupTable.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_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -200,25 +202,21 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/Interceptor.h \ - $(TAO_ROOT)/tao/InterceptorC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/InterceptorC.i \ - $(TAO_ROOT)/tao/Interceptor.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/PolicyC.i \ @@ -228,59 +226,29 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/GIOP_Message_Base.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/Object_Adapter.h \ - $(TAO_ROOT)/tao/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServerC.i \ - $(TAO_ROOT)/tao/Key_Adapters.i \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Active_Object_Map.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - $(TAO_ROOT)/tao/Object_Adapter.i \ - $(TAO_ROOT)/tao/POAManager.h \ - $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -293,7 +261,24 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(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/Thread_Manager.i \ + $(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_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -301,6 +286,8 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ @@ -313,44 +300,70 @@ realclean: clean $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/DynAnyC.h \ - $(TAO_ROOT)/tao/DynAnyC.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(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/Stub.i \ $(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/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/Priority_Mapping.i \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ @@ -358,25 +371,24 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ - $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/MessagingS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/tao/MessagingS_T.h \ - $(TAO_ROOT)/tao/MessagingS_T.i \ - $(TAO_ROOT)/tao/MessagingS_T.cpp \ - $(TAO_ROOT)/tao/MessagingS.i + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 2832feba170..1b065ae50bc 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -45,7 +45,10 @@ DIRS = CDR \ LongUpcalls \ RTCORBA \ Forwarding \ - Exposed_Policies + Exposed_Policies \ + Smart_Proxies \ + QtTests \ + ior_corbaloc ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/tests/QtTests/Makefile b/TAO/tests/QtTests/Makefile index af848f643d0..f50dc6a1b97 100755 --- a/TAO/tests/QtTests/Makefile +++ b/TAO/tests/QtTests/Makefile @@ -83,13 +83,14 @@ realclean: clean .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -98,7 +99,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -218,6 +218,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -236,8 +238,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -349,8 +349,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -359,6 +357,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -368,7 +370,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -400,19 +401,40 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - testC.i $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i + testC.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + client.h \ + $(TAO_ROOT)/tao/qt_resource.h \ + $(TAO_ROOT)/tao/default_resource.h \ + $(TAO_ROOT)/tao/default_resource.i \ + $(ACE_ROOT)/ace/QtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(TAO_ROOT)/tao/qt_resource.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -421,7 +443,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -541,6 +562,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -559,8 +582,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -672,8 +693,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -682,6 +701,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -691,7 +714,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -733,20 +755,39 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - testS_T.h testS_T.i testS_T.cpp testS.i \ + testS_T.h testS_T.i testS_T.cpp testS.i test_i.i \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/qt_resource.h \ + $(TAO_ROOT)/tao/default_resource.h \ + $(TAO_ROOT)/tao/default_resource.i \ + $(ACE_ROOT)/ace/QtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(TAO_ROOT)/tao/qt_resource.i .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -755,7 +796,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -875,6 +915,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -893,8 +935,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1006,8 +1046,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -1016,6 +1054,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1025,7 +1067,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1067,18 +1108,19 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - testS_T.h testS_T.i testS_T.cpp testS.i + testS_T.h testS_T.i testS_T.cpp testS.i test_i.i .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1087,7 +1129,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1207,6 +1248,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -1225,8 +1268,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1338,8 +1379,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -1348,6 +1387,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1357,7 +1400,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1394,13 +1436,14 @@ realclean: clean .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1409,7 +1452,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1529,6 +1571,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -1547,8 +1591,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1660,8 +1702,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -1670,6 +1710,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1679,7 +1723,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 9a2948d4a68..74a2e0b972d 100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(QtTests, client, "$Id$") #if !defined (ACE_HAS_QT) -int +int main (int, char *[]) { ACE_ERROR ((LM_INFO, @@ -22,9 +22,9 @@ main (int, char *[]) int main (int argc, char *argv[]) { - QApplication app (argc, argv); + QApplication app (argc, argv); TAO_QtResource_Factory::set_context (&app); - + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -118,16 +118,16 @@ Client::create_widgets (CORBA::Environment &/*ACE_TRY_ENV*/) { // Ewsize the box this->box_.resize (200,120); - + // Make a pushbutton widget ACE_NEW (this->push_button_, - QPushButton ("Quit", + QPushButton ("Quit", &this->box_)); // Connect the click () SIGNAL routine with the SLOT handler that we // have defined - QObject::connect (this->push_button_, - SIGNAL (clicked()), + QObject::connect (this->push_button_, + SIGNAL (clicked()), this, SLOT (shutdown_call ())); @@ -136,7 +136,7 @@ Client::create_widgets (CORBA::Environment &/*ACE_TRY_ENV*/) QSlider (QSlider::Horizontal, &this->box_, "Slider")); - + // Add resource for the slider this->slider_->setRange (0, 99); this->slider_->setValue (0); @@ -144,10 +144,10 @@ Client::create_widgets (CORBA::Environment &/*ACE_TRY_ENV*/) // Connect the valuechanged SIGNAL routine with the slot that we // have defined. THe slot routine would invoke the remote call. QObject::connect (this->slider_, - SIGNAL (valueChanged (int)), + SIGNAL (valueChanged (int)), this, SLOT (remote_call (int))); - + } void diff --git a/TAO/tests/Xt_Stopwatch/Makefile b/TAO/tests/Xt_Stopwatch/Makefile index 3179fb21572..a252b7391e2 100644 --- a/TAO/tests/Xt_Stopwatch/Makefile +++ b/TAO/tests/Xt_Stopwatch/Makefile @@ -61,13 +61,14 @@ realclean: clean .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -76,7 +77,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -196,6 +196,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -214,8 +216,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -327,8 +327,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -337,6 +335,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -346,7 +348,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -378,19 +379,40 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - testC.i $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i + testC.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + Control.h Client.h \ + $(TAO_ROOT)/tao/xt_resource.h \ + $(TAO_ROOT)/tao/default_resource.h \ + $(TAO_ROOT)/tao/default_resource.i \ + $(ACE_ROOT)/ace/XtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(TAO_ROOT)/tao/xt_resource.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -399,7 +421,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -519,6 +540,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -537,8 +560,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -650,8 +671,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -660,6 +679,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -669,7 +692,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -712,19 +734,39 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ testS_T.h testS_T.i testS_T.cpp testS.i timer.h Stopwatch_display.h \ + test_i.i \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/xt_resource.h \ + $(TAO_ROOT)/tao/default_resource.h \ + $(TAO_ROOT)/tao/default_resource.i \ + $(ACE_ROOT)/ace/XtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(TAO_ROOT)/tao/xt_resource.i .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -733,7 +775,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -853,6 +894,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -871,8 +914,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -984,8 +1025,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -994,6 +1033,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1003,7 +1046,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1045,18 +1087,20 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - testS_T.h testS_T.i testS_T.cpp testS.i timer.h Stopwatch_display.h + testS_T.h testS_T.i testS_T.cpp testS.i timer.h Stopwatch_display.h \ + test_i.i .obj/Stopwatch_display.o .obj/Stopwatch_display.so .shobj/Stopwatch_display.o .shobj/Stopwatch_display.so: Stopwatch_display.cpp Stopwatch_display.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1065,7 +1109,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1185,6 +1228,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -1203,8 +1248,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1316,8 +1359,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -1326,6 +1367,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1335,7 +1380,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1371,13 +1415,14 @@ realclean: clean .obj/Control.o .obj/Control.so .shobj/Control.o .shobj/Control.so: Control.cpp Control.h Client.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1386,7 +1431,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1506,6 +1550,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -1524,8 +1570,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1637,8 +1681,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -1647,6 +1689,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1656,7 +1702,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1688,20 +1733,37 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - testC.i $(TAO_ROOT)/tao/xt_resource.h \ + testC.i \ + $(TAO_ROOT)/tao/xt_resource.h \ $(TAO_ROOT)/tao/default_resource.h \ - $(TAO_ROOT)/tao/default_resource.i + $(TAO_ROOT)/tao/default_resource.i \ + $(ACE_ROOT)/ace/XtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.h \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Select_Reactor_Base.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(TAO_ROOT)/tao/xt_resource.i .obj/timer.o .obj/timer.so .shobj/timer.o .shobj/timer.so: timer.cpp timer.h Stopwatch_display.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1710,7 +1772,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1830,6 +1891,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -1848,8 +1911,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1961,8 +2022,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -1971,6 +2030,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1980,7 +2043,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -2016,13 +2078,14 @@ realclean: clean .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -2031,7 +2094,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -2151,6 +2213,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -2169,8 +2233,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -2282,8 +2344,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -2292,6 +2352,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2301,7 +2365,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -2338,13 +2401,14 @@ realclean: clean .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -2353,7 +2417,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -2473,6 +2536,8 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -2491,8 +2556,6 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -2604,8 +2667,6 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ @@ -2614,6 +2675,10 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2623,7 +2688,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ diff --git a/TAO/tests/ior_corbaloc/Makefile b/TAO/tests/ior_corbaloc/Makefile index ef12812bb07..95085ddacb0 100644 --- a/TAO/tests/ior_corbaloc/Makefile +++ b/TAO/tests/ior_corbaloc/Makefile @@ -64,6 +64,9 @@ realclean: clean $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -72,7 +75,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -192,28 +194,16 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ $(TAO_ROOT)/tao/Pluggable_Messaging.i \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -315,6 +305,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -325,6 +325,16 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ @@ -336,7 +346,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -364,8 +373,6 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ @@ -393,6 +400,9 @@ realclean: clean $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -401,7 +411,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -521,28 +530,16 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ $(TAO_ROOT)/tao/Pluggable_Messaging.i \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -644,6 +641,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -654,6 +661,16 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ @@ -665,7 +682,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -693,8 +709,6 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ @@ -712,6 +726,9 @@ realclean: clean $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -720,7 +737,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -840,28 +856,16 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ $(TAO_ROOT)/tao/Pluggable_Messaging.i \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -963,6 +967,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -973,6 +987,16 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ @@ -984,7 +1008,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1012,8 +1035,6 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ @@ -1028,6 +1049,9 @@ realclean: clean $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1036,7 +1060,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1156,28 +1179,16 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ $(TAO_ROOT)/tao/Pluggable_Messaging.i \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -1279,6 +1290,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -1289,6 +1310,16 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ @@ -1300,7 +1331,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1328,8 +1358,6 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ @@ -1375,6 +1403,9 @@ realclean: clean $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1383,7 +1414,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1503,28 +1533,16 @@ realclean: clean $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ $(TAO_ROOT)/tao/Pluggable_Messaging.i \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ @@ -1626,6 +1644,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -1636,6 +1664,16 @@ realclean: clean $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ @@ -1647,7 +1685,6 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -1675,8 +1712,6 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ |