diff options
author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-15 05:26:25 +0000 |
---|---|---|
committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-15 05:26:25 +0000 |
commit | 06d9080b2ab6c35e7346c3c44cc4edbc0a61bea9 (patch) | |
tree | 7333b13696ca6fe1fea620d2f3a5cb67da93d931 /TAO | |
parent | 399c4ba179fc38b4e85846edc8af141d87e4bd1d (diff) | |
download | ATCD-06d9080b2ab6c35e7346c3c44cc4edbc0a61bea9.tar.gz |
This commit was manufactured by cvs2svn to create tag 'TAO-0_1_21'.TAO-0_1_21
Diffstat (limited to 'TAO')
354 files changed, 0 insertions, 59250 deletions
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/Makefile b/TAO/Benchmark/Marshal_Test/Orbix/Makefile deleted file mode 100644 index 0c40916fb67..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/Makefile +++ /dev/null @@ -1,75 +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 - -BUILD = $(BIN) - -#CLIENT_LIBS = -lITini -liiop -lorbix -#SERVER_LIBS = -lITini -liiop -lDSI -lorbix -lIRclt -CLIENT_LIBS = -liiop -lorbix -SERVER_LIBS = -liiop -lDSI -lorbix -lIRclt - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -# include Orbix specific file -include /project/mambo/gokhale/CONFIG/orbixsol2s4.mk - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -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 -f 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 80c62f5e6a7..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "orbix_marshal_client.h" - -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 c4791df7661..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h +++ /dev/null @@ -1,1327 +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 a42fee980f7..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp +++ /dev/null @@ -1,1336 +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__ */ - -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 9fce90ef265..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 -// -// ============================================================================ - -#if !defined(_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 6ef34f0d8bd..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp +++ /dev/null @@ -1,311 +0,0 @@ -// $Id$ - -#include "orbix_marshal_impl.h" - -#if !defined (__ACE_INLINE__) -#include "orbix_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -// 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 a74866173d8..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h +++ /dev/null @@ -1,191 +0,0 @@ -// $Id$ - -#if !defined (ORBIX_MARSHAL_IMPL_H) -#define ORBIX_MARSHAL_IMPL_H - -// to include DSI related files - -#include "ace/OS.h" - -#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 33ea3dcd535..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp +++ /dev/null @@ -1,95 +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__ */ - -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 09a64b4bbc8..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 -// -// ============================================================================ - -#if !defined(_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 510ee107a5e..00000000000 --- a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "orbix_marshal_server.h" - -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 048d0705dbc..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/Makefile +++ /dev/null @@ -1,64 +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 - -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -I$(TAO_ROOT)/tao/compat -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 -f 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 9edd07784db..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/client.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "tao_marshal_client.h" - -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 1557f836df9..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp +++ /dev/null @@ -1,587 +0,0 @@ -// $Id$ - -#include <stdio.h> -#include "marshalC.h" - -// constructor -Marshal::Marshal(STUB_Object *refdata) - : CORBA_Object(refdata) -{ -} - -// static duplicate method -Marshal_ptr Marshal::_duplicate(Marshal_ptr obj) -{ - void *dupl; - - if (obj) - { - obj->AddRef(); - } - return obj; -} - -// static _narrow method -Marshal_ptr Marshal::_narrow(CORBA_Object_ptr obj) -{ - CORBA_Environment env; - if (obj->_is_a("IDL:Marshal:1.0", env)){ - STUB_Object *istub; - if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR){ - return Marshal::_nil(); - } - Marshal_ptr new_obj = new Marshal(istub); - return Marshal::_duplicate(new_obj); - } - return Marshal::_nil(); -} - -Marshal_ptr Marshal::_nil() -{ - return (Marshal_ptr)NULL; -} - -Marshal::Marshal_Union::Marshal_Union(const Marshal::Marshal_Union& obj) -{ - _disc = obj._d(); - switch (_disc) { - case e_0th: - __s = obj.__s; - break; - case e_1st: - __l = obj.__l; - break; - case e_2nd: - __c = obj.__c; - break; - case e_3rd: - __o = obj.__o; - break; - case e_4th: - __d = obj.__d; - break; - case e_5th: - default: - __ms = obj.__ms; - break; - } -} - -Marshal::Marshal_Union& Marshal::Marshal_Union::operator=(const Marshal::Marshal_Union& obj) -{ - _disc = obj._d(); - switch (_disc) { - case e_0th: - __s = obj.__s; - break; - case e_1st: - __l = obj.__l; - break; - case e_2nd: - __c = obj.__c; - break; - case e_3rd: - __o = obj.__o; - break; - case e_4th: - __d = obj.__d; - break; - case e_5th: - default: - __ms = obj.__ms; - break; - } - return *this; -} - -// AnySeq methods -Marshal::AnySeq::AnySeq (CORBA_ULong max) - : _maximum(max), - _length(0), - _release(CORBA_B_FALSE) -{ - if (this->_maximum > 0){ - this->_buffer = new CORBA_Any [this->_maximum]; - } else { - this->_buffer = 0; - } -} - -Marshal::AnySeq::AnySeq (CORBA_ULong max, CORBA_ULong length, - CORBA_Any *value, CORBA_Boolean release) - : _maximum(max), - _length(length), - _buffer(value), - _release(release) -{ -} - -Marshal::AnySeq::~AnySeq() -{ - this->_maximum = this->_length = 0; - if (this->_release != CORBA_B_FALSE) - delete this->_buffer; -} - -void Marshal::AnySeq::length (CORBA_ULong newlen) -{ - if (newlen > this->_maximum) { - CORBA_Any *temp = new CORBA_Any [newlen]; - ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof (CORBA_Any))); - if (this->_release) - delete this->_buffer; - else - this->_release = 1; - - this->_maximum = newlen; - this->_buffer = temp; - } - if (newlen > this->_length) - memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) * - sizeof(CORBA_Any)); - this->_length = newlen; -} - -CORBA_ULong Marshal::AnySeq::length() const -{ - return this->_length; -} - -CORBA_Any &Marshal::AnySeq::operator[](CORBA_ULong index) -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -const CORBA_Any& Marshal::AnySeq::operator[](CORBA_ULong index) const -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - - -/***************** TypeCodes **************/ -// In the typecode, all repoIDs and names are omitted by providing their length -// as 1 that stands for the NULL terminator - -// encapsulated parameters for struct Marshal_Struct typecode -static const CORBA_Long _oc_Marshal_Struct [] = { - MY_BYTE_SEX, // byte order - 1, 0, // repoID omitted (16, "IDL:Marshal/Marshal:1.0") - 1, 0, // struct name (15, "Marshal_Struct") omitted - 5, // 5 struct elements - - // short - 1, 0, // should be 2, "s", - tk_short, - - // long - 1, 0, // should be 2, "l", - tk_long, - - // char - 1, 0, // should be 2, "c", - tk_char, - - // octet - 1, 0, // should be 2, "o", - tk_octet, - - // double - 1, 0, // should be 2, "d", - tk_double, -}; - - -static CORBA_TypeCode _tc__tc_Marshal_Struct (tk_struct, - sizeof _oc_Marshal_Struct, - (unsigned char *) &_oc_Marshal_Struct, - CORBA_B_FALSE); -CORBA_TypeCode_ptr Marshal::_tc_Marshal_Struct = &_tc__tc_Marshal_Struct; - - -static const CORBA_Long _oc_discrim [] = { - MY_BYTE_SEX, // byte order flag (TRICKY) - 1, 0, // should be 20, "IDL:Marshal/discrim", - 1, 0, // should be 8, "discrim", - 7, // 7 elements in the enum - - 1, 0, // 6, "e_0th", // omitted member name, "e_0th" - 1, 0, // 6, "e_1st", // omitted member name, "e_1st" - 1, 0, // 6, "e_2nd", // omitted member name, "e_2nd" - 1, 0, // 6, "e_3rd", // omitted member name, "e_3rd" - 1, 0, // 6, "e_4th", // omitted member name, "e_4th" - 1, 0, // 6, "e_5th", // omitted member name, "e_5th" - 1, 0 //6, "e_6th" // omitted member name, "e_6th" -}; - -static CORBA_TypeCode _tc__tc_discrim (tk_enum, - sizeof _oc_discrim, - (unsigned char *) &_oc_discrim, - CORBA_B_FALSE); - -CORBA_TypeCode_ptr Marshal::_tc_discrim = &_tc__tc_discrim; - -// Union -static const CORBA_Long _oc_Marshal_Union [] = -{ - MY_BYTE_SEX, // byte order flag (TRICKY) - 1, 0, // 26, "IDL:Marshal/Marshal_Union", // omitted repository/type ID - 1, 0, // 14, "Marshal_Union", // union name - - // - // discriminant typecode: - // - - tk_enum, // tk_enum - 80, // encapsulation length - MY_BYTE_SEX, - 1, 0, // repoID - 1, 0, // name - 7, // 7 elements in the enum - - 1, 0, // e_Oth - 1, 0, - 1, 0, - 1, 0, - 1, 0, - 1, 0, - 1, 0, // e_6th - - 5, // default member index (zero based) - 6, // number of union members - - // the 1st union branch arm - Marshal::e_0th, // member label value - 1, 0, // omitted member name, "s" - tk_short, // member typecode - - // the 2nd union branch arm - Marshal::e_1st, // member label value - 1, 0, // omitted member name, "l" - tk_long, // member typecode - - // the 3rd union branch arm - Marshal::e_2nd, // member label value - 1, 0, // omitted member name, "c" - tk_char, // member typecode - - // the 4th union branch arm - Marshal::e_3rd, // member label value - 1, 0, // omitted member name, "o" - tk_octet, // member typecode - - // the 5th union branch arm - Marshal::e_4th, // member label value - 1, 0, // omitted member name, "d" - tk_double, - - // the 6th union branch - Marshal::e_5th, // member label value - 1, 0, // omitted member name, "ms" - tk_struct, // tk_struct - 84, // encapsulation length - - MY_BYTE_SEX, // byte order - 1, 0, // repoID omitted (16, "IDL:Marshal/Marshal:1.0") - 1, 0, // struct name (15, "Marshal_Struct") omitted - 5, // 5 struct elements - - // short - 1, 0, // should be 2, "s", - tk_short, - - // long - 1, 0, // should be 2, "l", - tk_long, - - // char - 1, 0, // should be 2, "c", - tk_char, - - // octet - 1, 0, // should be 2, "o", - tk_octet, - - // double - 1, 0, // should be 2, "d", - tk_double, - - // default case - 6, // 7th member, default index val - 1, 0, // struct name "ms" - ~0, // indirected typecode - -108 // has to point to tk_struct in this stream -}; - -static CORBA_TypeCode _tc__tc_Marshal_Union (tk_union, - sizeof _oc_Marshal_Union, - (unsigned char *) &_oc_Marshal_Union, - CORBA_B_FALSE); - -CORBA_TypeCode_ptr Marshal::_tc_Marshal_Union = &_tc__tc_Marshal_Union; - -// AnySeq -static const CORBA_Long _oc_AnySeq [] = { - MY_BYTE_SEX, // byte order - tk_any, // sequence of any - 0, // a length of 0 => unbounded sequence -}; -static CORBA_TypeCode _tc__tc_AnySeq (tk_sequence, - sizeof - _oc_AnySeq, - (unsigned char *) - &_oc_AnySeq, - CORBA_B_FALSE); - -CORBA_TypeCode_ptr Marshal::_tc_AnySeq = &_tc__tc_AnySeq; - -/***************** All the methods ********************/ -// test_short -static const TAO_Param_Data marshal_test_short_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {_tc_CORBA_Short, PARAM_IN, 0}, - {_tc_CORBA_Short, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_short_calldata = { - "test_short", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_short_paramdata [0], // - 0, 0 -}; - -// The stub -void Marshal::test_short (CORBA_Short s1, CORBA_Short &s2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call(env, &marshal_test_short_calldata, 0, &s1, &s2); -} - -// test_long -static const TAO_Param_Data marshal_test_long_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {_tc_CORBA_Long, PARAM_IN, 0}, - {_tc_CORBA_Long, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_long_calldata = { - "test_long", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_long_paramdata [0], // - 0, 0 -}; - -// The stub -void Marshal::test_long (CORBA_Long l1, CORBA_Long &l2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call(env, &marshal_test_long_calldata, 0, &l1, &l2); -} - -// test_octet -static const TAO_Param_Data marshal_test_octet_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {_tc_CORBA_Octet, PARAM_IN, 0}, - {_tc_CORBA_Octet, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_octet_calldata = { - "test_octet", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_octet_paramdata [0], // - 0, 0 -}; - -// The stub -void Marshal::test_octet (CORBA_Octet o1, CORBA_Octet &o2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call(env, &marshal_test_octet_calldata, 0, &o1, &o2); -} - -// test_char -static const TAO_Param_Data marshal_test_char_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {_tc_CORBA_Char, PARAM_IN, 0}, - {_tc_CORBA_Char, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_char_calldata = { - "test_char", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_char_paramdata [0], // - 0, 0 -}; - -// The stub -void Marshal::test_char (CORBA_Char c1, CORBA_Char &c2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call(env, &marshal_test_char_calldata, 0, &c1, &c2); -} - -// test_double -static const TAO_Param_Data marshal_test_double_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {_tc_CORBA_Double, PARAM_IN, 0}, - {_tc_CORBA_Double, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_double_calldata = { - "test_double", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_double_paramdata [0], // - 0, 0 -}; - -// The stub -void Marshal::test_double (CORBA_Double d1, CORBA_Double &d2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call (env, &marshal_test_double_calldata, 0, &d1, &d2); -} - -// test_struct -static const TAO_Param_Data marshal_test_struct_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {Marshal::_tc_Marshal_Struct, PARAM_IN, 0}, - {Marshal::_tc_Marshal_Struct, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_struct_calldata = { - "test_struct", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_struct_paramdata [0], // - 0, 0 -}; - -// The stub -void Marshal::test_struct (const Marshal::Marshal_Struct &ms1, Marshal::Marshal_Struct - &ms2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call(env, &marshal_test_struct_calldata, 0, &ms1, &ms2); -} - -// test_union -static const TAO_Param_Data marshal_test_union_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {Marshal::_tc_Marshal_Union, PARAM_IN, 0}, - {Marshal::_tc_Marshal_Union, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_union_calldata = { - "test_union", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_union_paramdata [0], // - 0, 0 -}; - -// The stub -void Marshal::test_union (const Marshal_Union &u1, Marshal::Marshal_Union - &u2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call (env, &marshal_test_union_calldata, 0, &u1, &u2); -} - -// test_any -static const TAO_Param_Data marshal_test_any_paramdata [] = { - {_tc_CORBA_Void, PARAM_RETURN, 0}, - {_tc_CORBA_Any, PARAM_IN, 0}, - {_tc_CORBA_Any, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_any_calldata = { - "test_any", // op_name - CORBA_B_TRUE, // twoway, although it returns void - 3, // param count - & marshal_test_any_paramdata[0], // - 0, 0 -}; - -// The stub -void Marshal::test_any (const CORBA_Any &a1, CORBA_Any *&a2, CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call(env, &marshal_test_any_calldata, 0, &a1, &a2); -} - -// test_sequence -static const TAO_Param_Data marshal_test_sequence_paramdata [] = { - { _tc_CORBA_Void, PARAM_RETURN, 0}, - { Marshal::_tc_AnySeq, PARAM_IN, 0}, - { Marshal::_tc_AnySeq, PARAM_OUT, 0} -}; - -static const TAO_Call_Data marshal_test_sequence_calldata = { - "test_sequence", // opname - CORBA_B_TRUE, // twoway - 2, // param count - &marshal_test_sequence_paramdata [0], - 0, 0 -}; - -// stub -void Marshal::test_sequence (const Marshal::AnySeq &as1, Marshal::AnySeq *&as2, - CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - // twoway - istub->do_call(env, &marshal_test_sequence_calldata, 0, &as1, &as2); -} - diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h b/TAO/Benchmark/Marshal_Test/TAO/marshalC.h deleted file mode 100644 index d45d3cf0611..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h +++ /dev/null @@ -1,196 +0,0 @@ -// $Id$ - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of TAO -***************************************************************************/ - -#ifndef MARSHAL_C_H -#define MARSHAL_C_H - -#include <stdlib.h> -#include <string.h> - -#include "tao/orb.h" -#include "tao/orbobj.h" -#include "tao/object.h" -#include "tao/stub.h" -#include "tao/typecode.h" -#include "tao/cdr.h" - -class Marshal; -typedef Marshal *Marshal_ptr; -typedef Marshal_ptr MarshalRef; - -class Marshal: public virtual CORBA_Object -{ -public: - static Marshal_ptr _duplicate (Marshal_ptr obj); - static Marshal_ptr _narrow (CORBA_Object_ptr obj); - static Marshal_ptr _nil (); - - struct Marshal_Struct { - CORBA_Short s; - CORBA_Long l; - CORBA_Char c; - CORBA_Octet o; - CORBA_Double d; - }; - static CORBA_TypeCode_ptr _tc_Marshal_Struct; - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th, - e_6th - }; - - static CORBA_TypeCode_ptr _tc_discrim; - - class Marshal_Union - { - private: - discrim _disc; - CORBA_Short __s; - CORBA_Long __l; - CORBA_Char __c; - CORBA_Octet __o; - CORBA_Double __d; - Marshal::Marshal_Struct __ms; - public: - Marshal_Union() : _disc(discrim(0)) {} - ~Marshal_Union() {} - Marshal_Union(const Marshal_Union& obj); - Marshal_Union& operator=(const Marshal_Union& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void s(CORBA_Short val) { - __s = val; - _disc = Marshal::e_0th; - } - CORBA_Short s() const { return __s; } - - void l(CORBA_Long val) { - __l = val; - _disc = Marshal::e_1st; - } - CORBA_Long l() const { return __l; } - - void c(CORBA_Char val) { - __c = val; - _disc = Marshal::e_2nd; - } - CORBA_Char c() const { return __c; } - - void o(CORBA_Octet val) { - __o = val; - _disc = Marshal::e_3rd; - } - CORBA_Octet o() const { return __o; } - - void d(CORBA_Double val) { - __d = val; - _disc = Marshal::e_4th; - } - CORBA_Double d() const { return __d; } - - void ms(const Marshal::Marshal_Struct& val) { - __ms = val; - _disc = Marshal::e_5th; - } - const Marshal::Marshal_Struct& ms() const { return __ms; } - Marshal::Marshal_Struct& ms() { return __ms; } - - }; - - static CORBA_TypeCode_ptr _tc_Marshal_Union; - - class AnySeq - { - public: - static CORBA_Any *allocbuf (CORBA_ULong nelems); - static void freebuf (CORBA_Any *data); - AnySeq (CORBA_ULong max=0); - AnySeq (CORBA_ULong max, - CORBA_ULong length, - CORBA_Any *value, - CORBA_Boolean release = CORBA_B_FALSE - ); - // AnySeq (const AnySeq&); - ~AnySeq (); - CORBA_ULong maximum () const; - void length (CORBA_ULong); - CORBA_ULong length () const; - CORBA_Any &operator[] (CORBA_ULong index); - const CORBA_Any &operator[] (CORBA_ULong index) const; - private: - CORBA_ULong _maximum; - CORBA_ULong _length; - CORBA_Any *_buffer; - CORBA_Boolean _release; - }; - static CORBA_TypeCode_ptr _tc_AnySeq; - - - // now the methods - virtual void test_short(CORBA_Short s1, - CORBA_Short& s2, - CORBA_Environment &env); - - virtual void test_long(CORBA_Long l1, - CORBA_Long& l2, - CORBA_Environment &env); - - virtual void test_octet(CORBA_Octet o1, - CORBA_Octet& o2, - CORBA_Environment &env); - - virtual void test_char(CORBA_Char c1, - CORBA_Char& c2, - CORBA_Environment &env); - - virtual void test_double(CORBA_Double d1, - CORBA_Double& d2, - CORBA_Environment &env); - - virtual void test_struct(const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA_Environment &env); - - virtual void test_union(const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA_Environment &env); - - virtual void test_any(const CORBA_Any& a1, - CORBA_Any *& a2, - CORBA_Environment &env); - - virtual void test_sequence(const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2, - CORBA_Environment &env); - -#if 0 - virtual void test_recursive(const Marshal::Marshal_Recursive& mr1, - Marshal::Marshal_Recursive *& mr2, - CORBA_Environment &env); -#endif - -protected: - Marshal() {} - Marshal(STUB_Object *refdata); - virtual ~Marshal() {} - -private: - Marshal(const Marshal &) {} - void operator=(const Marshal &) {} -}; - -#endif - - - - diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp deleted file mode 100644 index fe116a642b0..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp +++ /dev/null @@ -1,170 +0,0 @@ -// $Id$ - -#include <iostream.h> -#include "marshalS.h" - -static const TAO_operation_db_entry Marshal_operations[] = { - {"_is_a", &_skel_Marshal::_Marshal_is_a_skel}, - { "test_short", &_skel_Marshal::_Marshal_test_short_skel}, - { "test_long", &_skel_Marshal::_Marshal_test_long_skel}, - { "test_octet", &_skel_Marshal::_Marshal_test_octet_skel}, - { "test_char", &_skel_Marshal::_Marshal_test_char_skel}, - { "test_double", &_skel_Marshal::_Marshal_test_double_skel}, - { "test_struct", &_skel_Marshal::_Marshal_test_struct_skel}, - { "test_union", &_skel_Marshal::_Marshal_test_union_skel}, - { "test_any", &_skel_Marshal::_Marshal_test_any_skel}, - { "test_sequence", &_skel_Marshal::_Marshal_test_sequence_skel}, - { 0, 0 } -}; - -TAO_Dynamic_Hash_OpTable tao_Marshal_optable(Marshal_operations, 10, - // 9 + 1 operations on our - // interface - 20); -// constructor -_skel_Marshal::_skel_Marshal (const char *obj_name) -{ - const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID - IIOP_Object *data; // IIOP object - CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA - this->optable_ = &tao_Marshal_optable; // operation database - CORBA_Long i; - - // setup an IIOP object - data = new IIOP_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 -} - -// skeletons -void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -#if 0 - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value(_tc_CORBA_Short); - Marshal_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - Marshal::ShortSeq *value = (Marshal::ShortSeq *)nv->value()->value(); - - // now invoke the implementation - impl = (Marshal_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->sendShortSeq(*value, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -#endif - - // One immediate thought is to do the following: - // define a specialized marshal factory derived from TAO_Marshal_Factory - // then: - // CDR compiledStream (req._incoming.next, req._incoming.remaining, - // byte_order, consume_buf = 0, instance of our marshal factory -} - -void _skel_Marshal::_Marshal_test_long_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_Marshal_test_octet_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_Marshal_test_char_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_Marshal_test_double_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_Marshal_test_struct_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_Marshal_test_union_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_Marshal_test_any_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ -} - -void _skel_Marshal::_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 (CORBA_B_TRUE); - else - retval = new CORBA_Boolean (CORBA_B_FALSE); - - CORBA_Any *any = - new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "_is_a, result"); -} - diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h b/TAO/Benchmark/Marshal_Test/TAO/marshalS.h deleted file mode 100644 index 4f34a11d0ab..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h +++ /dev/null @@ -1,110 +0,0 @@ -// $Id$ - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of TAO -***************************************************************************/ - -#ifndef MARSHAL_S_H -#define MARSHAL_S_H - -#include <stdlib.h> -#include <string.h> - -#include "marshalC.h" -#include "tao/connect.h" -#include "tao/orb.h" -#include "tao/params.h" -#include "tao/iiopobj.h" -#include "tao/optable.h" // for registering our methods -#include "tao/corbacom.h" -#include "tao/nvlist.h" -#include "tao/orbobj.h" -#include "tao/debug.h" - - -class _skel_Marshal; -typedef _skel_Marshal *_skel_Marshal_ptr; -typedef _skel_Marshal *_skel_Marshal_ref; - -class _skel_Marshal: public Marshal -{ -public: - // pure virtual functions implemented by the implementation class - virtual void test_short(CORBA_Short s1, - CORBA_Short& s2, - CORBA_Environment &env) = 0; - - virtual void test_long(CORBA_Long l1, - CORBA_Long& l2, - CORBA_Environment &env) = 0; - - virtual void test_octet(CORBA_Octet o1, - CORBA_Octet& o2, - CORBA_Environment &env) = 0; - - virtual void test_char(CORBA_Char c1, - CORBA_Char& c2, - CORBA_Environment &env) = 0; - - virtual void test_double(CORBA_Double d1, - CORBA_Double& d2, - CORBA_Environment &env) = 0; - - virtual void test_struct(const Marshal::Marshal_Struct& ms1, - Marshal::Marshal_Struct& ms2, - CORBA_Environment &env) = 0; - - virtual void test_union(const Marshal::Marshal_Union& u1, - Marshal::Marshal_Union& u2, - CORBA_Environment &env) = 0; - - virtual void test_any(const CORBA_Any& a1, - CORBA_Any *& a2, - CORBA_Environment &env) = 0; - - virtual void test_sequence(const Marshal::AnySeq& as1, - Marshal::AnySeq *& as2, - CORBA_Environment &env) = 0; - - - // 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); -protected: - _skel_Marshal (const char *obj_name = 0); - virtual ~_skel_Marshal () {} -}; - -#endif - - - - diff --git a/TAO/Benchmark/Marshal_Test/TAO/server.cpp b/TAO/Benchmark/Marshal_Test/TAO/server.cpp deleted file mode 100644 index 53102d6e189..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/server.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "tao_marshal_server.h" - -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 bd678bfad9a..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp +++ /dev/null @@ -1,1426 +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__ */ - -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, CORBA_B_FALSE), - 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, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - 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, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("o2", CORBA_Any (_tc_CORBA_Octet, &o2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("c2", CORBA_Any (_tc_CORBA_Char, &c2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("d2", CORBA_Any (_tc_CORBA_Double, &d2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("ms2", CORBA_Any (Marshal::_tc_Marshal_Struct, &ms2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("a2", CORBA_Any (_tc_CORBA_Any, a2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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, CORBA_B_FALSE), - CORBA_ARG_IN, env); - arglist->add_value ("o2", CORBA_Any (Marshal::_tc_AnySeq, as2, CORBA_B_FALSE), - CORBA_ARG_OUT, env); - 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, 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 d7b8269b2c2..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 -// -// ============================================================================ - -#if !defined(_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 d4d555d5dee..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp +++ /dev/null @@ -1,652 +0,0 @@ -// $Id$ - -#include "tao_marshal_impl.h" - -#if !defined (__ACE_INLINE__) -#include "tao_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -// 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 - IIOP_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 IIOP_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 (CORBA_B_TRUE); - else - retval = new CORBA_Boolean (CORBA_B_FALSE); - - CORBA_Any *any = - new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE); - - 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, CORBA_B_TRUE); - 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, CORBA_B_TRUE); - 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, CORBA_B_TRUE); - 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, CORBA_B_TRUE); - 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, CORBA_B_TRUE); - 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, CORBA_B_TRUE); - // 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, CORBA_B_TRUE); - // 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, CORBA_B_TRUE); - // 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, CORBA_B_TRUE); - // 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 dab7e662d74..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h +++ /dev/null @@ -1,192 +0,0 @@ -// $Id$ - -#if !defined (TAO_MARSHAL_IMPL_H) -#define TAO_MARSHAL_IMPL_H - -// to include DSI related files - -#include "ace/OS.h" - -#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 fea710364a6..00000000000 --- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp +++ /dev/null @@ -1,112 +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__ */ - -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 8bd965301ff..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 -// -// ============================================================================ - -#if !defined(_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 93cfc461a32..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile +++ /dev/null @@ -1,64 +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 - -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -# include VisiBroker specific file -include /project/mambo/gokhale/CONFIG/orbeline_defaults.mk - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -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 -f 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 76218a98e84..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "visi_marshal_client.h" - -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 c77676fefc3..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" -#include "visi_marshal_server.h" - -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 2b185405543..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp +++ /dev/null @@ -1,1346 +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__ */ - -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 def1c6189c2..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 -// -// ============================================================================ - -#if !defined(_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 29d8a82d289..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp +++ /dev/null @@ -1,331 +0,0 @@ -// $Id$ - -#include "visi_marshal_impl.h" - -#if !defined (__ACE_INLINE__) -#include "visi_marshal_impl.i" -#endif /* __ACE_INLINE__ */ - -// 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 ec3b0ee0ef2..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h +++ /dev/null @@ -1,179 +0,0 @@ -// $Id$ - -#if !defined (VISI_MARSHAL_IMPL_H) -#define VISI_MARSHAL_IMPL_H - -// to include DSI related files - -#include "ace/OS.h" - -#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 334c80f30cd..00000000000 --- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp +++ /dev/null @@ -1,88 +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__ */ - -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 36076c8fe90..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 -// -// ============================================================================ - -#if !defined(_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 9f5327741bf..00000000000 --- a/TAO/Benchmark/benchmark/Makefile +++ /dev/null @@ -1,125 +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)) - -LDLIBS = -lACE -LIBS = -lACE -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VSHLIB) $(VLIB) - -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 $(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 ab9c67a3981..00000000000 --- a/TAO/Benchmark/benchmark/driver.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// $Id$ - -#include "benchmark/driver.h" - -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 690041eac73..00000000000 --- a/TAO/Benchmark/benchmark/driver.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark -// -// = FILENAME -// driver.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#if !defined (_CORBA_BENCHMARK_DRIVER_H_) -#define _CORBA_BENCHMARK_DRIVER_H_ - -#include "ace/Log_Msg.h" - -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 1ff157826b2..00000000000 --- a/TAO/Benchmark/benchmark/marshal_options.cpp +++ /dev/null @@ -1,280 +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__ */ - -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 51a02a38ffa..00000000000 --- a/TAO/Benchmark/benchmark/marshal_options.h +++ /dev/null @@ -1,209 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark/Marshal -// -// = FILENAME -// marshal_options.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#if !defined (_CORBA_MARSHAL_OPTIONS_H_) -#define _CORBA_MARSHAL_OPTIONS_H_ - -#include "ace/OS.h" -#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 7a5a05e9a7a..00000000000 --- a/TAO/Benchmark/benchmark/marshal_proxy.cpp +++ /dev/null @@ -1,21 +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__ */ - diff --git a/TAO/Benchmark/benchmark/marshal_proxy.h b/TAO/Benchmark/benchmark/marshal_proxy.h deleted file mode 100644 index 7b3951f4e11..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 -// -// ============================================================================ - -#if !defined(_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 1231fe38b22..00000000000 --- a/TAO/Benchmark/benchmark/marshal_results.cpp +++ /dev/null @@ -1,34 +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__ */ - -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 5d635cf83d7..00000000000 --- a/TAO/Benchmark/benchmark/marshal_results.h +++ /dev/null @@ -1,72 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// CORBA Benchmark -// -// = FILENAME -// marshal_results.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ - -#if !defined (_CORBA_MARSHAL_RESULTS_H_) -#define _CORBA_MARSHAL_RESULTS_H_ - -#include "ace/Profile_Timer.h" - -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/IIOP/Build/default.bld b/TAO/IIOP/Build/default.bld deleted file mode 100755 index 7b67d4a13c9..00000000000 --- a/TAO/IIOP/Build/default.bld +++ /dev/null @@ -1,16 +0,0 @@ -#!build -default: - nobuild - :debuglevel=multi -tao.bld - library - :cx_e_option=nomsgnumbers - :dependency=nodepend - :cx_silent=1 - :cx_silent=21 - :cx_silent=191 - :sourcedirs=/home/ace/ACE_wrappers.vxworks - :sourcedirs=../lib - :sourcedirs=.. - :libraries=/home/ace/ACE_wrappers.vxworks/libACE.a - :libraries=/appl/newgreen/vxppc603/indlib.o diff --git a/TAO/IIOP/Build/tao.bld b/TAO/IIOP/Build/tao.bld deleted file mode 100755 index 21007d8ab61..00000000000 --- a/TAO/IIOP/Build/tao.bld +++ /dev/null @@ -1,53 +0,0 @@ -#!build -default: - library - :defines=__IIOP_BUILD - :defines=DEBUG -../lib/any.cpp - C++ -../lib/cdr.cpp - C++ -../lib/connmgr.cpp - C++ -../lib/corbacom.cpp - C++ -../lib/debug.cpp - C++ -../lib/except.cpp - C++ -../lib/giop.cpp - C++ -../lib/iiopobj.cpp - C++ -../lib/iioporb.cpp - C++ -../lib/interp.cpp - C++ -../lib/invoke.cpp - C++ -../lib/marshal.cpp - C++ -../lib/nvlist.cpp - C++ -../lib/object.cpp - C++ -../lib/orbobj.cpp - C++ -../lib/principa.cpp - C++ -../lib/request.cpp - C++ -../lib/svrrqst.cpp - C++ -../lib/t-sizes.cpp - C++ -../lib/tc_const.cpp - C++ -../lib/tcpoa.cpp - C++ -../lib/toa.cpp - C++ -../lib/typecode.cpp - C++ -../lib/roa.cpp - C++ diff --git a/TAO/IIOP/Makefile b/TAO/IIOP/Makefile deleted file mode 100644 index f6dba1717ab..00000000000 --- a/TAO/IIOP/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the ACE-ified Sun Ref. implementation -# of IIOP ORB -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = - -DIRS = lib #test - -CLONE = - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - diff --git a/TAO/IIOP/docs/us/codecounts/align.hh.cccc b/TAO/IIOP/docs/us/codecounts/align.hh.cccc deleted file mode 100644 index 13cb1ddca0e..00000000000 --- a/TAO/IIOP/docs/us/codecounts/align.hh.cccc +++ /dev/null @@ -1,29 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/align.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef unsigned int ptr_arith_t; 1 21 14 2 0 0.1 0.0 -typedef unsigned long ptr_arith_t; 24 24 0 0 0 -typedef unsigned long long ptr_arit 27 27 0 0 0 -static inline ptr_arith_t align_bin 35 46 5 5 1 1.0 0.2 -static inline unsigned char*ptr_ali 49 61 8 4 1 0.5 0.1 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 27 16 2 0.6 0.1 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/any.cpp.cccc b/TAO/IIOP/docs/us/codecounts/any.cpp.cccc deleted file mode 100644 index 44e6cce66e5..00000000000 --- a/TAO/IIOP/docs/us/codecounts/any.cpp.cccc +++ /dev/null @@ -1,41 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/any.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static pthread_mutex_t any_lock=PTH 1 48 34 1 0 0.0 0.0 -CORBA_TypeCode_ptr CORBA_Any::type( 53 57 0 4 1 ! *** ! *** -void*CORBA_Any::value()const{return 59 63 0 4 1 ! *** ! *** -CORBA_Any::CORBA_Any(){} 65 78 7 6 0 0.9 0.0 -CORBA_Any::CORBA_Any(){} 81 97 5 11 0 2.2 0.0 -static CORBA_TypeCode::traverse_sta 100 305 44 ? 131 ! 30 3.0 0.7 -CORBA_Any::CORBA_Any(){} 308 329 4 13 1 3.3 0.3 -static CORBA_TypeCode::traverse_sta 332 457 46 60 ! 21 1.3 0.5 -CORBA_Any::~CORBA_Any(){} 460 481 10 9 2 0.9 0.2 -void CORBA_Any::replace(){} 484 509 3 19 2 6.3 0.7 -DEFINE_GUID(IID_CORBA_Any,0xa201e4c 511 517 4 2 0 0.5 0.0 -ULONG __stdcall CORBA_Any::AddRef() 520 529 0 6 1 ! *** ! *** -ULONG __stdcall CORBA_Any::Release( 531 548 0 10 3 ! *** ! *** -HRESULT __stdcall CORBA_Any::QueryI 550 567 0 14 5 ! *** ! *** -CORBA_Any::CORBA_Any(){} 570 583 4 8 0 2.0 0.0 -CORBA_Any&CORBA_Any::operator=(){} 585 660 16 45 ? 15 2.8 0.9 -CORBA_Any::operator VARIANT(){VARIA 662 670 1 5 1 5.0 1.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 178 365 83 2.1 0.5 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/any.hh.cccc b/TAO/IIOP/docs/us/codecounts/any.hh.cccc deleted file mode 100644 index 6cfac7fd831..00000000000 --- a/TAO/IIOP/docs/us/codecounts/any.hh.cccc +++ /dev/null @@ -1,27 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/any.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef CORBA_Any*CORBA_Any_ptr; 1 10 9 0 0 0.0 0.0 -extern const IID IID_CORBA_Any; 12 12 0 0 0 -class CORBA_Any{}; 14 87 16 46 2 2.9 0.1 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 25 49 2 2.0 0.1 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc deleted file mode 100644 index aa92c9f81bd..00000000000 --- a/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc +++ /dev/null @@ -1,36 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/cdr.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -CORBA_Boolean CDR::put_byte(){} 1 60 37 11 4 0.3 0.1 -CORBA_Boolean CDR::put_short(){} 63 90 7 18 4 2.6 0.6 -CORBA_Boolean CDR::put_long(){} 92 120 7 18 4 2.6 0.6 -CORBA_Boolean CDR::put_longlong(){} 122 149 7 18 4 2.6 0.6 -CORBA_Boolean CDR::put_longdouble() 151 178 7 18 4 2.6 0.6 -CORBA_Boolean CDR::get_byte(){} 181 196 3 11 3 3.7 1.0 -CORBA_Boolean CDR::get_short(){} 199 230 6 22 4 3.7 0.7 -CORBA_Boolean CDR::get_long(){} 232 269 10 24 4 2.4 0.4 -CORBA_Boolean CDR::get_longlong(){} 271 312 10 28 4 2.8 0.4 -CORBA_Boolean CDR::get_longdouble() 315 363 9 36 4 4.0 0.4 -CORBA_Boolean CDR::skip_string(){CO 366 377 2 8 4 4.0 2.0 -CORBA_Boolean CDR::grow(){} 380 460 37 34 ? 9 0.9 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 142 258 52 1.8 0.4 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc b/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc deleted file mode 100644 index 627ff33a9d9..00000000000 --- a/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc +++ /dev/null @@ -1,26 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/cdr.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -struct _EXPCLASS CDR{enum{SHORT_SIZ 1 362 155 ? 142 ! 25 0.9 0.2 -; 362 362 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 155 143 25 0.9 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc deleted file mode 100644 index e934a7ebd12..00000000000 --- a/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc +++ /dev/null @@ -1,38 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/connmgr.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static client_endpoint*client_list; 1 77 40 2 0 0.1 0.0 -static server_endpoint*server_list; 78 78 0 0 0 -static pthread_mutex_t client_lock= 82 88 6 0 0 0.0 0.0 -static pthread_mutex_t server_lock= 89 89 0 0 0 -static ACE_HANDLE signal_fd; 91 97 6 0 0 0.0 0.0 -static ACE_HANDLE signal_in_fd; 99 103 4 0 0 0.0 0.0 -void client_endpoint::release(){} 108 120 3 6 0 2.0 0.0 -client_endpoint*client_endpoint::lo 123 290 75 69 ? 18 0.9 0.2 -void client_endpoint::dump(){} 295 318 6 12 1 2.0 0.2 -void server_endpoint::release(){} 324 354 17 7 0 0.4 0.0 -server_endpoint*server_endpoint::in 357 507 50 72 ? 16 1.4 0.3 -server_endpoint*server_endpoint::bl 510 742 89 ? 105 ! 27 1.2 0.3 -void server_endpoint::shutdown_conn 744 765 0 16 2 ! *** ! *** -void server_endpoint::dump(){} 770 790 3 12 2 4.0 0.7 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 299 315 66 1.1 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc b/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc deleted file mode 100644 index e688b27d271..00000000000 --- a/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc +++ /dev/null @@ -1,27 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/connmgr.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -template<>class autorelease{}; 1 47 14 16 6 1.1 0.4 -struct client_endpoint{}; 50 85 11 15 0 1.4 0.0 -class server_endpoint{}; 88 141 15 27 0 1.8 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 40 61 6 1.5 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc b/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc deleted file mode 100644 index b7859bad94a..00000000000 --- a/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc +++ /dev/null @@ -1,32 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/corbacom.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -CORBA_String CORBA_string_alloc(){} 1 26 10 5 1 0.5 0.1 -CORBA_String CORBA_string_copy(){} 28 37 0 7 3 ! *** ! *** -void CORBA_string_free(){} 39 43 0 4 0 ! *** -extern"unsigned wslen(const wchar_t 47 60 4 8 2 2.0 0.5 -extern"wchar_t*wscpy(wchar_t*dest,c 62 70 0 7 2 ! *** ! *** -CORBA_WString CORBA_wstring_alloc() 74 82 4 4 1 1.0 0.3 -CORBA_WString CORBA_wstring_copy(){ 84 92 0 7 3 ! *** ! *** -void CORBA_wstring_free(){} 94 98 0 4 0 ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 18 54 12 3.0 0.7 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc b/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc deleted file mode 100644 index 256095a8f3e..00000000000 --- a/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc +++ /dev/null @@ -1,59 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/corbacom.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef bool CORBA_Boolean; 1 13 6 1 0 0.2 0.0 -typedef int CORBA_Boolean; 18 18 0 0 0 -enum{CORBA_B_FALSE=0,CORBA_B_TRUE=1 19 19 0 0 0 -; 19 19 0 0 0 -typedef unsigned char CORBA_Octet; 22 22 0 0 0 -typedef short CORBA_Short; 24 24 0 0 0 -typedef unsigned short CORBA_UShort 25 25 0 0 0 -typedef long CORBA_Long; 27 32 4 0 0 0.0 0.0 -typedef unsigned long CORBA_ULong; 33 33 0 0 0 -typedef int CORBA_Long; 35 36 1 0 0 0.0 0.0 -typedef unsigned CORBA_ULong; 37 37 0 0 0 -typedef long long CORBA_LongLong; 40 47 6 0 0 0.0 0.0 -typedef unsigned long long CORBA_UL 48 48 0 0 0 -typedef long CORBA_LongLong; 50 50 0 0 0 -typedef unsigned long CORBA_ULongLo 51 51 0 0 0 -typedef __int64 CORBA_LongLong; 53 53 0 0 0 -typedef unsigned __int64 CORBA_ULon 54 54 0 0 0 -struct CORBA_LongLong{}; 56 64 6 0 0 0.0 0.0 -struct CORBA_ULongLong{}; 65 65 0 0 0 -struct CORBA_LongLong{}; 67 67 0 0 0 -struct CORBA_ULongLong{}; 68 68 0 0 0 -typedef float CORBA_Float; 72 72 0 0 0 -typedef double CORBA_Double; 73 73 0 0 0 -typedef long double CORBA_LongDoubl 75 83 7 0 0 0.0 0.0 -struct CORBA_LongDouble{}; 86 88 0 2 0 ! *** -typedef char CORBA_Char; 91 91 0 0 0 -typedef CORBA_Char*CORBA_String; 92 92 0 0 0 -CORBA_String CORBA_string_alloc(); 94 94 0 0 0 -CORBA_String CORBA_string_copy(); 95 95 0 0 0 -void CORBA_string_free(); 96 96 0 0 0 -typedef wchar_t CORBA_WChar; 98 104 6 0 0 0.0 0.0 -typedef CORBA_WChar*CORBA_WString; 105 105 0 0 0 -CORBA_WString CORBA_wstring_alloc() 107 107 0 0 0 -CORBA_WString CORBA_wstring_copy(); 108 108 0 0 0 -void CORBA_wstring_free(); 109 109 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 36 37 0 1.0 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc b/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc deleted file mode 100644 index 486b8373461..00000000000 --- a/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc +++ /dev/null @@ -1,39 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/debug.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -unsigned debug_level=0; 1 43 13 1 0 0.1 0.0 -char*debug_filter="; 44 44 0 0 0 -static FILE*debug_stream=stderr; 45 45 0 0 0 -static pid_t my_pid; 48 63 13 1 0 0.1 0.0 -static pthread_once_t debug_init=PT 68 71 3 0 0 0.0 0.0 -static void setup_once(){} 75 79 0 4 0 ! *** -static void emit_prefix(){} 81 87 0 5 0 ! *** -static void setup(){} 91 102 5 6 1 1.2 0.2 -static void setup(){} 109 120 5 6 1 1.2 0.2 -void _EXPFUNC dmsg_filter(const cha 130 170 3 28 ? 12 ? 9.3 4.0 -void _EXPFUNC dmsg_filter(unsigned 172 193 1 15 3 ?15.0 3.0 -void _EXPFUNC dmsg_v(const char*_FA 195 213 1 13 1 ?13.0 1.0 -void _EXPFUNC _dmsg_x(CORBA_Environ 215 239 1 18 1 ?18.0 1.0 -void _EXPFUNC dmsg_opaque(char*_FAR 241 286 1 38 ? 10 !38.0 ?10.0 -void _EXPFUNC dmsg_opaque_full(char 288 335 1 39 ? 11 !39.0 ?11.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 47 189 40 4.0 0.9 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/debug.hh.cccc b/TAO/IIOP/docs/us/codecounts/debug.hh.cccc deleted file mode 100644 index 932d9fb5a19..00000000000 --- a/TAO/IIOP/docs/us/codecounts/debug.hh.cccc +++ /dev/null @@ -1,29 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/debug.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -extern"char*strerror(int); 1 12 6 1 0 0.2 0.0 -extern unsigned debug_level; 15 22 7 0 0 0.0 0.0 -extern char*debug_filter; 22 23 1 0 0 0.0 0.0 -_dmsg_x(env,s); 23 43 8 3 0 0.4 0.0 -line 43: syntax error at "}" missing Eof --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 42 21 0 0.5 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/except.cpp.cccc b/TAO/IIOP/docs/us/codecounts/except.cpp.cccc deleted file mode 100644 index 8b1b2294821..00000000000 --- a/TAO/IIOP/docs/us/codecounts/except.cpp.cccc +++ /dev/null @@ -1,53 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/except.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static pthread_mutex_t except_lock= 1 31 12 1 0 0.1 0.0 -DEFINE_GUID(IID_CORBA_Exception,0x7 35 45 2 2 0 1.0 0.0 -DEFINE_GUID(IID_CORBA_UserException 47 49 1 1 0 1.0 0.0 -DEFINE_GUID(IID_CORBA_SystemExcepti 51 53 1 1 0 1.0 0.0 -CORBA_Exception::CORBA_Exception(){ 56 66 0 10 1 ! *** ! *** -CORBA_Exception::CORBA_Exception(){ 68 78 0 10 1 ! *** ! *** -CORBA_Exception::~CORBA_Exception() 80 91 5 5 0 1.0 0.0 -CORBA_Exception&CORBA_Exception::op 93 107 0 13 3 ! *** ! *** -const CORBA_String CORBA_Exception: 109 119 0 9 3 ! *** ! *** -const CORBA_TypeCode_ptr CORBA_Exce 121 126 0 5 1 ! *** ! *** -ULONG __stdcall CORBA_Exception::Ad 128 141 3 7 1 2.3 0.3 -ULONG __stdcall CORBA_Exception::Re 143 167 2 12 3 6.0 1.5 -HRESULT __stdcall CORBA_Exception:: 169 192 4 15 5 3.8 1.3 -CORBA_UserException::CORBA_UserExce 195 203 3 5 0 1.7 0.0 -CORBA_UserException::~CORBA_UserExc 205 207 0 2 0 ! *** -CORBA_SystemException::CORBA_System 209 218 0 9 0 ! *** -CORBA_SystemException::~CORBA_Syste 220 222 0 2 0 ! *** -static CORBA_TypeCode_ptr sys_excep 228 228 0 0 0 -CORBA_ExceptionList __system_except 229 229 0 0 0 -static void make_standard_typecode( 231 318 29 49 ? 10 1.7 0.3 -SYSEX(UNKNOWN)SYSEX(BAD_PARAM)SYSEX 321 396 24 36 1 1.5 0.0 -static CORBA_Octet tc_buf_Bounds[]= 400 418 7 11 0 1.6 0.0 -static CORBA_TypeCode tc_std_Bounds 419 420 0 1 0 ! *** -CORBA_TypeCode_ptr _tc_CORBA_Bounds 421 421 0 0 0 -static CORBA_Octet tc_buf_BadKind[] 423 437 3 11 0 3.7 0.0 -static CORBA_TypeCode tc_std_BadKin 438 439 0 1 0 ! *** -CORBA_TypeCode_ptr _tc_CORBA_BadKin 440 440 0 0 0 -CORBA_ExceptionType CORBA_Environme 444 469 8 13 6 1.6 0.8 -void _EXPFUNC print_exception(const 472 535 24 35 7 1.5 0.3 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 128 295 42 2.3 0.3 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/except.hh.cccc b/TAO/IIOP/docs/us/codecounts/except.hh.cccc deleted file mode 100644 index 430ef037b0d..00000000000 --- a/TAO/IIOP/docs/us/codecounts/except.hh.cccc +++ /dev/null @@ -1,37 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/except.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -extern const IID IID_CORBA_Exceptio 1 15 13 1 0 0.1 0.0 -extern const IID IID_CORBA_UserExce 16 16 0 0 0 -extern const IID IID_CORBA_SystemEx 17 17 0 0 0 -class _EXPCLASS CORBA_Exception:pub 19 52 3 25 2 ? 8.3 0.7 -; 52 52 0 0 0 -typedef CORBA_Exception*CORBA_Excep 53 53 0 0 0 -class _EXPCLASS CORBA_UserException 55 65 5 5 0 1.0 0.0 -; 65 65 0 0 0 -enum CORBA_CompletionStatus{}; 67 75 7 1 0 0.1 0.0 -class _EXPCLASS CORBA_SystemExcepti 77 99 2 16 2 ? 8.0 1.0 -; 99 99 0 0 0 -extern CORBA_TypeCode_ptr _tc_CORBA 102 117 6 4 0 0.7 0.0 -line 117: syntax error at "}" missing Eof --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 44 112 6 2.5 0.1 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/generate b/TAO/IIOP/docs/us/codecounts/generate deleted file mode 100755 index c04f8b92e19..00000000000 --- a/TAO/IIOP/docs/us/codecounts/generate +++ /dev/null @@ -1,24 +0,0 @@ -#/bin/sh - -error() -{ - ret=$1; shift - echo "ERROR: " $@ - return $ret -} - -test -x ${CCCC:=/usr/local/bin/cccc} \ - || error 1 "Value of \$CCCC ($CCCC) not found." - -test -d ${TOPDIR:=../../../lib} \ - || error 1 "Unable to locate \$TOPDIR ($TOPDIR)." - -find $TOPDIR \( -name '*.h' -o -name '*.i' -o -name '*.hh' -o -name '*.cpp' \) -print | -while read file -do - outname=`basename $file`.cccc - $CCCC $file > $outname 2>&1 - echo -n "." -done - -echo diff --git a/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc b/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc deleted file mode 100644 index d4aa24bb14b..00000000000 --- a/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc +++ /dev/null @@ -1,50 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/giop.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static pthread_mutex_t fwd_info_loc 1 79 45 2 0 0.0 0.0 -static inline CORBA_Boolean start_m 83 112 6 19 3 3.2 0.5 -static const char digits[]="; 115 115 0 0 0 -static const char*names[]={}; 116 120 0 4 0 ! *** -static void dump_msg(){} 122 136 0 13 4 ! *** ! *** -CORBA_Boolean GIOP::send_message(){ 142 226 30 43 ? 12 1.4 0.4 -static const char close_message[]={ 229 250 16 5 0 0.3 0.0 -void GIOP::close_connection(ACE_HAN 253 272 8 11 0 1.4 0.0 -static const char error_message[]={ 274 286 7 5 0 0.7 0.0 -static inline void send_error(ACE_H 288 297 0 9 0 ! *** -static int read_buffer(){} 300 331 6 18 4 3.0 0.7 -GIOP::MsgType GIOP::read_message(){ 334 481 75 56 ? 18 0.7 0.2 -GIOP::Invocation::Invocation(IIOP_O 484 524 22 14 0 0.6 0.0 -GIOP::Invocation::~Invocation(){} 526 528 0 2 0 ! *** -static const CORBA_Long _oc_opaque[ 530 543 13 0 0 0.0 0.0 -CORBA_TypeCode TC_opaque(); 544 546 0 2 0 ! *** -static const CORBA_Long _oc_svc_ctx 549 610 50 9 0 0.2 0.0 -static CORBA_TypeCode TC_ServiceCon 611 613 0 2 0 ! *** -void GIOP::Invocation::start(CORBA_ 616 729 58 45 ? 15 0.8 0.3 -extern CORBA_ExceptionList __system 731 731 0 0 0 -GIOP::ReplyStatusType GIOP::Invocat 733 1086 175 ? 144 ! 38 0.8 0.2 -void GIOP::incoming_message(){} 1089 1353 79 ? 151 ! 24 1.9 0.3 -template class autorelease<client_e 1356 1356 0 0 0 -template class CORBA_SEQUENCE<GIOP: 1357 1357 0 0 0 -template class CORBA_SEQUENCE<CORBA 1358 1358 0 0 0 -template class CORBA_SEQUENCE<CORBA 1359 1359 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 590 580 118 1.0 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/giop.hh.cccc b/TAO/IIOP/docs/us/codecounts/giop.hh.cccc deleted file mode 100644 index d533e8f911a..00000000000 --- a/TAO/IIOP/docs/us/codecounts/giop.hh.cccc +++ /dev/null @@ -1,27 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/giop.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef CORBA_SEQUENCE<CORBA_Octet> 1 37 19 1 0 0.1 0.0 -class IOP{}; 39 109 45 21 0 0.5 0.0 -class GIOP{}; 112 321 65 ? 120 0 1.8 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 129 145 0 1.1 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc b/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc deleted file mode 100644 index b440bf69b76..00000000000 --- a/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc +++ /dev/null @@ -1,34 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/iiopobj.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static pthread_mutex_t iiopobj_lock 1 30 13 1 0 0.1 0.0 -IIOP::ProfileBody::ProfileBody(cons 35 50 0 13 0 ! *** -CORBA_ULong IIOP_Object::hash(){} 53 81 10 15 2 1.5 0.2 -CORBA_Boolean IIOP_Object::is_equiv 84 124 10 25 ? 9 2.5 0.9 -DEFINE_GUID(IID_IIOP_Object,0xa201e 127 133 4 2 0 0.5 0.0 -DEFINE_GUID(IID_STUB_Object,0xa201e 135 141 4 2 0 0.5 0.0 -DEFINE_GUID(IID_CORBA_Object,0xa201 143 145 1 1 0 1.0 0.0 -ULONG __stdcall IIOP_Object::AddRef 147 160 3 7 1 2.3 0.3 -ULONG __stdcall IIOP_Object::Releas 162 179 0 10 3 ! *** ! *** -HRESULT __stdcall IIOP_Object::Quer 182 214 11 18 7 1.6 0.6 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 56 104 22 1.9 0.4 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc b/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc deleted file mode 100644 index 866ab27c769..00000000000 --- a/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc +++ /dev/null @@ -1,30 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/iiopobj.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef CORBA_SEQUENCE<CORBA_Octet> 1 15 10 1 0 0.1 0.0 -class _EXPCLASS IIOP{public:struct 17 48 8 17 0 2.1 0.0 -; 48 48 0 0 0 -extern"const IID IID_IIOP_Object; 51 59 8 0 0 0.0 0.0 -class _EXPCLASS IIOP_Object:public 61 152 33 47 0 1.4 0.0 -; 152 152 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 59 69 0 1.2 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc b/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc deleted file mode 100644 index 6d1e462cf27..00000000000 --- a/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc +++ /dev/null @@ -1,35 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/iioporb.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static const char ior_prefix[]="; 1 27 9 1 0 0.1 0.0 -static const char iiop_prefix[]="; 28 28 0 0 0 -static const char xchars[]="; 29 29 0 0 0 -static inline char nibble2hex(unsig 32 39 3 4 1 1.3 0.3 -static inline unsigned char hex2byt 41 51 0 10 5 ! *** ! *** -CORBA_String IIOP_ORB::object_to_st 54 174 42 64 ? 17 1.5 0.4 -static CORBA_Object_ptr ior_string_ 177 231 14 33 ? 10 2.4 0.7 -static CORBA_Object_ptr iiop_string 234 349 34 68 ! 22 2.0 0.6 -CORBA_Object_ptr IIOP_ORB::string_t 352 374 6 13 5 2.2 0.8 -DEFINE_GUID(IID_IIOP_ORB,0xa201e4c4 376 382 4 2 0 0.5 0.0 -HRESULT __stdcall IIOP_ORB::QueryIn 385 408 3 16 6 5.3 2.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 115 222 66 1.9 0.6 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc b/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc deleted file mode 100644 index e016469fd1e..00000000000 --- a/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc +++ /dev/null @@ -1,28 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/iioporb.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef class IIOP_ORB*IIOP_ORB_ptr 1 13 9 1 0 0.1 0.0 -extern const IID IID_IIOP_ORB; 15 15 0 0 0 -class _EXPCLASS IIOP_ORB:public COR 17 47 4 22 0 5.5 0.0 -; 47 47 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 13 26 0 2.0 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/initguid.h.cccc b/TAO/IIOP/docs/us/codecounts/initguid.h.cccc deleted file mode 100644 index b106c9a8731..00000000000 --- a/TAO/IIOP/docs/us/codecounts/initguid.h.cccc +++ /dev/null @@ -1,25 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/initguid.h -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -const IID name={0} 1 6 2 1 0 0.5 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 2 2 0 1.0 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc b/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc deleted file mode 100644 index 690563b2274..00000000000 --- a/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc +++ /dev/null @@ -1,40 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/interp.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef size_t attribute_calculator 1 86 69 6 0 0.1 0.0 -static attribute_calculator calc_st 88 88 0 0 0 -static attribute_calculator calc_ex 89 89 0 0 0 -static attribute_calculator calc_un 90 90 0 0 0 -static attribute_calculator calc_al 91 91 0 0 0 -static attribute_calculator calc_ar 92 92 0 0 0 -typedef CORBA_Boolean param_skip_rt 95 99 4 0 0 0.0 0.0 -static CORBA_Boolean skip_encapsula 101 105 0 4 1 ! *** ! *** -static CORBA_Boolean skip_long(){} 107 113 0 5 1 ! *** ! *** -struct table_element{}; 116 139 18 5 0 0.3 0.0 -static table_element table[]={}; 141 188 37 10 0 0.3 0.0 -{struct align_struct_ x one;char du 191 221 23 4 0 0.2 0.0 -; 221 221 0 0 0 -align_struct_ table[t].size=sizeof( 223 224 0 0 0 -table[t].alignment=(char*)&align.tw 225 226 0 1 0 ! *** -line 227: syntax error at "}" missing Eof --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 603 709 174 1.2 0.3 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc b/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc deleted file mode 100644 index a6b006f91e5..00000000000 --- a/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc +++ /dev/null @@ -1,26 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/invoke.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -void IIOP_Object::do_call(CORBA_Env 1 193 87 77 ! 24 0.9 0.3 -void IIOP_Object::do_dynamic_call(c 196 346 44 85 ! 26 1.9 0.6 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 131 164 50 1.3 0.4 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc b/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc deleted file mode 100644 index 90175d333fb..00000000000 --- a/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc +++ /dev/null @@ -1,30 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/marshal.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -extern"{unsigned wslen(const wchar_ 1 58 39 4 0 0.1 0.0 -extern CORBA_TypeCode TC_opaque; 61 61 0 0 0 -CORBA_TypeCode::traverse_status CDR 64 494 146 ? 230 ! 71 1.6 0.5 -const CORBA_TypeCode_ptr __tc_const 497 548 23 24 0 1.0 0.0 -; 548 548 0 0 0 -CORBA_TypeCode::traverse_status CDR 551 1107 163 ? 323 ! 88 2.0 0.5 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 371 586 159 1.6 0.4 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc b/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc deleted file mode 100644 index d07414860b1..00000000000 --- a/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc +++ /dev/null @@ -1,40 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/nvlist.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static pthread_mutex_t nvlist_lock= 1 21 9 1 0 0.1 0.0 -DEFINE_GUID(IID_CORBA_NamedValue,0x 26 32 4 2 0 0.5 0.0 -ULONG __stdcall CORBA_NamedValue::A 35 44 0 6 1 ! *** ! *** -ULONG __stdcall CORBA_NamedValue::R 46 61 0 10 3 ! *** ! *** -HRESULT __stdcall CORBA_NamedValue: 63 80 0 14 5 ! *** ! *** -void CORBA_release(){} 82 90 3 5 1 1.7 0.3 -CORBA_Boolean CORBA_is_nil(){} 92 96 0 4 1 ! *** ! *** -CORBA_NamedValue::~CORBA_NamedValue 98 102 0 4 1 ! *** ! *** -DEFINE_GUID(IID_CORBA_NVList,0x7742 105 111 4 2 0 0.5 0.0 -ULONG __stdcall CORBA_NVList::AddRe 114 123 0 6 1 ! *** ! *** -ULONG __stdcall CORBA_NVList::Relea 125 140 0 10 3 ! *** ! *** -HRESULT __stdcall CORBA_NVList::Que 142 159 0 14 5 ! *** ! *** -void CORBA_release(){} 161 169 3 5 1 1.7 0.3 -CORBA_Boolean CORBA_is_nil(){} 171 175 0 4 1 ! *** ! *** -CORBA_NVList::~CORBA_NVList(){} 177 188 0 9 2 ! *** ! *** -CORBA_NamedValue_ptr CORBA_NVList:: 190 262 32 35 6 1.1 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 55 147 31 2.7 0.6 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc b/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc deleted file mode 100644 index b680140d4b9..00000000000 --- a/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc +++ /dev/null @@ -1,37 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/nvlist.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -class _EXPCLASS CORBA_NamedValue; 1 13 12 0 0 0.0 0.0 -void CORBA_release(); 15 15 0 0 0 -CORBA_Boolean CORBA_is_nil(); 16 16 0 0 0 -enum{CORBA_ARG_IN=0x01,CORBA_ARG_OU 18 25 1 6 0 6.0 0.0 -; 25 25 0 0 0 -class _EXPCLASS CORBA_NamedValue{pu 27 57 3 21 3 7.0 1.0 -; 57 57 0 0 0 -class _EXPCLASS CORBA_NVList; 60 71 11 0 0 0.0 0.0 -void CORBA_release(); 73 73 0 0 0 -CORBA_Boolean CORBA_is_nil(); 74 74 0 0 0 -extern"const IID IID_CORBA_NVList; 76 76 0 0 0 -class _EXPCLASS CORBA_NVList{public 78 119 3 31 2 ?10.3 0.7 -; 119 119 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 30 68 5 2.3 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/objbase.h.cccc b/TAO/IIOP/docs/us/codecounts/objbase.h.cccc deleted file mode 100644 index 02225ed7d9f..00000000000 --- a/TAO/IIOP/docs/us/codecounts/objbase.h.cccc +++ /dev/null @@ -1,37 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/objbase.h -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef unsigned long ULONG; 1 23 18 1 0 0.1 0.0 -typedef unsigned long HRESULT; 24 24 0 0 0 -typedef char IID[16]; 26 36 8 1 0 0.1 0.0 -typedef const IID&REFIID; 36 37 1 0 0 0.0 0.0 -DEFINE_GUID(IID_IUnknown,b,c,d,e,f, 41 55 4 9 0 2.3 0.0 -; 55 55 0 0 0 -typedef unsigned long SCODE; 59 61 1 1 0 1.0 0.0 -inline HRESULT ResultFromScode(SCOD 63 63 0 0 1 ! *** -typedef unsigned short VARTYPE; 69 79 10 0 0 0.0 0.0 -enum VARENUM{}; 80 98 18 0 0 0.0 0.0 -struct CY{}; 100 111 3 5 0 1.7 0.0 -typedef double DATE; 113 117 4 0 0 0.0 0.0 -struct VARIANT{}; 119 160 35 6 0 0.2 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 102 34 1 0.3 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/object.cpp.cccc b/TAO/IIOP/docs/us/codecounts/object.cpp.cccc deleted file mode 100644 index 82d8215949f..00000000000 --- a/TAO/IIOP/docs/us/codecounts/object.cpp.cccc +++ /dev/null @@ -1,55 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/object.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -CORBA_Object::CORBA_Object(){} 1 25 9 5 0 0.6 0.0 -CORBA_Object::~CORBA_Object(){} 27 29 0 2 0 ! *** -void CORBA_release(){} 31 41 3 7 1 2.3 0.3 -CORBA_Object_ptr CORBA_Object::_dup 43 49 0 6 2 ! *** ! *** -CORBA_Object_ptr CORBA_Object::_nil 51 58 3 4 1 1.3 0.3 -CORBA_Boolean CORBA_is_nil(){} 60 64 0 4 1 ! *** ! *** -void __stdcall CORBA_Object::_creat 67 86 6 13 0 2.2 0.0 -CORBA_Request_ptr __stdcall CORBA_O 89 98 0 9 1 ! *** ! *** -static const paramdata Object_get_i 101 108 5 2 0 0.4 0.0 -static const calldata Object_get_in 109 113 0 4 0 ! *** -; 113 113 0 0 0 -CORBA_InterfaceDef_ptr __stdcall CO 116 150 16 15 3 0.9 0.2 -static const paramdata Object_is_a_ 153 160 4 3 0 0.8 0.0 -static const calldata Object_is_a_c 161 165 0 4 0 ! *** -; 165 165 0 0 0 -CORBA_Boolean __stdcall CORBA_Objec 168 218 27 19 6 0.7 0.2 -static const paramdata Object_get_i 221 228 5 2 0 0.4 0.0 -static const calldata Object_get_im 229 233 0 4 0 ! *** -; 233 233 0 0 0 -CORBA_ImplementationDef_ptr __stdca 236 253 0 15 3 ! *** ! *** -static const paramdata Object_non_e 256 263 5 2 0 0.4 0.0 -static const calldata Object_non_ex 264 268 0 4 0 ! *** -; 268 268 0 0 0 -CORBA_Boolean __stdcall CORBA_Objec 271 306 3 28 ? 8 ? 9.3 2.7 -CORBA_ULong __stdcall CORBA_Object: 309 329 4 14 3 3.5 0.8 -CORBA_Boolean __stdcall CORBA_Objec 332 360 7 18 5 2.6 0.7 -DEFINE_GUID(IID_IUnknown,0x77420089 363 374 7 3 0 0.4 0.0 -DEFINE_GUID(IID_CORBA_Object,0xa201 378 380 1 1 0 1.0 0.0 -ULONG __stdcall CORBA_Object::AddRe 384 389 0 5 1 ! *** ! *** -ULONG __stdcall CORBA_Object::Relea 391 396 0 5 1 ! *** ! *** -HRESULT __stdcall CORBA_Object::Que 398 406 0 8 1 ! *** ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 105 233 37 2.2 0.4 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/object.hh.cccc b/TAO/IIOP/docs/us/codecounts/object.hh.cccc deleted file mode 100644 index b8f3b41f6c5..00000000000 --- a/TAO/IIOP/docs/us/codecounts/object.hh.cccc +++ /dev/null @@ -1,31 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/object.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef class CORBA_Object*CORBA_Ob 1 11 10 0 0 0.0 0.0 -void CORBA_release(); 12 12 0 0 0 -CORBA_Boolean CORBA_is_nil(); 13 13 0 0 0 -extern const IID IID_CORBA_Object; 15 15 0 0 0 -class _EXPCLASS CORBA_Object:public 17 109 28 58 0 2.1 0.0 -; 109 109 0 0 0 -line 112: syntax error at "ÿ" missing Start --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 39 63 0 1.6 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/orb.hh.cccc b/TAO/IIOP/docs/us/codecounts/orb.hh.cccc deleted file mode 100644 index c5687f297f9..00000000000 --- a/TAO/IIOP/docs/us/codecounts/orb.hh.cccc +++ /dev/null @@ -1,33 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/orb.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef class CORBA_TypeCode*CORBA_ 1 112 90 5 0 0.1 0.0 -typedef class CORBA_Any*CORBA_Any_p 113 113 0 0 0 -typedef class CORBA_ImplementationD 115 115 0 0 0 -typedef class CORBA_InterfaceDef*CO 117 117 0 0 0 -typedef class CORBA_Request*CORBA_R 119 119 0 0 0 -typedef class CORBA_NamedValue*CORB 121 121 0 0 0 -typedef class CORBA_NVList*CORBA_NV 123 123 0 0 0 -typedef unsigned CORBA_Flags; 125 125 0 0 0 -line 160: syntax error at "ÿ" missing Start --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 101 17 0 0.2 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc b/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc deleted file mode 100644 index 12c296cc020..00000000000 --- a/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc +++ /dev/null @@ -1,26 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/orbconf.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef unsigned long pid_t; 1 148 56 24 0 0.4 0.0 -line 183: syntax error at "ÿ" missing Start --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 67 27 0 0.4 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc b/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc deleted file mode 100644 index 927fc2f58fb..00000000000 --- a/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc +++ /dev/null @@ -1,41 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/orbobj.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -extern void __TC_init_table(); 1 28 10 1 0 0.1 0.0 -extern void __TC_init_standard_exce 29 29 0 0 0 -static pthread_mutex_t refcnt_lock= 32 32 0 0 0 -CORBA_ORB::CORBA_ORB(){} 41 47 3 3 0 1.0 0.0 -CORBA_ORB::~CORBA_ORB(){} 49 52 0 3 0 ! *** -void CORBA_release(){} 54 64 3 7 1 2.3 0.3 -CORBA_ORB_ptr CORBA_ORB::_duplicate 66 72 0 6 2 ! *** ! *** -CORBA_ORB_ptr CORBA_ORB::_nil(){} 74 81 3 4 1 1.3 0.3 -CORBA_Boolean CORBA_is_nil(){} 83 87 0 4 1 ! *** ! *** -DEFINE_GUID(IID_CORBA_ORB,0xa201e4c 90 96 4 2 0 0.5 0.0 -DEFINE_GUID(IID_STUB_Object,0xa201e 99 101 1 1 0 1.0 0.0 -ULONG __stdcall CORBA_ORB::AddRef() 105 114 0 6 1 ! *** ! *** -ULONG __stdcall CORBA_ORB::Release( 116 135 0 11 3 ! *** ! *** -static CORBA_ORB_ptr the_orb; 138 145 7 0 0 0.0 0.0 -CORBA_ORB_ptr CORBA_ORB_init(int&,c 147 290 59 60 ! 23 1.0 0.4 -void CORBA_ORB::create_list(){} 292 308 0 14 1 ! *** ! *** -CORBA_ORB_ptr _orb(){} 311 322 7 4 1 0.6 0.1 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 97 143 34 1.5 0.4 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc b/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc deleted file mode 100644 index ccc192d6a06..00000000000 --- a/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc +++ /dev/null @@ -1,31 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/orbobj.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef class CORBA_ORB*CORBA_ORB_p 1 8 7 0 0 0.0 0.0 -void CORBA_release(); 9 9 0 0 0 -CORBA_Boolean CORBA_is_nil(); 10 10 0 0 0 -extern const IID IID_CORBA_ORB; 12 12 0 0 0 -CORBA_ORB_ptr CORBA_ORB_init(); 14 23 3 6 0 2.0 0.0 -class _EXPCLASS CORBA_ORB:public IU 25 71 13 26 0 2.0 0.0 -; 71 71 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 23 38 0 1.7 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc deleted file mode 100644 index 6486125713e..00000000000 --- a/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc +++ /dev/null @@ -1,33 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/principa.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static pthread_mutex_t principal_lo 1 22 9 1 0 0.1 0.0 -void CORBA_release(){} 26 31 0 5 1 ! *** ! *** -CORBA_Boolean CORBA_is_nil(){} 33 37 0 4 1 ! *** ! *** -CORBA_Principal::CORBA_Principal(){ 39 41 0 2 0 ! *** -CORBA_Principal::~CORBA_Principal() 43 49 0 5 1 ! *** ! *** -DEFINE_GUID(IID_CORBA_Principal,0xa 51 57 4 2 0 0.5 0.0 -ULONG __stdcall CORBA_Principal::Ad 60 69 0 6 1 ! *** ! *** -ULONG __stdcall CORBA_Principal::Re 71 88 0 10 3 ! *** ! *** -HRESULT __stdcall CORBA_Principal:: 90 107 0 14 5 ! *** ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 13 58 12 4.5 0.9 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/principa.hh.cccc b/TAO/IIOP/docs/us/codecounts/principa.hh.cccc deleted file mode 100644 index eee81276ec6..00000000000 --- a/TAO/IIOP/docs/us/codecounts/principa.hh.cccc +++ /dev/null @@ -1,30 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/principa.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef class CORBA_Principal*CORBA 1 8 7 0 0 0.0 0.0 -void CORBA_release(); 10 10 0 0 0 -CORBA_Boolean CORBA_is_nil(); 11 11 0 0 0 -extern const IID IID_CORBA_Principa 13 13 0 0 0 -class _EXPCLASS CORBA_Principal:pub 15 52 12 17 0 1.4 0.0 -; 52 52 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 19 22 0 1.2 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/request.cpp.cccc b/TAO/IIOP/docs/us/codecounts/request.cpp.cccc deleted file mode 100644 index 5b717985743..00000000000 --- a/TAO/IIOP/docs/us/codecounts/request.cpp.cccc +++ /dev/null @@ -1,36 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/request.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -DEFINE_GUID(IID_CORBA_Request,0x774 1 19 7 2 0 0.3 0.0 -static pthread_mutex_t refcnt_lock= 22 22 0 0 0 -ULONG __stdcall CORBA_Request::AddR 26 35 0 6 1 ! *** ! *** -ULONG __stdcall CORBA_Request::Rele 37 52 0 10 3 ! *** ! *** -HRESULT __stdcall CORBA_Request::Qu 54 71 0 14 5 ! *** ! *** -void CORBA_release(){} 73 81 3 5 1 1.7 0.3 -CORBA_Boolean CORBA_is_nil(){} 83 87 0 4 1 ! *** ! *** -CORBA_Request::CORBA_Request(CORBA_ 89 106 3 14 0 4.7 0.0 -CORBA_Request::CORBA_Request(){} 109 121 0 11 0 ! *** -CORBA_Request::~CORBA_Request(){} 123 131 0 7 0 ! *** -void CORBA_Request::invoke(){} 133 154 8 11 2 1.4 0.3 -void CORBA_Request::send_oneway(){} 156 168 0 11 2 ! *** ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 21 107 15 5.1 0.7 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/request.hh.cccc b/TAO/IIOP/docs/us/codecounts/request.hh.cccc deleted file mode 100644 index 6859f7eaf38..00000000000 --- a/TAO/IIOP/docs/us/codecounts/request.hh.cccc +++ /dev/null @@ -1,31 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/request.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -void CORBA_release(); 1 8 6 1 0 0.2 0.0 -CORBA_Boolean CORBA_is_nil(); 9 9 0 0 0 -typedef CORBA_SEQUENCE<CORBA_TypeCo 11 11 0 0 0 -typedef CORBA_ExceptionList*CORBA_E 12 12 0 0 0 -extern const IID IID_CORBA_Request; 14 14 0 0 0 -class _EXPCLASS CORBA_Request:publi 16 69 6 39 6 6.5 1.0 -; 69 69 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 12 46 6 3.8 0.5 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc deleted file mode 100644 index 4386a9f01da..00000000000 --- a/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc +++ /dev/null @@ -1,43 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/roa.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -int ACE_ROA::end_reactor_event_loop 5 5 0 0 0 -ACE_Reactor ACE_ROA::theReactor; 6 6 0 0 0 -int ACE_ROA::usingThreads_=0; 7 7 0 0 0 -void*ACE_ROA::context_p=0; 8 8 0 0 0 -ACE_ROA::UpcallFunc ACE_ROA::theUpc 9 9 0 0 0 -ACE_ROA::ForwardFunc ACE_ROA::theFo 10 10 0 0 0 -TCP_OA_ptr ACE_ROA::theOA=0; 11 11 0 0 0 -ROA_Handler::ROA_Handler(){} 13 15 0 2 0 ! *** -int ROA_Handler::open(){} 17 35 0 17 4 ! *** ! *** -int ROA_Handler::handle_close(){} 37 40 0 3 0 ! *** -int ROA_Handler::handle_input(){} 42 75 11 16 1 1.5 0.1 -template class ACE_Acceptor<ROA_Han 82 83 1 0 0 0.0 0.0 -template class ACE_Svc_Handler<ACE_ 84 84 0 0 0 -template class ACE_Task<ACE_NULL_SY 85 86 1 0 0 0.0 0.0 -template class ACE_TSS<ACE_Dynamic> 86 87 1 0 0 0.0 0.0 -template class ACE_Message_Queue<AC 87 88 1 0 0 0.0 0.0 -template class ACE_Module<ACE_NULL_ 88 89 1 0 0 0.0 0.0 -template class ACE_Thru_Task<ACE_NU 89 90 1 0 0 0.0 0.0 -line 92: syntax error at "ÿ" missing Start --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 18 51 5 2.8 0.3 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/roa.hh.cccc b/TAO/IIOP/docs/us/codecounts/roa.hh.cccc deleted file mode 100644 index 32849e09c09..00000000000 --- a/TAO/IIOP/docs/us/codecounts/roa.hh.cccc +++ /dev/null @@ -1,30 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/roa.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -class TCP_OA; 1 18 1 1 0 1.0 0.0 -typedef TCP_OA*TCP_OA_ptr; 19 19 0 0 0 -class ACE_ROA{}; 21 62 9 24 0 2.7 0.0 -class ROA_Handler:public ACE_Svc_Ha 64 72 0 8 0 ! *** -; 72 72 0 0 0 -typedef ACE_Acceptor<ROA_Handler,AC 74 74 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 10 38 0 3.8 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/roa.i.cccc b/TAO/IIOP/docs/us/codecounts/roa.i.cccc deleted file mode 100644 index 9b2669b8251..00000000000 --- a/TAO/IIOP/docs/us/codecounts/roa.i.cccc +++ /dev/null @@ -1,35 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/roa.i -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -ACE_INLINE ACE_Reactor*ACE_ROA::rea 1 1 0 0 1 ! *** -ACE_INLINE int ACE_ROA::usingThread 3 3 0 0 1 ! *** -ACE_INLINE void ACE_ROA::usingThrea 4 4 0 0 0 -ACE_INLINE void*ACE_ROA::context(){ 6 6 0 0 1 ! *** -ACE_INLINE void ACE_ROA::context(vo 7 7 0 0 0 -ACE_INLINE ACE_ROA::UpcallFunc ACE_ 9 9 0 0 1 ! *** -ACE_INLINE void ACE_ROA::upcall(ACE 10 10 0 0 0 -ACE_INLINE ACE_ROA::ForwardFunc ACE 12 12 0 0 1 ! *** -ACE_INLINE void ACE_ROA::forwarder( 13 13 0 0 0 -ACE_INLINE TCP_OA_ptr ACE_ROA::oa() 15 15 0 0 1 ! *** -ACE_INLINE void ACE_ROA::oa(TCP_OA_ 16 16 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 0 11 6 ! *** ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc b/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc deleted file mode 100644 index 6cb51165aba..00000000000 --- a/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc +++ /dev/null @@ -1,26 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/sequence.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -template<>struct CORBA_SEQUENCE{}; 1 21 5 10 0 2.0 0.0 -typedef CORBA_SEQUENCE<CORBA_Octet> 23 23 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 5 12 0 2.4 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/stub.hh.cccc b/TAO/IIOP/docs/us/codecounts/stub.hh.cccc deleted file mode 100644 index 2dad231e858..00000000000 --- a/TAO/IIOP/docs/us/codecounts/stub.hh.cccc +++ /dev/null @@ -1,32 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/stub.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -enum param_type{}; 1 27 20 4 0 0.2 0.0 -struct paramdata{}; 29 49 19 1 0 0.1 0.0 -struct calldata{}; 52 83 28 3 0 0.1 0.0 -typedef void(*skeleton)(); 86 98 12 0 0 0.0 0.0 -struct skel_entry{}; 100 103 1 2 0 2.0 0.0 -extern const IID IID_STUB_Object; 107 117 10 0 0 0.0 0.0 -class _EXPCLASS STUB_Object:public 119 224 63 34 0 0.5 0.0 -; 224 224 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 153 51 0 0.3 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc b/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc deleted file mode 100644 index b9e9230c2e0..00000000000 --- a/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc +++ /dev/null @@ -1,39 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/svrrqst.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -DEFINE_GUID(IID_IIOP_ServerRequest, 1 20 7 2 0 0.3 0.0 -DEFINE_GUID(IID_CORBA_ServerRequest 22 24 1 1 0 1.0 0.0 -static pthread_mutex_t svrqst_lock= 29 29 0 0 0 -IIOP_ServerRequest::~IIOP_ServerReq 33 42 0 9 3 ! *** ! *** -ULONG __stdcall IIOP_ServerRequest: 45 55 0 7 1 ! *** ! *** -ULONG __stdcall IIOP_ServerRequest: 57 73 0 11 3 ! *** ! *** -HRESULT __stdcall IIOP_ServerReques 75 95 0 17 6 ! *** ! *** -void __stdcall IIOP_ServerRequest:: 98 173 36 31 3 0.9 0.1 -void __stdcall IIOP_ServerRequest:: 176 196 6 12 3 2.0 0.5 -void __stdcall IIOP_ServerRequest:: 199 219 4 15 3 3.8 0.8 -CORBA_String __stdcall IIOP_ServerR 222 230 3 5 1 1.7 0.3 -CORBA_Object_ptr __stdcall IIOP_Ser 232 238 1 5 1 5.0 1.0 -CORBA_Principal_ptr __stdcall IIOP_ 240 246 1 5 1 5.0 1.0 -CORBA_ORB_ptr __stdcall IIOP_Server 248 253 0 5 1 ! *** ! *** -TOA_ptr __stdcall IIOP_ServerReques 255 260 0 5 1 ! *** ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 59 145 27 2.5 0.5 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc b/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc deleted file mode 100644 index aa6da40edce..00000000000 --- a/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc +++ /dev/null @@ -1,35 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/svrrqst.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef class CORBA_ServerRequest*C 1 16 9 1 0 0.1 0.0 -typedef class CORBA_ORB*CORBA_ORB_p 17 17 0 0 0 -typedef class TOA*TOA_ptr; 18 18 0 0 0 -void CORBA_release(); 20 20 0 0 0 -CORBA_Boolean CORBA_is_nil(); 21 21 0 0 0 -extern const IID IID_CORBA_ServerRe 23 23 0 0 0 -class _EXPCLASS CORBA_ServerRequest 25 78 29 21 0 0.7 0.0 -; 78 78 0 0 0 -extern const IID IID_IIOP_ServerReq 80 80 0 0 0 -class _EXPCLASS IIOP_ServerRequest: 82 159 17 51 0 3.0 0.0 -; 159 159 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 55 82 0 1.5 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc b/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc deleted file mode 100644 index 24592ade908..00000000000 --- a/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc +++ /dev/null @@ -1,25 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/t-sizes.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -int main(){} 6 15 0 9 0 ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 0 10 0 ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc deleted file mode 100644 index b32010c4109..00000000000 --- a/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc +++ /dev/null @@ -1,29 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/t-xdr.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef CORBA_SEQUENCE<CORBA_Octet> 1 34 12 2 0 0.2 0.0 -struct interesting{}; 36 73 18 12 0 0.7 0.0 -extern CORBA_TypeCode TC_opaque; 75 78 2 1 0 0.5 0.0 -static void do_test(){} 80 225 34 82 ! 30 2.4 0.9 -int main(){} 228 264 3 29 3 ? 9.7 1.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 69 131 33 1.9 0.5 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc b/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc deleted file mode 100644 index e606b23721b..00000000000 --- a/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc +++ /dev/null @@ -1,68 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/tc_const.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static CORBA_TypeCode tc_null(); 1 25 18 1 0 0.1 0.0 -const CORBA_TypeCode_ptr _tc_CORBA_ 26 26 0 0 0 -CORBA_TypeCode_ptr CORBA_TypeCode:: 28 32 0 4 1 ! *** ! *** -static CORBA_TypeCode tc_void(); 34 34 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 35 35 0 0 0 -static CORBA_TypeCode tc_short(); 37 40 3 0 0 0.0 0.0 -const CORBA_TypeCode_ptr _tc_CORBA_ 41 41 0 0 0 -static CORBA_TypeCode tc_long(); 43 43 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 44 44 0 0 0 -static CORBA_TypeCode tc_longlong() 46 46 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 47 47 0 0 0 -static CORBA_TypeCode tc_ushort(); 49 49 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 50 50 0 0 0 -static CORBA_TypeCode tc_ulong(); 52 52 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 53 53 0 0 0 -static CORBA_TypeCode tc_ulonglong( 55 55 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 56 56 0 0 0 -static CORBA_TypeCode tc_float(); 58 61 3 0 0 0.0 0.0 -const CORBA_TypeCode_ptr _tc_CORBA_ 62 62 0 0 0 -static CORBA_TypeCode tc_double(); 64 64 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 65 65 0 0 0 -static CORBA_TypeCode tc_longdouble 67 67 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 68 68 0 0 0 -static CORBA_TypeCode tc_boolean(); 70 73 3 0 0 0.0 0.0 -const CORBA_TypeCode_ptr _tc_CORBA_ 74 74 0 0 0 -static CORBA_TypeCode tc_octet(); 76 76 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 77 77 0 0 0 -static CORBA_TypeCode tc_char(); 79 84 5 0 0 0.0 0.0 -const CORBA_TypeCode_ptr _tc_CORBA_ 85 85 0 0 0 -static CORBA_TypeCode tc_wchar(); 87 87 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 88 88 0 0 0 -static CORBA_TypeCode tc_string(); 90 90 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 91 91 0 0 0 -static CORBA_TypeCode tc_wstring(); 93 93 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 94 94 0 0 0 -static CORBA_TypeCode tc_any(); 96 100 4 0 0 0.0 0.0 -const CORBA_TypeCode_ptr _tc_CORBA_ 101 101 0 0 0 -static CORBA_TypeCode tc_typecode() 103 103 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 104 104 0 0 0 -static CORBA_TypeCode tc_principal( 106 106 0 0 0 -const CORBA_TypeCode_ptr _tc_CORBA_ 107 107 0 0 0 -static const unsigned char oc_objre 109 128 8 11 0 1.4 0.0 -static CORBA_TypeCode tc_objref(); 129 131 0 2 0 ! *** -const CORBA_TypeCode_ptr _tc_CORBA_ 132 132 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 44 62 1 1.4 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc deleted file mode 100644 index a5e145edfe2..00000000000 --- a/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc +++ /dev/null @@ -1,51 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/tcpoa.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static TCP_OA*the_oa; 1 44 14 1 0 0.1 0.0 -static pthread_key_t request_key; 47 47 0 0 0 -static pthread_mutex_t tcpoa_mutex= 48 48 0 0 0 -static pthread_mutex_t tcpoa_lock=P 49 49 0 0 0 -static pthread_attr_t thread_attr; 50 50 0 0 0 -static void tcp_oa_dispatcher(){} 53 180 45 59 ? 10 1.3 0.2 -static GIOP::LocateStatusType tcp_o 182 206 4 18 5 4.5 1.3 -TCP_OA::TCP_OA(CORBA_ORB_ptr owning 209 237 5 19 3 3.8 0.6 -TCP_OA::~TCP_OA(){} 239 241 0 2 0 ! *** -TCP_OA_ptr TCP_OA::init(){} 244 288 11 18 3 1.6 0.3 -CORBA_Object_ptr __stdcall TCP_OA:: 291 348 9 41 ? 8 4.6 0.9 -CORBA_OctetSeq*__stdcall TCP_OA::ge 351 364 4 9 1 2.3 0.3 -((GIOP::RequestHeader*)pthread_gets 368 382 9 1 0 0.1 0.0 -CORBA_Object_ptr __stdcall _this(){ 386 436 23 22 6 1.0 0.3 -CORBA_OctetSeq*__stdcall TCP_OA::ge 439 454 6 8 1 1.3 0.2 -CORBA_Principal_ptr __stdcall TCP_O 457 472 6 8 1 1.3 0.2 -void TCP_OA::handle_message(){} 474 489 3 8 1 2.7 0.3 -void*TCP_OA::worker(){} 493 527 16 15 4 0.9 0.3 -void __stdcall TCP_OA::get_request( 531 779 128 82 ? 14 0.6 0.1 -void __stdcall TCP_OA::please_shutd 782 797 3 9 0 3.0 0.0 -void __stdcall TCP_OA::clean_shutdo 799 824 3 15 2 5.0 0.7 -void __stdcall TCP_OA::register_dir 827 848 3 16 2 5.3 0.7 -void __stdcall TCP_OA::get_request( 850 873 9 13 2 1.4 0.2 -DEFINE_GUID(IID_TCP_OA,0xa201e4c4,0 876 882 4 2 0 0.5 0.0 -ULONG __stdcall TCP_OA::AddRef(){Cr 885 894 0 6 1 ! *** ! *** -ULONG __stdcall TCP_OA::Release(){C 896 913 0 10 3 ! *** ! *** -HRESULT __stdcall TCP_OA::QueryInte 915 934 0 16 6 ! *** ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 305 425 73 1.4 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc b/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc deleted file mode 100644 index 8feca7cce56..00000000000 --- a/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc +++ /dev/null @@ -1,31 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/tcpoa.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -class _EXPCLASS TCP_OA; 1 33 26 1 0 0.0 0.0 -typedef TCP_OA*TCP_OA_ptr; 34 34 0 0 0 -extern const IID IID_TCP_OA; 38 38 0 0 0 -class _EXPCLASS TCP_OA:public TOA{p 40 224 93 61 2 0.7 0.0 -; 224 224 0 0 0 -typedef TCP_OA*TCP_OA_ptr; 226 226 0 0 0 -extern CORBA_Object_ptr __stdcall _ 229 245 16 0 0 0.0 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 135 68 2 0.5 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/thread.hh.cccc b/TAO/IIOP/docs/us/codecounts/thread.hh.cccc deleted file mode 100644 index 4b1e08a0cfd..00000000000 --- a/TAO/IIOP/docs/us/codecounts/thread.hh.cccc +++ /dev/null @@ -1,35 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/thread.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef thread_t pthread_t; 1 67 39 4 0 0.1 0.0 -typedef mutex_t pthread_mutex_t; 68 68 0 0 0 -typedef cond_t pthread_cond_t; 69 69 0 0 0 -typedef unsigned long pthread_attr_ 70 70 0 0 0 -typedef thread_key_t pthread_key_t; 71 71 0 0 0 -struct pthread_once_t{}; 81 84 0 3 0 ! *** -inline void pthread_once(pthread_on 88 97 0 9 1 ! *** ! *** -inline void*pthread_getspecific(pth 107 114 0 6 1 ! *** ! *** -inline int pthread_create(pthread_t 118 127 0 9 1 ! *** ! *** -class Critical{}; 133 156 6 14 0 2.3 0.0 -class ForceSynchronousCancel{}; 159 181 10 8 0 0.8 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 55 64 3 1.2 0.1 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc deleted file mode 100644 index 98d352ea297..00000000000 --- a/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc +++ /dev/null @@ -1,27 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/toa.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -DEFINE_GUID(IID_TOA,0xa201e4c8,0xf2 1 44 14 3 0 0.2 0.0 -TOA_ptr TOA::get_named_toa(){} 47 102 28 22 5 0.8 0.2 -TOA_ptr TOA::get_toa(){} 105 147 15 22 5 1.5 0.3 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 57 50 10 0.9 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/toa.hh.cccc b/TAO/IIOP/docs/us/codecounts/toa.hh.cccc deleted file mode 100644 index 3229e548e61..00000000000 --- a/TAO/IIOP/docs/us/codecounts/toa.hh.cccc +++ /dev/null @@ -1,30 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/toa.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -typedef class TOA*TOA_ptr; 1 18 10 1 0 0.1 0.0 -CORBA_Boolean is_nil(); 20 20 0 0 0 -void release(); 21 21 0 0 0 -extern const IID IID_TOA; 23 23 0 0 0 -class TOA:public IUnknown{public:vi 25 187 113 41 0 0.4 0.0 -; 187 187 0 0 0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 123 47 0 0.4 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc b/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc deleted file mode 100644 index 11a4a8c0c88..00000000000 --- a/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc +++ /dev/null @@ -1,41 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/typecode.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -static pthread_mutex_t refcnt_lock= 1 38 20 1 0 0.1 0.0 -void CORBA_release(){} 42 47 0 5 1 ! *** ! *** -CORBA_Boolean CORBA_is_nil(){} 49 53 0 4 1 ! *** ! *** -CORBA_TypeCode::CORBA_TypeCode(CORB 55 69 4 10 0 2.5 0.0 -CORBA_TypeCode::CORBA_TypeCode(CORB 72 115 20 21 1 1.0 0.1 -CORBA_TypeCode::~CORBA_TypeCode(){} 118 129 5 6 2 1.2 0.4 -DEFINE_GUID(IID_CORBA_TypeCode,0xa2 132 139 5 2 0 0.4 0.0 -ULONG __stdcall CORBA_TypeCode::Add 142 151 0 6 1 ! *** ! *** -ULONG __stdcall CORBA_TypeCode::Rel 153 168 0 11 4 ! *** ! *** -HRESULT __stdcall CORBA_TypeCode::Q 170 187 0 14 5 ! *** ! *** -CORBA_TCKind CORBA_TypeCode::kind(C 190 200 3 7 1 2.3 0.3 -static CORBA_Boolean skip_typecode( 203 252 15 29 ? 9 1.9 0.6 -CORBA_Any_ptr CORBA_TypeCode::membe 255 341 29 44 ? 19 1.5 0.7 -CORBA_ULong CORBA_TypeCode::param_c 344 434 23 53 ! 22 2.3 1.0 -CORBA_ULong CORBA_TypeCode::ulong_p 437 507 26 36 ? 16 1.4 0.6 -CORBA_TypeCode_ptr CORBA_TypeCode:: 510 672 43 99 ! 58 2.3 1.3 -CORBA_String CORBA_TypeCode::id(COR 675 711 15 19 3 1.3 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 208 384 143 1.8 0.7 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc b/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc deleted file mode 100644 index 494931168d4..00000000000 --- a/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc +++ /dev/null @@ -1,36 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/typecode.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -enum CORBA_TCKind{}; 1 50 23 26 0 1.1 0.0 -extern CORBA_TypeCode_ptr _tc_CORBA 53 56 3 0 0 0.0 0.0 -class CORBA_Bounds{}; 57 62 0 5 0 ! *** -extern CORBA_TypeCode_ptr _tc_CORBA 64 64 0 0 0 -class CORBA_BadKind{}; 65 70 0 5 0 ! *** -typedef class CORBA_TypeCode*CORBA_ 73 82 9 0 0 0.0 0.0 -void CORBA_release(); 83 83 0 0 0 -CORBA_Boolean CORBA_is_nil(); 84 84 0 0 0 -extern const IID IID_CORBA_TypeCode 86 86 0 0 0 -class _EXPCLASS CORBA_TypeCode:publ 88 266 101 56 2 0.6 0.0 -; 266 266 0 0 0 -extern const CORBA_TypeCode_ptr _tc 268 298 3 21 0 7.0 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 139 124 2 0.9 0.0 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc deleted file mode 100644 index 90d59d8dd98..00000000000 --- a/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc +++ /dev/null @@ -1,33 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/xdr.cpp -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -CORBA_Boolean XDR_stream::put_longl 1 52 31 6 1 0.2 0.0 -CORBA_Boolean XDR_stream::get_longl 54 59 0 5 1 ! *** ! *** -CORBA_Boolean XDR_stream::put_longd 62 70 3 5 1 1.7 0.3 -CORBA_Boolean XDR_stream::get_longd 72 77 0 5 1 ! *** ! *** -CORBA_TypeCode::traverse_status XDR 80 406 82 ? 202 ! 65 2.5 0.8 -extern CORBA_TypeCode_ptr __tc_cons 410 413 3 0 0 0.0 0.0 -CORBA_TypeCode::traverse_status XDR 416 766 82 ? 220 ! 60 2.7 0.7 -CORBA_Boolean XDR_stream::flush_fra 769 801 10 15 3 1.5 0.3 -CORBA_Boolean XDR_stream::read_frag 804 815 5 5 1 1.0 0.2 --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 216 472 133 2.2 0.6 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc b/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc deleted file mode 100644 index 45e2ca773c7..00000000000 --- a/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc +++ /dev/null @@ -1,27 +0,0 @@ - -CCCC - a code counter for C and C++ -=================================== - -A program to analyse C and C++ source code and report on -some simple software metrics -Version 1.00 -Copyright Tim Littlefair, 1995 - -The development of this program was heavily dependent on -the Purdue Compiler Construction Tool Set (PCCTS) -by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung -and others. - -This software is provided with NO WARRANTY - - -Scope: ../../../lib/xdr.hh -Canonical name From To COM LOC MVG L/C M/C --------------------- ---- ---- ----- ----- ----- ----- ----- -class XDR_stream{}; 1 269 78 ? 149 ! 32 1.9 0.4 -inline CORBA_Boolean XDR_stream::ou 271 275 0 4 1 ! *** ! *** -inline CORBA_Boolean XDR_stream::pu 277 287 0 10 4 ! *** ! *** --------------------- ---- ---- ----- ----- ----- ----- ----- -Summary for scope: 78 166 37 2.1 0.5 --------------------- ---- ---- ----- ----- ----- ----- ----- - diff --git a/TAO/IIOP/docs/us/plan.html b/TAO/IIOP/docs/us/plan.html deleted file mode 100644 index 5650257a330..00000000000 --- a/TAO/IIOP/docs/us/plan.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> -<html> - <head> - <title>IIOP Notes</title> - </head> - - <body> - <h1>IIOP Notes</h1> - - <p> - The current plan for transforming the Sun IIOP Reference - implementation into the basis of the TAO is: - - <ol> - <li>Replace selected portions of code with ACE components while maintaining the current architecture and design. - <li>Distill the design patterns and begin re-architecting. - </ol> - - <p> - Please feel free to email additions to this list! - - <hr> - <address><a href="mailto:cleeland@cs.wustl.edu">Chris Cleeland</a></address> -<!-- Created: Fri Feb 14 15:22:32 CST 1997 --> -<!-- hhmts start --> -Last modified: Fri Feb 14 15:46:52 CST -<!-- hhmts end --> - </body> -</html> diff --git a/TAO/IIOP/docs/us/server b/TAO/IIOP/docs/us/server deleted file mode 100644 index afad69638a8..00000000000 --- a/TAO/IIOP/docs/us/server +++ /dev/null @@ -1,5 +0,0 @@ -This note describes architectural differences between the Sun IIOP -Reference implementation (SIR) and a new architecture based on ACE. -After narrating the SIR architecture, shortcomings of that design are -highlighted, and a solution known as The ACE ORB (TAO) presented. - diff --git a/TAO/IIOP/test/Build/clnt.bld b/TAO/IIOP/test/Build/clnt.bld deleted file mode 100755 index 76e60ef8967..00000000000 --- a/TAO/IIOP/test/Build/clnt.bld +++ /dev/null @@ -1,8 +0,0 @@ -#!build -default: - program - :debuglevel=multi -../cubit.cpp - C++ -../clnt.cpp - C++ diff --git a/TAO/IIOP/test/Build/default.bld b/TAO/IIOP/test/Build/default.bld deleted file mode 100755 index cdf3e2e8210..00000000000 --- a/TAO/IIOP/test/Build/default.bld +++ /dev/null @@ -1,19 +0,0 @@ -#!build -default: - nobuild - :debuglevel=multi - :target=vxwppc - :sourcedirs=/home/ace/ACE_wrappers.vxworks - :sourcedirs=../../proto/include - :sourcedirs=../.. - :libraries=../../proto/lib/tao.a - :libraries=/home/ace/ACE_wrappers.vxworks/ace/libACE.a - :libraries=/appl/newgreen/vxppc603/indlib.o - :defines=DEBUG -clnt.bld - program - :debuglevel=multi -svr.bld - program - :debuglevel=multi - :defines=USE_ACE_EVENT_HANDLING diff --git a/TAO/IIOP/test/Build/svr.bld b/TAO/IIOP/test/Build/svr.bld deleted file mode 100755 index 7c8725356b2..00000000000 --- a/TAO/IIOP/test/Build/svr.bld +++ /dev/null @@ -1,8 +0,0 @@ -#!build -default: - program - :debuglevel=multi -../svr.cpp - C++ -../cubit.cpp - C++ diff --git a/TAO/IIOP/test/Makefile b/TAO/IIOP/test/Makefile deleted file mode 100644 index 9237323f9c8..00000000000 --- a/TAO/IIOP/test/Makefile +++ /dev/null @@ -1,121 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the ACE-ified Sun Ref. implementation -# of IIOP ORB -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lcorba - -PROG_SRCS = svr.cpp clnt.cpp cubit.cpp \ - test1.cpp test1_clnt.cpp test1_svr.cpp \ - echo_clnt.cpp echo_svr.cpp - -LSRC = $(PROG_SRCS) - -CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o -CUBIT_CLT_OBJS = clnt.o cubitC.o - -BASIC_SVR_OBJS = test1.o test1_svr.o -BASIC_CLT_OBJS = test1.o test1_clnt.o - -ECHO_SVR_OBJS = test1.o echo_svr.o -ECHO_CLT_OBJS = test1.o echo_clnt.o - -BIN = svr clnt test1_svr test1_clnt -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -# Local modifications to variables imported by includes above. -LDFLAGS += -L../proto/lib -CPPFLAGS += -I../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG - -svr: $(addprefix $(VDIR),$(CUBIT_SVR_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -clnt: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -test1_svr: $(addprefix $(VDIR),$(BASIC_SVR_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -test1_clnt: $(addprefix $(VDIR),$(BASIC_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -######## -# Sanity check builds by running basic functionality tests. -# -# "sleep 5" in the server startup is usually enough to get the -# objref into the file so the client can read it. -# -check: $(TESTS) - @echo "testing with 'cube' calls, stub + DII, IOR strings" - @./svr -i30 -o non-internet > obj.1 & sleep 5 - @./clnt -n250 -O `cat obj.1` -x - @echo '' - @echo "testing request forwarding with 'cube' calls, stub + DII" - @./svr -f -i30 > obj.2 & sleep 5 - @./clnt -n250 -O `cat obj.2` -x - @echo '' - @echo "testing transmission of primitive data types" - @./test1_svr -i30 > obj.3 & sleep 5 - @./test1_clnt -n50 -O `cat obj.3` -x - @echo '' -# @echo "testing echo of primitive data values" -# @./echo_svr -i30 > obj.4 & sleep 5 -# @./echo_clnt -O `cat obj.4` -x -# @echo '' - @echo "testing with 'cube' calls, MT-ized (no forwarding)" - @./svr -t -i30 -o non-internet > obj.5 & sleep 5 - @./clnt -n250 -O `cat obj.5` -x - @echo '' - -ifdef LOCALRULES -######## -# CUBIT test -svr: svr.o cubit.o - $(LINK.cc) -o svr svr.o cubit.o $(LDLIBS) $(POSTLINK) -clnt: cubit.o clnt.o - $(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS) $(POSTLINK) - -######## -# BASIC DATATYPES test -test1_clnt: test1.o test1_clnt.o - $(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS) $(POSTLINK) -test1_svr: test1.o test1_svr.o - $(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS) $(POSTLINK) - -######## -# ECHO test ... "test1" where the operation semantics are violated; -# this aids some porting work, but is a less rigorous test -echo_clnt: test1.o echo_clnt.o - $(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS) $(POSTLINK) -echo_svr: test1.o echo_svr.o - $(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS) $(POSTLINK) -endif - -clean: - -rm -rf *.o $(BIN) obj.* core Templates.DB .make.state - -install: - -@echo "Nothing to install, these are tests!" - - - - - diff --git a/TAO/IIOP/test/Orbeline/base_server/Makefile b/TAO/IIOP/test/Orbeline/base_server/Makefile deleted file mode 100644 index 9fdad280ffc..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -include stdmk - -EXE = server - -all: $(EXE) - -clean: - -rm -f core *.o cubitC.* cubitS.* $(EXE) - -rm -rf Templates.DB - -cubitS.cpp: cubit.idl - $(ORBCC) cubit.idl - -cubitC.cpp: cubit.idl - $(ORBCC) cubit.idl - -server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o - $(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \ - $(LIBPATH) $(LIBORB) $(STDCC_LIBS) diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp deleted file mode 100644 index d20d988f48b..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// $Id$ - -#include "Profile_Timer.h" - -/* Initialize interval timer. */ - -Profile_Timer::Profile_Timer (void) -{ - char buf[20]; - ::sprintf(buf, "/proc/%d", ::getpid ()); - - ::memset (&this->end_usage_, 0, sizeof this->end_usage_); - ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_); - ::memset (&this->last_usage_, 0, sizeof this->last_usage_); - if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1) - ::perror (buf); -} - -/* Terminate the interval timer. */ -Profile_Timer::~Profile_Timer (void) -{ - if (::close (this->proc_fd_) == -1) - ::perror ("Profile_Timer::~Profile_Timer"); -} - -/* Return the resource utilization. */ - -void -Profile_Timer::get_rusage (prusage_t &rusage) -{ - rusage = this->end_usage_; -} - -/* Compute the amount of resource utilization since the start time. */ - -void -Profile_Timer::elapsed_rusage (prusage_t &rusage) -{ - rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid; - rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count; - rusage.pr_minf = this->end_usage_.pr_minf - this->last_usage_.pr_minf; - rusage.pr_majf = this->end_usage_.pr_majf - this->last_usage_.pr_majf; - rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk; - rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk; - rusage.pr_msnd = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd; - rusage.pr_mrcv = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv; - rusage.pr_sigs = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs; - this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime); - this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime); - this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime); - rusage.pr_vctx = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx; - rusage.pr_ictx = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx; - rusage.pr_sysc = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc; - rusage.pr_ioch = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch; -} - -/* Compute the elapsed time. */ - -void -Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) -{ - timespec_t td; - - this->subtract (td, end.pr_tstamp, begin.pr_tstamp); - et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_utime, begin.pr_utime); - et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_stime, begin.pr_stime); - et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); -} - -/* Compute the amount of time that has elapsed between start and stop. */ - -int -Profile_Timer::elapsed_time (Elapsed_Time &et) -{ - this->compute_times (et, this->end_usage_, this->begin_usage_); - return 0; -} - -/* Determine the difference between T1 and T2. */ - -void -Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) -{ - tdiff.tv_sec = t1.tv_sec - t0.tv_sec; - tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; - - /* Normalize the time. */ - - while (tdiff.tv_nsec < 0) - { - tdiff.tv_sec--; - tdiff.tv_nsec += (1000 * 1000 * 1000); - } -} - -#if defined (DEBUG) -#include <stdlib.h> -extern "C" int gettimeofday (timeval *tp); - -const int DEFAULT_ITERATIONS = 1000000; - -int -main (int argc, char *argv[]) -{ - Profile_Timer timer; - int iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS; - timeval tv; - - timer.start (); - - for (int i = 0; i < iterations; i++) - gettimeofday (&tv); - - timer.stop (); - - Profile_Timer::Elapsed_Time et; - - timer.elapsed_time (et); - - printf ("iterations = %d\n", iterations); - printf ("real time = %f secs, user time = %f secs, system time = %f secs\n", - et.real_time, et.user_time, et.system_time); - - printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000); - return 0; -} -#endif /* DEBUG */ diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h deleted file mode 100644 index 4198fba9a10..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* An interval timer class using C++. */ - -#if !defined (ACE_PROFILE_TIMER_H) -#define ACE_PROFILE_TIMER_H - -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/procfs.h> -#include <stdio.h> -#include <memory.h> - -class Profile_Timer -{ -public: - struct Elapsed_Time - { - double real_time; - double user_time; - double system_time; - }; - - Profile_Timer (void); - ~Profile_Timer (void); - int start (void); - int stop (void); - int elapsed_time (Elapsed_Time &et); - void elapsed_rusage (prusage_t &rusage); - void get_rusage (prusage_t &rusage); - -private: - void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); - void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); - - prusage_t begin_usage_; - prusage_t end_usage_; - prusage_t last_usage_; - int proc_fd_; -}; - -/* Start timing */ - -inline int -Profile_Timer::start (void) -{ - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); -} - -/* Stop timing */ - -inline int -Profile_Timer::stop (void) -{ - this->last_usage_ = this->end_usage_; - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); -} - -#endif /* ACE_PROFILE_TIMER_H */ - diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit.idl b/TAO/IIOP/test/Orbeline/base_server/cubit.idl deleted file mode 100644 index 7eedbe786ab..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. -// -//#pragma prefix "Eng.SUN.COM" -//#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp deleted file mode 100644 index c4313a1fccb..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit () - {} diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h deleted file mode 100644 index f1f5e3fa3ea..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubitS.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual _sk_Cubit { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - -#ifdef Cubit_USE_BOA - Cubit_Impl (const char *obj_name = NULL) : - _sk_Cubit(obj_name) - {} -#else - Cubit_Impl (const char *obj_name = NULL) - {} -#endif /* Cubit_USE_BOA */ - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - virtual CORBA::Short cube_short(CORBA::Short s); - virtual CORBA::Long cube_long(CORBA::Long l); - virtual Cubit::Many cube_struct(const Cubit::Many& values); - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - virtual void please_exit(); -}; - -#endif diff --git a/TAO/IIOP/test/Orbeline/base_server/server.cpp b/TAO/IIOP/test/Orbeline/base_server/server.cpp deleted file mode 100644 index 99c65c6718e..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/server.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#include "cubit_impl.h" // server header file - -int -main (int argc, char** argv) -{ - - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - CORBA::BOA_var boa = orb->BOA_init(argc, argv); - -#ifdef Cubit_USE_BOA - Cubit_Impl cb("Cubit"); - cout << "Using BOA approach" << endl; -#else - Cubit_Impl tied("Cubit"); - _tie_Cubit<Cubit_Impl> cb(tied, "Cubit"); - - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // - // Go get some work to do.... - // - try { - - boa->obj_is_ready(&cb); - - boa->impl_is_ready(); - - } catch (const CORBA::Exception &excep) { - cerr << "Server error: " << excep << endl; - return -1; - } catch (...) { - cerr << "Unknown exception" << endl; - return -1; - } - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/test/Orbeline/base_server/stdmk b/TAO/IIOP/test/Orbeline/base_server/stdmk deleted file mode 100644 index df4125a38d8..00000000000 --- a/TAO/IIOP/test/Orbeline/base_server/stdmk +++ /dev/null @@ -1,36 +0,0 @@ -CC = CC -DEBUG = - -ORBELINEDIR = /project/waltz/Orbeline2.0 - -ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h - -CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR) - -CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA - -LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace - -STDCC_LIBS = -lsocket -lnsl -ldl -mt - -LIBORB = -lorb - -LIBACE = -lACE - -.SUFFIXES: .C .o .h .hh .cc .cpp - -.C.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.cc.o: - $(CC) $(CCFLAGS) -c -o $@ $< -.cpp.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.C.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - -.cc.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - - diff --git a/TAO/IIOP/test/Orbeline/client/Makefile b/TAO/IIOP/test/Orbeline/client/Makefile deleted file mode 100644 index d9c26fe56f0..00000000000 --- a/TAO/IIOP/test/Orbeline/client/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -include stdmk - -EXE = client - -all: $(EXE) - -clean: - -rm -f core *.o cubitC.* cubitS.* $(EXE) - -rm -rf Templates.DB - -cubitS.cpp: cubit.idl - $(ORBCC) cubit.idl - -cubitC.cpp: cubit.idl - $(ORBCC) cubit.idl - -client: cubitC.o Profile_Timer.o client.o - $(CC) -o client cubitC.o Profile_Timer.o client.o \ - $(LIBPATH) $(LIBORB) $(STDCC_LIBS) diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp deleted file mode 100644 index d20d988f48b..00000000000 --- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// $Id$ - -#include "Profile_Timer.h" - -/* Initialize interval timer. */ - -Profile_Timer::Profile_Timer (void) -{ - char buf[20]; - ::sprintf(buf, "/proc/%d", ::getpid ()); - - ::memset (&this->end_usage_, 0, sizeof this->end_usage_); - ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_); - ::memset (&this->last_usage_, 0, sizeof this->last_usage_); - if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1) - ::perror (buf); -} - -/* Terminate the interval timer. */ -Profile_Timer::~Profile_Timer (void) -{ - if (::close (this->proc_fd_) == -1) - ::perror ("Profile_Timer::~Profile_Timer"); -} - -/* Return the resource utilization. */ - -void -Profile_Timer::get_rusage (prusage_t &rusage) -{ - rusage = this->end_usage_; -} - -/* Compute the amount of resource utilization since the start time. */ - -void -Profile_Timer::elapsed_rusage (prusage_t &rusage) -{ - rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid; - rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count; - rusage.pr_minf = this->end_usage_.pr_minf - this->last_usage_.pr_minf; - rusage.pr_majf = this->end_usage_.pr_majf - this->last_usage_.pr_majf; - rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk; - rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk; - rusage.pr_msnd = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd; - rusage.pr_mrcv = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv; - rusage.pr_sigs = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs; - this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime); - this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime); - this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime); - rusage.pr_vctx = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx; - rusage.pr_ictx = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx; - rusage.pr_sysc = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc; - rusage.pr_ioch = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch; -} - -/* Compute the elapsed time. */ - -void -Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) -{ - timespec_t td; - - this->subtract (td, end.pr_tstamp, begin.pr_tstamp); - et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_utime, begin.pr_utime); - et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_stime, begin.pr_stime); - et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); -} - -/* Compute the amount of time that has elapsed between start and stop. */ - -int -Profile_Timer::elapsed_time (Elapsed_Time &et) -{ - this->compute_times (et, this->end_usage_, this->begin_usage_); - return 0; -} - -/* Determine the difference between T1 and T2. */ - -void -Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) -{ - tdiff.tv_sec = t1.tv_sec - t0.tv_sec; - tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; - - /* Normalize the time. */ - - while (tdiff.tv_nsec < 0) - { - tdiff.tv_sec--; - tdiff.tv_nsec += (1000 * 1000 * 1000); - } -} - -#if defined (DEBUG) -#include <stdlib.h> -extern "C" int gettimeofday (timeval *tp); - -const int DEFAULT_ITERATIONS = 1000000; - -int -main (int argc, char *argv[]) -{ - Profile_Timer timer; - int iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS; - timeval tv; - - timer.start (); - - for (int i = 0; i < iterations; i++) - gettimeofday (&tv); - - timer.stop (); - - Profile_Timer::Elapsed_Time et; - - timer.elapsed_time (et); - - printf ("iterations = %d\n", iterations); - printf ("real time = %f secs, user time = %f secs, system time = %f secs\n", - et.real_time, et.user_time, et.system_time); - - printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000); - return 0; -} -#endif /* DEBUG */ diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h deleted file mode 100644 index 4198fba9a10..00000000000 --- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* An interval timer class using C++. */ - -#if !defined (ACE_PROFILE_TIMER_H) -#define ACE_PROFILE_TIMER_H - -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/procfs.h> -#include <stdio.h> -#include <memory.h> - -class Profile_Timer -{ -public: - struct Elapsed_Time - { - double real_time; - double user_time; - double system_time; - }; - - Profile_Timer (void); - ~Profile_Timer (void); - int start (void); - int stop (void); - int elapsed_time (Elapsed_Time &et); - void elapsed_rusage (prusage_t &rusage); - void get_rusage (prusage_t &rusage); - -private: - void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); - void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); - - prusage_t begin_usage_; - prusage_t end_usage_; - prusage_t last_usage_; - int proc_fd_; -}; - -/* Start timing */ - -inline int -Profile_Timer::start (void) -{ - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); -} - -/* Stop timing */ - -inline int -Profile_Timer::stop (void) -{ - this->last_usage_ = this->end_usage_; - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); -} - -#endif /* ACE_PROFILE_TIMER_H */ - diff --git a/TAO/IIOP/test/Orbeline/client/client.cpp b/TAO/IIOP/test/Orbeline/client/client.cpp deleted file mode 100644 index d9eb91526d7..00000000000 --- a/TAO/IIOP/test/Orbeline/client/client.cpp +++ /dev/null @@ -1,232 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : client.C -// DESCRIPTION: -// -// Client for the Cubit example -// -//**************************************************************************** - -#include <iostream.h> -#include <stdio.h> -#include <string.h> -#include <time.h> -#include <stdlib.h> -#include "cubitC.h" -#include "Profile_Timer.h" - -int LOOP_COUNT; -char SERVER_HOST [1024]; - -inline int func (unsigned i) { return i - 117; } -void run_tests (Cubit_var, int); - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - if (argc != 3) { - cerr << "Format: client <machine name> <loop count>" << endl; - return -1; - } - - strcpy(SERVER_HOST, argv[1]); - - LOOP_COUNT = atoi(argv[2]); - - return 0; // Indicates successful parsing of command line -} - - -// -// Mainline -// -int -main (int argc, char *argv[]) -{ - if (parse_args (argc, argv) != 0) - return -1; - - Cubit_var cb; - // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ; - - // - // Initialise client's binding to an - // arbitrary cubit server (at some host) - // - try { - cb = Cubit::_bind ("Cubit", SERVER_HOST); - - } catch (const CORBA::Exception & sysEx) { - cerr << "Binding failed: " << endl; - cerr << sysEx; - } catch (...) { - cerr << "Unexpected exception" << endl; - } - - run_tests (cb, LOOP_COUNT); - return 0; -} - - -void -run_tests (Cubit_var cb, int loop_count) -{ - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - Profile_Timer pt; - - pt.start(); - // - // Cube an octet. - // - - for (i = 0; i < loop_count; i++) - { - - call_count++; - - CORBA::Octet arg_octet = func (i), ret_octet; - - try { - ret_octet = cb->cube_octet (arg_octet); - - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - printf ("** cube_octet(%d) (--> %d)\n", arg_octet , ret_octet); - error_count++; - } - - - // - // Cube a short. - // - call_count++; - - CORBA::Short arg_short = func (i), ret_short; - - try { - ret_short = cb->cube_short (arg_short); - - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) { - printf ("** cube_short(%d) (--> %d)\n", arg_short , ret_short); - error_count++; - } - - // - // Cube a long. - // - - call_count++; - - CORBA::Long arg_long = func (i), ret_long; - - try { - ret_long = cb->cube_long (arg_long); - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - printf ("** cube_long(%d) (--> %d)\n", arg_long , ret_long); - error_count++; - } - - - // - // Cube a "struct" ... - // - Cubit::Many arg_struct, ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - try { - ret_struct = cb->cube_struct (arg_struct); - - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l ; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s ; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o ; - - if (arg_struct.l != ret_struct.l - || arg_struct.s != ret_struct.s - || arg_struct.o != ret_struct.o ) - { - cerr << "** cube_struct ERROR\n"; - error_count++; - } - } - - pt.stop(); - - Elapsed_Time et; - pt.elapsed_time(et); - - if (call_count > 0) - { - if (error_count == 0) - { - unsigned long us = et.real_time * 1000 * 1000; - - us /= call_count; - - if (us > 0) - printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - printf ("%d calls, %d errors\n", call_count, error_count); - } -} diff --git a/TAO/IIOP/test/Orbeline/client/cubit.idl b/TAO/IIOP/test/Orbeline/client/cubit.idl deleted file mode 100644 index 7eedbe786ab..00000000000 --- a/TAO/IIOP/test/Orbeline/client/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. -// -//#pragma prefix "Eng.SUN.COM" -//#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/test/Orbeline/client/stdmk b/TAO/IIOP/test/Orbeline/client/stdmk deleted file mode 100644 index df4125a38d8..00000000000 --- a/TAO/IIOP/test/Orbeline/client/stdmk +++ /dev/null @@ -1,36 +0,0 @@ -CC = CC -DEBUG = - -ORBELINEDIR = /project/waltz/Orbeline2.0 - -ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h - -CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR) - -CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA - -LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace - -STDCC_LIBS = -lsocket -lnsl -ldl -mt - -LIBORB = -lorb - -LIBACE = -lACE - -.SUFFIXES: .C .o .h .hh .cc .cpp - -.C.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.cc.o: - $(CC) $(CCFLAGS) -c -o $@ $< -.cpp.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.C.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - -.cc.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - - diff --git a/TAO/IIOP/test/Orbix/Makefile b/TAO/IIOP/test/Orbix/Makefile deleted file mode 100644 index 96935fb78fc..00000000000 --- a/TAO/IIOP/test/Orbix/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the Gateway application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = README - -DIRS = base_server \ - client \ - tpr \ - tpool \ - tps - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - diff --git a/TAO/IIOP/test/Orbix/base_server/Makefile b/TAO/IIOP/test/Orbix/base_server/Makefile deleted file mode 100644 index 3bf0684dfd5..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.h b/TAO/IIOP/test/Orbix/base_server/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.idl b/TAO/IIOP/test/Orbix/base_server/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.cpp b/TAO/IIOP/test/Orbix/base_server/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.h b/TAO/IIOP/test/Orbix/base_server/cubitC.h deleted file mode 100644 index 584efa67c8d..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubitC.h +++ /dev/null @@ -1,345 +0,0 @@ -// $Id$ - -#ifndef _cubitC_h -#define _cubitC_h - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -#include "corba.h" - - - -class Cubit; -typedef Cubit *Cubit_ptr; -typedef Cubit_ptr CubitRef; - -#ifndef _Cubit_var_ -#define _Cubit_var_ -class Cubit_var -{ - public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } -#if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } -#else - operator Cubit_ptr&() { return _ptr; } -#endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); - private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} -}; -#endif -class Cubit: public virtual CORBA_Object -{ - private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} - public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); - protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} - public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); - -#if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); -#else - return _narrow(obj_var); -#endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } -}; - - -#endif - diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.cpp b/TAO/IIOP/test/Orbix/base_server/cubitS.cpp deleted file mode 100644 index d72803fed0c..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubitS.cpp +++ /dev/null @@ -1,228 +0,0 @@ -// $Id$ - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.h b/TAO/IIOP/test/Orbix/base_server/cubitS.h deleted file mode 100644 index 3ca717e2b49..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubitS.h +++ /dev/null @@ -1,120 +0,0 @@ -// $Id$ - -#ifndef _cubitS_h -#define _cubitS_h - -#include "cubitC.h" - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -class _sk_Cubit : public Cubit -{ - protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} - public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - -}; -template <class T> -class _tie_Cubit : public Cubit -{ - public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } - - private: - T& _ref; -}; - -#endif - diff --git a/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp b/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp deleted file mode 100644 index e96b6e33dcd..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) { -} diff --git a/TAO/IIOP/test/Orbix/base_server/cubit_impl.h b/TAO/IIOP/test/Orbix/base_server/cubit_impl.h deleted file mode 100644 index 033aa7f0cb1..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/cubit_impl.h +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/test/Orbix/base_server/server.cpp b/TAO/IIOP/test/Orbix/base_server/server.cpp deleted file mode 100644 index 527fa13d76e..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/server.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#define IT_EX_MACROS - -#include "cubit_impl.h" // server header file - -int -main (int , char**) -{ - -#ifdef Cubit_USE_BOA - Cubit_var cb = new Cubit_Impl; - cout << "Using BOA approach" << endl; -#else - Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl); - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // - // Go get some work to do.... - // - IT_TRY { - CORBA::Orbix.impl_is_ready("Cubit", IT_X); - } - IT_CATCHANY { - cout << IT_X << endl; - } - IT_ENDTRY; - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.cpp b/TAO/IIOP/test/Orbix/base_server/tpr.cpp deleted file mode 100644 index da78690cc2c..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/tpr.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -#include "tpr.h" - -void * -worker(void *vp) -{ - ACE_Thread_Control tc (ACE_Thread_Manager::instance ()); - CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp); - return NULL; -} - - -int -tpr_filter::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment&) -{ -// thread_t tid; -// thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid); - - ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance (); - thr_mgr->spawn (ACE_THR_FUNC (worker), - (void *) &r, - THR_DETACHED); - - return -1; -} - -tpr_filter tpr_dispatcher; diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.h b/TAO/IIOP/test/Orbix/base_server/tpr.h deleted file mode 100644 index b5e8be94cf1..00000000000 --- a/TAO/IIOP/test/Orbix/base_server/tpr.h +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" - -// -// Create a thread filter to dispatch incoming calls -// -class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); -}; diff --git a/TAO/IIOP/test/Orbix/client/Makefile b/TAO/IIOP/test/Orbix/client/Makefile deleted file mode 100644 index 73f775bee2f..00000000000 --- a/TAO/IIOP/test/Orbix/client/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitC.cpp client.cpp - -CLT_OBJS = cubitC.o client.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: client - -client: $(addprefix $(VDIR),$(CLT_OBJS)) - $(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK) - - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i cubit.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/test/Orbix/client/client.cpp b/TAO/IIOP/test/Orbix/client/client.cpp deleted file mode 100644 index f199078b601..00000000000 --- a/TAO/IIOP/test/Orbix/client/client.cpp +++ /dev/null @@ -1,234 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : client.C -// DESCRIPTION: -// -// Client for the Cubit example -// -//**************************************************************************** - -#include "ace/OS.h" -#include "ace/Get_Opt.h" -#include "cubit.h" - -int LOOP_COUNT; -char SERVER_HOST [1024]; - -inline int func (unsigned i) { return i - 117; } -void run_tests (Cubit_var, int); - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_OS::strcpy (SERVER_HOST, "localhost"); - ACE_Get_Opt opts (argc, argv, "dh:n:O:x"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - case 'h': - ACE_OS::strcpy (SERVER_HOST, opts.optarg); - continue; - case 'd': // debug flag - continue; - - case 'n': // loop count - LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg); - continue; - - case 'O': // stringified objref - continue; - - case 'x': - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-n loopcount]" - " [-h SERVER_HOST]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - - -// -// Mainline -// -int -main (int argc, char *argv[]) -{ - if (parse_args (argc, argv) != 0) - return -1; - - Cubit_var cb; - // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ; - - // - // Initialise client's binding to an - // arbitrary cubit server (at some host) - // - TRY { - cb = Cubit::_bind ("", SERVER_HOST, IT_X); - } - CATCHANY { - cerr << "Binding failed: " << IT_X; - } - ENDTRY; - - run_tests (cb, LOOP_COUNT); - return 0; -} - - -void -run_tests (Cubit_var cb, int loop_count) -{ - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - ACE_Time_Value before, after; - - before = ACE_OS::gettimeofday(); - - // - // Cube an octet. - // - - for (i = 0; i < loop_count; i++) - { - - call_count++; - - CORBA::Octet arg_octet = func (i), ret_octet; - - TRY { - ret_octet = cb->cube_octet (arg_octet); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - ACE_OS::printf ("** cube_octet(%d) (--> %d)\n", arg_octet , ret_octet); - error_count++; - } - - - // - // Cube a short. - // - call_count++; - - CORBA::Short arg_short = func (i), ret_short; - - TRY { - ret_short = cb->cube_short (arg_short); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) { - ACE_OS::printf ("** cube_short(%d) (--> %d)\n", arg_short , ret_short); - error_count++; - } - - // - // Cube a long. - // - - call_count++; - - CORBA::Long arg_long = func (i), ret_long; - - TRY { - ret_long = cb->cube_long (arg_long); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - } - ENDTRY; - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - ACE_OS::printf ("** cube_long(%d) (--> %d)\n", arg_long , ret_long); - error_count++; - } - - - // - // Cube a "struct" ... - // - Cubit::Many arg_struct, ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - TRY { - ret_struct = cb->cube_struct (arg_struct); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l ; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s ; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o ; - - if (arg_struct.l != ret_struct.l - || arg_struct.s != ret_struct.s - || arg_struct.o != ret_struct.o ) - { - cerr << "** cube_struct ERROR\n"; - error_count++; - } - } - - - after = ACE_OS::gettimeofday(); - - if (call_count > 0) - { - if (error_count == 0) - { - ACE_Time_Value diff = after - before; - unsigned long us = diff.sec() * 1000 * 1000 + diff.usec(); - - us /= call_count; - - if (us > 0) - ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count); - } -} diff --git a/TAO/IIOP/test/Orbix/client/cubit.h b/TAO/IIOP/test/Orbix/client/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/test/Orbix/client/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/test/Orbix/client/cubit.idl b/TAO/IIOP/test/Orbix/client/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/test/Orbix/client/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/test/Orbix/client/cubitC.cpp b/TAO/IIOP/test/Orbix/client/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/test/Orbix/client/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/test/Orbix/factory_client/Makefile b/TAO/IIOP/test/Orbix/factory_client/Makefile deleted file mode 100644 index 63cc8a65e02..00000000000 --- a/TAO/IIOP/test/Orbix/factory_client/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitC.cpp client.cpp - -CLT_OBJS = cubitC.o client.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: client - -client: $(addprefix $(VDIR),$(CLT_OBJS)) - $(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK) - - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h -.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i cubit.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/test/Orbix/factory_client/client.cpp b/TAO/IIOP/test/Orbix/factory_client/client.cpp deleted file mode 100644 index 1afdecbadf4..00000000000 --- a/TAO/IIOP/test/Orbix/factory_client/client.cpp +++ /dev/null @@ -1,237 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : client.C -// DESCRIPTION: -// -// Client for the Cubit example -// -//**************************************************************************** - -#include "ace/OS.h" -#include "ace/Get_Opt.h" -#include "cubit.h" - -int LOOP_COUNT; -char SERVER_HOST [1024]; - -inline int func (unsigned i) { return i - 117; } -void run_tests (Cubit_var, int); - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_OS::strcpy (SERVER_HOST, "localhost"); - ACE_Get_Opt opts (argc, argv, "dh:n:O:x"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - case 'h': - ACE_OS::strcpy (SERVER_HOST, opts.optarg); - continue; - case 'd': // debug flag - continue; - - case 'n': // loop count - LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg); - continue; - - case 'O': // stringified objref - continue; - - case 'x': - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-n loopcount]" - " [-h SERVER_HOST]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - - -// -// Mainline -// -int -main (int argc, char *argv[]) -{ - if (parse_args (argc, argv) != 0) - return -1; - - Cubit_var cb; - Cubit_Factory_var cf; - - // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ; - - // - // Initialise client's binding to an - // arbitrary cubit server (at some host) - // - TRY { - cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X); - } - CATCHANY { - cerr << "Binding failed: " << IT_X; - } - ENDTRY; - cb = cf->create_cubit ("My_Cubit"); - - run_tests (cb, LOOP_COUNT); - return 0; -} - - -void -run_tests (Cubit_var cb, int loop_count) -{ - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - ACE_Time_Value before, after; - - before = ACE_OS::gettimeofday(); - - // - // Cube an octet. - // - - for (i = 0; i < loop_count; i++) - { - - call_count++; - - CORBA::Octet arg_octet = func (i), ret_octet; - - TRY { - ret_octet = cb->cube_octet (arg_octet); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - ACE_OS::printf ("** cube_octet(%d) (--> %d)\n", arg_octet , ret_octet); - error_count++; - } - - - // - // Cube a short. - // - call_count++; - - CORBA::Short arg_short = func (i), ret_short; - - TRY { - ret_short = cb->cube_short (arg_short); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) { - ACE_OS::printf ("** cube_short(%d) (--> %d)\n", arg_short , ret_short); - error_count++; - } - - // - // Cube a long. - // - - call_count++; - - CORBA::Long arg_long = func (i), ret_long; - - TRY { - ret_long = cb->cube_long (arg_long); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - } - ENDTRY; - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - ACE_OS::printf ("** cube_long(%d) (--> %d)\n", arg_long , ret_long); - error_count++; - } - - - // - // Cube a "struct" ... - // - Cubit::Many arg_struct, ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - TRY { - ret_struct = cb->cube_struct (arg_struct); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l ; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s ; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o ; - - if (arg_struct.l != ret_struct.l - || arg_struct.s != ret_struct.s - || arg_struct.o != ret_struct.o ) - { - cerr << "** cube_struct ERROR\n"; - error_count++; - } - } - - - after = ACE_OS::gettimeofday(); - - if (call_count > 0) - { - if (error_count == 0) - { - ACE_Time_Value diff = after - before; - unsigned long us = diff.sec() * 1000 * 1000 + diff.usec(); - - us /= call_count; - - if (us > 0) - ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count); - } -} diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.h b/TAO/IIOP/test/Orbix/factory_client/cubit.h deleted file mode 100644 index 3a2dd546608..00000000000 --- a/TAO/IIOP/test/Orbix/factory_client/cubit.h +++ /dev/null @@ -1,1113 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include <CORBA.h> - -#include <string.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#ifndef _Cubit_Factory_defined -#define _Cubit_Factory_defined -class Cubit_Factory_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_Factory_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) {} - - - Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_dispatch () {} - - Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_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 Cubit_Factory; - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - - -#ifndef Cubit_FactoryForwH -#define Cubit_FactoryForwH -CORBA::ObjectRef Cubit_Factory_getBase (void *); -void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env); -void Cubit_Factory_release (Cubit_Factory_ptr); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr ); -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env); -Cubit_Factory_ptr Cubit_Factory_nil (); -#endif -#define Cubit_Factory_IMPL "Cubit_Factory" - - -class Cubit_Factory; - -typedef Cubit_Factory Cubit_FactoryProxy; -#define Cubit_Factory_IR "Cubit_Factory" -#define Cubit_Factory_IMPL "Cubit_Factory" - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - -class Cubit_Factory: public virtual CORBA::Object { -public: - Cubit_Factory (char *IT_OR); - Cubit_Factory (ObjectReference *IT_OR); - Cubit_Factory () : CORBA::Object (1) {} -protected: - Cubit_Factory_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _bind (CORBA::Environment &IT_env); - static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;} - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef Cubit_FactoryVarH -#define Cubit_FactoryVarH - -#ifndef Cubit_FactoryvPtr -#define Cubit_FactoryvPtr -typedef Cubit_Factory* Cubit_Factory_vPtr; -typedef const Cubit_Factory* Cubit_Factory_cvPtr; -#endif - -class Cubit_Factory_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_Factory_var &IT_s) { - { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_Factory_var (const Cubit_Factory_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_Factory_var () { - _ptr = Cubit_Factory_nil (); - } - - Cubit_Factory_var (Cubit_Factory *IT_p) { - _ptr = IT_p; - } - - Cubit_Factory_var &operator= (Cubit_Factory *IT_p) { - Cubit_Factory_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) { - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_Factory_var () { - Cubit_Factory_release (_ptr); - } - - Cubit_Factory* operator-> () { - return _ptr; - } - - operator Cubit_Factory_cvPtr () const { return _ptr;} - operator Cubit_Factory_vPtr& () { return _ptr;} - - protected: - Cubit_Factory *_ptr; - private: - Cubit_Factory_var &operator= (const CORBA::_var &IT_s); - Cubit_Factory_var (const CORBA::_var &IT_s); - Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s); - Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_Factory_var (const CORBA::_mgr &IT_s); - Cubit_Factory_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef Cubit_FactoryMgrH -#define Cubit_FactoryMgrH - -class Cubit_Factory_mgr : public CORBA::_mgr -{ - public: - - Cubit_Factory_mgr () { - _ptr = Cubit_Factory_nil (); - _release = 1; - } - - Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_Factory_mgr () { - if (_release) - Cubit_Factory_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 Cubit_Factory* () const { - return (Cubit_Factory*) _ptr; - } - - Cubit_Factory_ptr operator-> () const { - return _ptr; - } - - Cubit_Factory *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const; -#endif - -#ifndef Cubit_FactorySeqElemH -#define Cubit_FactorySeqElemH - -class Cubit_Factory_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); - } - - Cubit_Factory_ptr operator->() const { return *_ptr;} - - protected: - Cubit_Factory_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit_Factory(X) Cubit_Factory##X - -#define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit_Factory \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - - - - -class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_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 Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory; - -class Cubit_FactoryBOAImpl : public virtual Cubit_Factory { -public: - Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) - m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); -} - - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.hh b/TAO/IIOP/test/Orbix/factory_client/cubit.hh deleted file mode 100644 index 72e2fb81395..00000000000 --- a/TAO/IIOP/test/Orbix/factory_client/cubit.hh +++ /dev/null @@ -1,1111 +0,0 @@ - -#ifndef cubit_hh -#define cubit_hh - -#include <CORBA.h> - -#include <string.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#ifndef _Cubit_Factory_defined -#define _Cubit_Factory_defined -class Cubit_Factory_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_Factory_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) {} - - - Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_dispatch () {} - - Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_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 Cubit_Factory; - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - - -#ifndef Cubit_FactoryForwH -#define Cubit_FactoryForwH -CORBA::ObjectRef Cubit_Factory_getBase (void *); -void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env); -void Cubit_Factory_release (Cubit_Factory_ptr); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr ); -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env); -Cubit_Factory_ptr Cubit_Factory_nil (); -#endif -#define Cubit_Factory_IMPL "Cubit_Factory" - - -class Cubit_Factory; - -typedef Cubit_Factory Cubit_FactoryProxy; -#define Cubit_Factory_IR "Cubit_Factory" -#define Cubit_Factory_IMPL "Cubit_Factory" - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - -class Cubit_Factory: public virtual CORBA::Object { -public: - Cubit_Factory (char *IT_OR); - Cubit_Factory (ObjectReference *IT_OR); - Cubit_Factory () : CORBA::Object (1) {} -protected: - Cubit_Factory_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _bind (CORBA::Environment &IT_env); - static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;} - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef Cubit_FactoryVarH -#define Cubit_FactoryVarH - -#ifndef Cubit_FactoryvPtr -#define Cubit_FactoryvPtr -typedef Cubit_Factory* Cubit_Factory_vPtr; -typedef const Cubit_Factory* Cubit_Factory_cvPtr; -#endif - -class Cubit_Factory_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_Factory_var &IT_s) { - { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_Factory_var (const Cubit_Factory_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_Factory_var () { - _ptr = Cubit_Factory_nil (); - } - - Cubit_Factory_var (Cubit_Factory *IT_p) { - _ptr = IT_p; - } - - Cubit_Factory_var &operator= (Cubit_Factory *IT_p) { - Cubit_Factory_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) { - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_Factory_var () { - Cubit_Factory_release (_ptr); - } - - Cubit_Factory* operator-> () { - return _ptr; - } - - operator Cubit_Factory_cvPtr () const { return _ptr;} - operator Cubit_Factory_vPtr& () { return _ptr;} - - protected: - Cubit_Factory *_ptr; - private: - Cubit_Factory_var &operator= (const CORBA::_var &IT_s); - Cubit_Factory_var (const CORBA::_var &IT_s); - Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s); - Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_Factory_var (const CORBA::_mgr &IT_s); - Cubit_Factory_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef Cubit_FactoryMgrH -#define Cubit_FactoryMgrH - -class Cubit_Factory_mgr : public CORBA::_mgr -{ - public: - - Cubit_Factory_mgr () { - _ptr = Cubit_Factory_nil (); - _release = 1; - } - - Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_Factory_mgr () { - if (_release) - Cubit_Factory_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 Cubit_Factory* () const { - return (Cubit_Factory*) _ptr; - } - - Cubit_Factory_ptr operator-> () const { - return _ptr; - } - - Cubit_Factory *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const; -#endif - -#ifndef Cubit_FactorySeqElemH -#define Cubit_FactorySeqElemH - -class Cubit_Factory_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); - } - - Cubit_Factory_ptr operator->() const { return *_ptr;} - - protected: - Cubit_Factory_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit_Factory(X) Cubit_Factory##X - -#define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit_Factory \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - - - - -class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_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 Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory; - -class Cubit_FactoryBOAImpl : public virtual Cubit_Factory { -public: - Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) - m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); -} - - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.idl b/TAO/IIOP/test/Orbix/factory_client/cubit.idl deleted file mode 100644 index 41309e997ea..00000000000 --- a/TAO/IIOP/test/Orbix/factory_client/cubit.idl +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - - interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); - }; - - - interface Cubit_Factory { - Cubit create_cubit (in string name); - }; - diff --git a/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp b/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp deleted file mode 100644 index d19c387bcd2..00000000000 --- a/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp +++ /dev/null @@ -1,712 +0,0 @@ -// $Id$ - - - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - -Cubit_Factory::Cubit_Factory (char *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef Cubit_FactoryForwC -#define Cubit_FactoryForwC -CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){ - return (Cubit_Factory*) IT_p;} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p) { - Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) { - return Cubit_Factory:: _nil ();} - -Cubit_Factory_ptr Cubit_Factory_nil () { - return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit_Factory::_duplicate(IT_p, IT_env)); } -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) { - return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_Factory_IMPL, Cubit_Factory_IR); -} - - - -Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit_Factory:: _nil(); - } - - Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - -void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New2 () { - return new class Cubit_Factory((char*)0);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () { - return new class Cubit_Factory((char*)0);} - -void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit_Factory*)IT_p)->_pptr ();} - -void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_Factory_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1); - -Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return new Cubit; - } - CORBA::Request IT_r (this, "create_cubit",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.encodeStringOp (name); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit_ptr IT_result; - IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return new Cubit; -} - - - - - -#ifndef Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit_Factory"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp b/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp deleted file mode 100644 index 56cf33174a6..00000000000 --- a/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp +++ /dev/null @@ -1,284 +0,0 @@ -// $Id$ - - - -#include "cubit.hh" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#define Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"create_cubit")) { - Cubit_ptr IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~create_cubit~+name{0},>{O~Cubit},N{}\ -")) - return 1; - char * name; - - IT_r.decodeStringOp(name); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit_Factory*)IT_pp)->create_cubit ( name, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - CORBA::string_free (name); - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -O~Cubit\ -", IT_env)) return 1; - { - CORBA::Object* IT_l1 = (CORBA::Object*) IT_result; - IT_r << IT_l1; - } - if (IT_result) Cubit_release (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/test/Orbix/orb.mk b/TAO/IIOP/test/Orbix/orb.mk deleted file mode 100644 index cf7b12d3b1b..00000000000 --- a/TAO/IIOP/test/Orbix/orb.mk +++ /dev/null @@ -1,146 +0,0 @@ -# ------------------------------------------------------------ -# Orbix 2.2 implicit rules for SunOS/GNU Make -# ------------------------------------------------------------ -# -# If you cut'n'paste this into your /usr/include/make/default.mk -# file, beware! This is not officially supported by Iona -# Technologies, and you may want to be a bit of a Makefile hacker -# to make it integrate well with your site's setup. - -# The best thing to do would be put it in a standard place and -# anyone who wants the Orbix implicit rule set can include -# it with an "include <pathname>/orbix.mk" line in their -# Makefile. A good place to put it might be /usr/include/make. - -# These rules define default C++, C++FLAGS and C++SUFFIX. -# C++ is the C++ compiler to use; C++FLAGS are command-line -# flags to the C++ compiler for use in compiling C++ source -# files into objects; C++SUFFIX is the filename suffix -# indicating C++ source. By default, it's set to "C" for AT&T C++, -# and "cc" for GNU g++. - -# Feel free to override these in your Makefiles *after* -# including this file. - -# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL -# compiler appends to the user-specified file. The dependency for -# specified_file.o in the linking target should appear _after_ any use -# of the IDL compiler which takes the -M flag. Putting it _last_ -# is normally the best approach. - -# Note that these rule definitions use pattern matching, -# and therefore only work with SunOS make and GNU make. - -# They may not work with other vendor's versions of make. -# If they do not, you may wish to try using GNU make, which -# is free software produced by the Free Software Foundation. - -# If the version of make you wish to use does not support -# pattern matching, use the sample explicit rule set in -# the comments at the end of this file. - -# ------------------------------------------------------------ -# Essential: set these to the locations into which you -# have installed Orbix' components: - -ORBIX_BINDIR = /opt/Orbix_2.2MT/corba2/bin -ORBIX_LIBDIR = /opt/Orbix_2.2MT/corba2/lib -ORBIX_INCDIR = /opt/Orbix_2.2MT/corba2/include - -#------------------------------------------------------------- -# To compile the demos, you should change these values as -# appropriate for your particular system installation -#------------------------------------------------------------- - -X11BASE = /usr/openwin -X11INCDIR = $(X11BASE)/include -X11LIBDIR = $(X11BASE)/lib - -# C++ = CC -# C++FLAGS = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT -# C++SUFFIX = cpp - -# ------------------------------------------------------------ -# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked -# Use -Bdynamic or -Bstatic as appropriate. -# ------------------------------------------------------------ - -ITCLT = -Bstatic -lorbixmt -IRCLT = -Bstatic -lIRcltmt -ITSRV = -Bstatic -lorbixmt -ITIIOP = -Bstatic -liiopmt -ITDSI = -Bstatic -lDSImt -ITIFR = -Bstatic -lifrmt - -# ------------------------------------------------------------ -# SYSLIBS must be dynamically linked; otherwise you can expect to -# get linkage errors for symbols in the nsl library -# ------------------------------------------------------------ - -LDFLAGS += -L$(ORBIX_LIBDIR) -SYSLIBS = -Bdynamic -lnsl -lsocket - -IDL = $(ORBIX_BINDIR)/idl -IDLFLAGS = - -# ------------------------------------------------------------ -# The following section defines implicit rules for creating -# *.{C,S}.C files, rules for compiling those -# into objects, and even a rule for compiling C++ source into -# objects (in case one isn't already defined). - -# ------------------------------------------------------------ -# first, put the new suffixes at the *head* of the suffix list, -# overriding any existing .C compilation method. -.SUFFIXES: -.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES) - -# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES) -# ------------------------------------------------------------ -# *[CS].o must be compiled here, and depends -# mostly on the C++ files produced from the IDL file. - -%C.o: %C.$(C++SUFFIX) - $(C++) -c $(C++FLAGS) $< - -%S.o: %S.$(C++SUFFIX) - $(C++) -c $(C++FLAGS) $< - -%.o: %.$(C++SUFFIX) - $(C++) -c $(C++FLAGS) $< - -# and here's how to compile C++ files from the IDL file. -# only ONE of these rules will be run at make-time, - -%S.$(C++SUFFIX): %.idl - $(IDL) $(IDLFLAGS) $< - -%C.$(C++SUFFIX): %.idl - $(IDL) $(IDLFLAGS) $< - -%.hh: %.idl - $(IDL) $(IDLFLAGS) $< - -# ------------------------------------------------------------ -# If the version of make you wish to use does not support -# pattern matching, here's a sample of an explicit rule set. - -# We assume the IDL file is called "foobar.idl", we wish -# to compile "foobarC.o", "foobarS.o", and -# "foobar.hh", and the C++ file suffix. -# ------------------------------------------------------------ - -# foobarC.o: foobar.hh foobarC.C -# $(C++) -c ($C++FLAGS) foobarC.C -# -# foobarS.o: foobar.hh foobarS.C -# $(C++) -c ($C++FLAGS) foobarS.C -# -# foobarC.C: foobar.idl -# $(IDL) -c ($IDLFLAGS) foobar.idl -# -# foobarS.C: foobar.idl -# $(IDL) -c ($IDLFLAGS) foobar.idl -# -# foobar.hh: foobar.idl -# $(IDL) -c ($IDLFLAGS) foobar.idl diff --git a/TAO/IIOP/test/Orbix/tpool/Makefile b/TAO/IIOP/test/Orbix/tpool/Makefile deleted file mode 100644 index 0e425af78b1..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.h b/TAO/IIOP/test/Orbix/tpool/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.idl b/TAO/IIOP/test/Orbix/tpool/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/test/Orbix/tpool/cubitC.cpp b/TAO/IIOP/test/Orbix/tpool/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/test/Orbix/tpool/cubitS.cpp b/TAO/IIOP/test/Orbix/tpool/cubitS.cpp deleted file mode 100644 index d72803fed0c..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/cubitS.cpp +++ /dev/null @@ -1,228 +0,0 @@ -// $Id$ - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp deleted file mode 100644 index e96b6e33dcd..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) { -} diff --git a/TAO/IIOP/test/Orbix/tpool/cubit_impl.h b/TAO/IIOP/test/Orbix/tpool/cubit_impl.h deleted file mode 100644 index 033aa7f0cb1..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/cubit_impl.h +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/test/Orbix/tpool/server.cpp b/TAO/IIOP/test/Orbix/tpool/server.cpp deleted file mode 100644 index ac107f69ec4..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/server.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#define IT_EX_MACROS - -#include "cubit_impl.h" // server header file -#include "tpool.h" - -int -main (int argc, char** argv) -{ - - -#ifdef Cubit_USE_BOA - Cubit_var cb = new Cubit_Impl; - cout << "Using BOA approach" << endl; -#else - Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl); - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // Register our thread-pool dispatcher - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS; - Thread_Pool tpool_dispatcher (n_threads); - - // - // Go get some work to do.... - // - IT_TRY { - CORBA::Orbix.impl_is_ready("Cubit", IT_X); - } - IT_CATCHANY { - cout << IT_X << endl; - } - IT_ENDTRY; - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.cpp b/TAO/IIOP/test/Orbix/tpool/tpool.cpp deleted file mode 100644 index 219503a22d7..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/tpool.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -#include "tpool.h" - -Thread_Pool::Thread_Pool (int n_threads) - : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()) -{ - if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); -} - -int -Thread_Pool::svc (void) -{ - cout << "Pool thread activated" << endl; - while (1) - { - // Dequeue message - ACE_Message_Block *mb; - this->msg_queue ()->dequeue_head (mb); - CORBA::Request *vp = (CORBA::Request *) mb->base (); - mb->release (); - // Hand it off to Orbix - CORBA::Orbix.continueThreadDispatch (*vp); - } - return -1; -} - - -int -Thread_Pool::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment&) -{ -// thread_t tid; -// thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid); - - // Enqueue the request - ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r)); - this->msg_queue ()->enqueue (mb); - // Done - return -1; -} - - - diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.h b/TAO/IIOP/test/Orbix/tpool/tpool.h deleted file mode 100644 index 337a7f54e65..00000000000 --- a/TAO/IIOP/test/Orbix/tpool/tpool.h +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" -#include "ace/Task.h" - -class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter -{ -public: - Thread_Pool (int n_threads); - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); - virtual int svc (void); - -}; - - diff --git a/TAO/IIOP/test/Orbix/tpr/Makefile b/TAO/IIOP/test/Orbix/tpr/Makefile deleted file mode 100644 index 650d6aaf259..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.h b/TAO/IIOP/test/Orbix/tpr/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.idl b/TAO/IIOP/test/Orbix/tpr/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.cpp b/TAO/IIOP/test/Orbix/tpr/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.h b/TAO/IIOP/test/Orbix/tpr/cubitC.h deleted file mode 100644 index 584efa67c8d..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubitC.h +++ /dev/null @@ -1,345 +0,0 @@ -// $Id$ - -#ifndef _cubitC_h -#define _cubitC_h - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -#include "corba.h" - - - -class Cubit; -typedef Cubit *Cubit_ptr; -typedef Cubit_ptr CubitRef; - -#ifndef _Cubit_var_ -#define _Cubit_var_ -class Cubit_var -{ - public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } -#if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } -#else - operator Cubit_ptr&() { return _ptr; } -#endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); - private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} -}; -#endif -class Cubit: public virtual CORBA_Object -{ - private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} - public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); - protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} - public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); - -#if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); -#else - return _narrow(obj_var); -#endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } -}; - - -#endif - diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.cpp b/TAO/IIOP/test/Orbix/tpr/cubitS.cpp deleted file mode 100644 index d72803fed0c..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubitS.cpp +++ /dev/null @@ -1,228 +0,0 @@ -// $Id$ - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.h b/TAO/IIOP/test/Orbix/tpr/cubitS.h deleted file mode 100644 index 3ca717e2b49..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubitS.h +++ /dev/null @@ -1,120 +0,0 @@ -// $Id$ - -#ifndef _cubitS_h -#define _cubitS_h - -#include "cubitC.h" - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -class _sk_Cubit : public Cubit -{ - protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} - public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - -}; -template <class T> -class _tie_Cubit : public Cubit -{ - public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } - - private: - T& _ref; -}; - -#endif - diff --git a/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp deleted file mode 100644 index e96b6e33dcd..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) { -} diff --git a/TAO/IIOP/test/Orbix/tpr/cubit_impl.h b/TAO/IIOP/test/Orbix/tpr/cubit_impl.h deleted file mode 100644 index 033aa7f0cb1..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/cubit_impl.h +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/test/Orbix/tpr/server.cpp b/TAO/IIOP/test/Orbix/tpr/server.cpp deleted file mode 100644 index 527fa13d76e..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/server.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#define IT_EX_MACROS - -#include "cubit_impl.h" // server header file - -int -main (int , char**) -{ - -#ifdef Cubit_USE_BOA - Cubit_var cb = new Cubit_Impl; - cout << "Using BOA approach" << endl; -#else - Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl); - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // - // Go get some work to do.... - // - IT_TRY { - CORBA::Orbix.impl_is_ready("Cubit", IT_X); - } - IT_CATCHANY { - cout << IT_X << endl; - } - IT_ENDTRY; - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.cpp b/TAO/IIOP/test/Orbix/tpr/tpr.cpp deleted file mode 100644 index da78690cc2c..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/tpr.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -#include "tpr.h" - -void * -worker(void *vp) -{ - ACE_Thread_Control tc (ACE_Thread_Manager::instance ()); - CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp); - return NULL; -} - - -int -tpr_filter::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment&) -{ -// thread_t tid; -// thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid); - - ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance (); - thr_mgr->spawn (ACE_THR_FUNC (worker), - (void *) &r, - THR_DETACHED); - - return -1; -} - -tpr_filter tpr_dispatcher; diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.h b/TAO/IIOP/test/Orbix/tpr/tpr.h deleted file mode 100644 index b5e8be94cf1..00000000000 --- a/TAO/IIOP/test/Orbix/tpr/tpr.h +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" - -// -// Create a thread filter to dispatch incoming calls -// -class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); -}; diff --git a/TAO/IIOP/test/Orbix/tps/Makefile b/TAO/IIOP/test/Orbix/tps/Makefile deleted file mode 100644 index 69701ba3b63..00000000000 --- a/TAO/IIOP/test/Orbix/tps/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/ReactorEx.h \ - $(ACE_ROOT)/ace/ReactorEx.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/ReactorEx.h \ - $(ACE_ROOT)/ace/ReactorEx.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i -.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/ReactorEx.h \ - $(ACE_ROOT)/ace/ReactorEx.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/test/Orbix/tps/cubit.h b/TAO/IIOP/test/Orbix/tps/cubit.h deleted file mode 100644 index 3a2dd546608..00000000000 --- a/TAO/IIOP/test/Orbix/tps/cubit.h +++ /dev/null @@ -1,1113 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include <CORBA.h> - -#include <string.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#ifndef _Cubit_Factory_defined -#define _Cubit_Factory_defined -class Cubit_Factory_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_Factory_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) {} - - - Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_dispatch () {} - - Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_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 Cubit_Factory; - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - - -#ifndef Cubit_FactoryForwH -#define Cubit_FactoryForwH -CORBA::ObjectRef Cubit_Factory_getBase (void *); -void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env); -void Cubit_Factory_release (Cubit_Factory_ptr); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr ); -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env); -Cubit_Factory_ptr Cubit_Factory_nil (); -#endif -#define Cubit_Factory_IMPL "Cubit_Factory" - - -class Cubit_Factory; - -typedef Cubit_Factory Cubit_FactoryProxy; -#define Cubit_Factory_IR "Cubit_Factory" -#define Cubit_Factory_IMPL "Cubit_Factory" - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - -class Cubit_Factory: public virtual CORBA::Object { -public: - Cubit_Factory (char *IT_OR); - Cubit_Factory (ObjectReference *IT_OR); - Cubit_Factory () : CORBA::Object (1) {} -protected: - Cubit_Factory_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _bind (CORBA::Environment &IT_env); - static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;} - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef Cubit_FactoryVarH -#define Cubit_FactoryVarH - -#ifndef Cubit_FactoryvPtr -#define Cubit_FactoryvPtr -typedef Cubit_Factory* Cubit_Factory_vPtr; -typedef const Cubit_Factory* Cubit_Factory_cvPtr; -#endif - -class Cubit_Factory_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_Factory_var &IT_s) { - { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_Factory_var (const Cubit_Factory_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_Factory_var () { - _ptr = Cubit_Factory_nil (); - } - - Cubit_Factory_var (Cubit_Factory *IT_p) { - _ptr = IT_p; - } - - Cubit_Factory_var &operator= (Cubit_Factory *IT_p) { - Cubit_Factory_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) { - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_Factory_var () { - Cubit_Factory_release (_ptr); - } - - Cubit_Factory* operator-> () { - return _ptr; - } - - operator Cubit_Factory_cvPtr () const { return _ptr;} - operator Cubit_Factory_vPtr& () { return _ptr;} - - protected: - Cubit_Factory *_ptr; - private: - Cubit_Factory_var &operator= (const CORBA::_var &IT_s); - Cubit_Factory_var (const CORBA::_var &IT_s); - Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s); - Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_Factory_var (const CORBA::_mgr &IT_s); - Cubit_Factory_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef Cubit_FactoryMgrH -#define Cubit_FactoryMgrH - -class Cubit_Factory_mgr : public CORBA::_mgr -{ - public: - - Cubit_Factory_mgr () { - _ptr = Cubit_Factory_nil (); - _release = 1; - } - - Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_Factory_mgr () { - if (_release) - Cubit_Factory_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 Cubit_Factory* () const { - return (Cubit_Factory*) _ptr; - } - - Cubit_Factory_ptr operator-> () const { - return _ptr; - } - - Cubit_Factory *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const; -#endif - -#ifndef Cubit_FactorySeqElemH -#define Cubit_FactorySeqElemH - -class Cubit_Factory_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); - } - - Cubit_Factory_ptr operator->() const { return *_ptr;} - - protected: - Cubit_Factory_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit_Factory(X) Cubit_Factory##X - -#define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit_Factory \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - - - - -class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_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 Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory; - -class Cubit_FactoryBOAImpl : public virtual Cubit_Factory { -public: - Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) - m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); -} - - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/test/Orbix/tps/cubit.idl b/TAO/IIOP/test/Orbix/tps/cubit.idl deleted file mode 100644 index 41309e997ea..00000000000 --- a/TAO/IIOP/test/Orbix/tps/cubit.idl +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - - interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); - }; - - - interface Cubit_Factory { - Cubit create_cubit (in string name); - }; - diff --git a/TAO/IIOP/test/Orbix/tps/cubitC.cpp b/TAO/IIOP/test/Orbix/tps/cubitC.cpp deleted file mode 100644 index d19c387bcd2..00000000000 --- a/TAO/IIOP/test/Orbix/tps/cubitC.cpp +++ /dev/null @@ -1,712 +0,0 @@ -// $Id$ - - - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - -Cubit_Factory::Cubit_Factory (char *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef Cubit_FactoryForwC -#define Cubit_FactoryForwC -CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){ - return (Cubit_Factory*) IT_p;} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p) { - Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) { - return Cubit_Factory:: _nil ();} - -Cubit_Factory_ptr Cubit_Factory_nil () { - return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit_Factory::_duplicate(IT_p, IT_env)); } -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) { - return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_Factory_IMPL, Cubit_Factory_IR); -} - - - -Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit_Factory:: _nil(); - } - - Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - -void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New2 () { - return new class Cubit_Factory((char*)0);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () { - return new class Cubit_Factory((char*)0);} - -void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit_Factory*)IT_p)->_pptr ();} - -void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_Factory_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1); - -Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return new Cubit; - } - CORBA::Request IT_r (this, "create_cubit",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.encodeStringOp (name); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit_ptr IT_result; - IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return new Cubit; -} - - - - - -#ifndef Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit_Factory"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/test/Orbix/tps/cubitS.cpp b/TAO/IIOP/test/Orbix/tps/cubitS.cpp deleted file mode 100644 index e4637a23680..00000000000 --- a/TAO/IIOP/test/Orbix/tps/cubitS.cpp +++ /dev/null @@ -1,284 +0,0 @@ -// $Id$ - - - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#define Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"create_cubit")) { - Cubit_ptr IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~create_cubit~+name{0},>{O~Cubit},N{}\ -")) - return 1; - char * name; - - IT_r.decodeStringOp(name); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit_Factory*)IT_pp)->create_cubit ( name, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - CORBA::string_free (name); - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -O~Cubit\ -", IT_env)) return 1; - { - CORBA::Object* IT_l1 = (CORBA::Object*) IT_result; - IT_r << IT_l1; - } - if (IT_result) Cubit_release (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp deleted file mode 100644 index 02c30756efc..00000000000 --- a/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) { -} - -Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) { - cerr << "Creating Cubit for " << name << endl; - -#ifdef Cubit_USE_BOA - Cubit_Impl_Task *cubit = new Cubit_Impl_Task (); -#else - Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task); -#endif - Cubit::_duplicate ((Cubit *)cubit); - cubit->activate (1); - return (Cubit *) cubit; -} - -int -Cubit_Impl_Task::svc (void) -{ - while (1) - { - // Dequeue message - ACE_Message_Block *mb; - this->msg_queue ()->dequeue_head (mb); - CORBA::Request *vp = (CORBA::Request *) mb->base (); - mb->release (); - // Hand it off to Orbix - CORBA::Orbix.continueThreadDispatch (*vp); - } - return 0; -} - -void * -Cubit_Impl_Task::_deref (void) -{ - return this; -} diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.h b/TAO/IIOP/test/Orbix/tps/cubit_impl.h deleted file mode 100644 index 0fea9857af3..00000000000 --- a/TAO/IIOP/test/Orbix/tps/cubit_impl.h +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" -#include "ace/Task.h" - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - -}; - -#ifdef Cubit_USE_BOA -class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl { -#else -class Cubit_Factory_Impl { -#endif - -public: - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> { -public: - // For ACE_Task - int svc (void); - // for narrowing - virtual void *_deref (); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -DEF_TIE_Cubit_Factory (Cubit_Factory_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/test/Orbix/tps/server.cpp b/TAO/IIOP/test/Orbix/tps/server.cpp deleted file mode 100644 index c90a1603efa..00000000000 --- a/TAO/IIOP/test/Orbix/tps/server.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#define IT_EX_MACROS - -#include "cubit_impl.h" // server header file - -int -main (int , char**) -{ - -#ifdef Cubit_USE_BOA - Cubit_Factory_var cf = new Cubit_Factory_Impl; - cout << "Using BOA approach" << endl; -#else - Cubit_Factory_var cf = new TIE_Cubit_Factory (Cubit_Factory) (new Cubit_Factory); - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // - // Go get some work to do.... - // - IT_TRY { - CORBA::Orbix.impl_is_ready("Cubit_Factory", IT_X); - } - IT_CATCHANY { - cout << IT_X << endl; - } - IT_ENDTRY; - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/test/Orbix/tps/tps.cpp b/TAO/IIOP/test/Orbix/tps/tps.cpp deleted file mode 100644 index 19a86b75ffd..00000000000 --- a/TAO/IIOP/test/Orbix/tps/tps.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -#include "tps.h" - -int -TPS_Filter::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment& env) -{ - // Get target - CORBA::Object_ptr obj = r.target (); - Cubit * cb = Cubit::_narrow (obj, env); - - if (env) // Not for our object!! - return 1; // continue in the same thread - - // Enqueue the request - Cubit_Impl_Task *ct; - if (CORBA::is_nil (cb)) - return 1; - ct = (Cubit_Impl_Task *) DEREF(cb); - if (ct) { - ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r)); - ct->msg_queue ()->enqueue (mb); - } - // Done - return -1; -} - -TPS_Filter tps_filter; diff --git a/TAO/IIOP/test/Orbix/tps/tps.h b/TAO/IIOP/test/Orbix/tps/tps.h deleted file mode 100644 index 362c9ed4e91..00000000000 --- a/TAO/IIOP/test/Orbix/tps/tps.h +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "cubit_impl.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" -#include "ace/Task.h" - -class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter -{ -public: - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); -}; diff --git a/TAO/IIOP/test/clnt.cpp b/TAO/IIOP/test/clnt.cpp deleted file mode 100644 index 3e78e8be2f1..00000000000 --- a/TAO/IIOP/test/clnt.cpp +++ /dev/null @@ -1,510 +0,0 @@ -// $Id$ - -// @(#)clnt.cpp 1.2 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: Simple "cube" client, calling hand-crafted stubs. -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include <ace/Get_Opt.h> -//#include <crtdbg.h> - -#if unix -# include <unistd.h> -# include <sys/time.h> - -#elif defined (VXWORKS) -# include <unistd.h> -# include <time.h> - -#else // windows - -#endif // unix - -#include "cubitC.h" - -#include <corba/debug.h> - - -#if !defined (_WIN32) -extern char *optarg; // missing on some platforms -#endif - -inline int func (unsigned i) { return i - 117; } - -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - - -// -// forward declarations -// -static void cube_union_stub(unsigned, unsigned&, unsigned&, - CORBA_Object_ptr, CORBA_Environment &); - -static void cube_union_dii(unsigned &, unsigned &, - CORBA_Object_ptr, CORBA_Environment &); - -// Global variables -const char* TAO_arg_ior = 0; -unsigned loop_count = 1; -int exit_later = 0; - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_Get_Opt opts (argc, argv, "dn:O:x"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - - case 'd': // debug flag - TAO_debug_level++; - continue; - - case 'n': // loop count - loop_count = (unsigned) ACE_OS::atoi (opts.optarg); - continue; - - case 'O': // stringified objref - { - TAO_arg_ior = ACE_OS::strdup(opts.optarg); - } - continue; - - case 'x': - exit_later++; - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-n loopcount]" - " [-O objref]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - -int -main (int argc, char *argv[]) -{ - CORBA_ORB_ptr orb_ptr; - CORBA_Object_ptr objref = CORBA_Object::_nil(); - CORBA_Environment env; - - orb_ptr = CORBA_ORB_init(argc, argv, "internet", env); - if (env.exception() != 0) - { - print_exception(env.exception(), "ORB initialization"); - return 1; - } - - // - // Parse command line and verify parameters. - // - parse_args(argc, argv); - - if (TAO_arg_ior == 0) - ACE_ERROR_RETURN((LM_ERROR, "%s: must specify an object reference using -O <ior>\n", argv[0]), 1); - - objref = orb_ptr->string_to_object ((CORBA_String)TAO_arg_ior, env); - - ACE_OS::free((void*)TAO_arg_ior); - TAO_arg_ior = 0; - - if (env.exception () != 0) - { - print_exception (env.exception (), "string2object"); - return 1; - } - - if (CORBA_is_nil (objref) == CORBA_B_TRUE) - ACE_ERROR_RETURN((LM_ERROR, "%s: must identify non-null target objref\n", argv [0]), 1); - - // Narrow the CORBA_Object reference to the stub object, checking - // the type along the way using _is_a - Cubit_ptr aCubit = Cubit::_narrow(objref); - if (aCubit == 0) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"), 1); - - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - ACE_Time_Value before, after; - - before = ACE_OS::gettimeofday(); - - for (i = 0; i < loop_count; i++) - { - // - // Cube an octet. - // - CORBA_Octet arg_octet, ret_octet; - - call_count++; - ret_octet = aCubit->Cubit_cube_octet (arg_octet = func (i), env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_octet"); - error_count++; - } - else - { - dmsg2 ("cube octet: %d --> %d\n", arg_octet, ret_octet); - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - ACE_OS::printf ("** cube_octet(%d) ERROR (--> %d)\n", - (CORBA_Octet) func (i), ret_octet); - error_count++; - } - } - - // - // Cube a short. - // - CORBA_Short arg_short, ret_short; - - call_count++; - ret_short = aCubit->Cubit_cube_short (arg_short = func (i), env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_short"); - error_count++; - } - else - { - dmsg2 ("cube short: %d --> %d\n", arg_short, ret_short); - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) - { - ACE_OS::printf ("** cube_short(%d) ERROR (--> %d)\n", - (CORBA_Short) func (i), ret_short); - error_count++; - } - } - - // - // Cube a long. - // - CORBA_Long arg_long, ret_long; - - call_count++; - ret_long = aCubit->Cubit_cube_long (arg_long = func (i), env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_long"); - error_count++; - } - else - { - dmsg2 ("cube long: %d --> %d\n", arg_long, ret_long); - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - ACE_OS::printf ("** cube_long(%ld) ERROR (--> %ld)\n", - (CORBA_Long) func (i), ret_long); - error_count++; - } - } - - // - // Cube a "struct" ... - // - Cubit_Many arg_struct, *ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - ret_struct = aCubit->Cubit_cube_struct (arg_struct, env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_struct"); - error_count++; - } - else - { - dmsg ("cube struct ..."); - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o; - - if (arg_struct.l != ret_struct->l - || arg_struct.s != ret_struct->s - || arg_struct.o != ret_struct->o) - { - ACE_OS::printf ("** cube_struct ERROR\n"); - error_count++; - } - delete ret_struct; - } - - } - - after = ACE_OS::gettimeofday(); - - if (call_count > 0) - { - if (error_count == 0) - { - ACE_Time_Value diff = after - before; - unsigned long us = diff.sec() * 1000 * 1000 + diff.usec(); - - us /= call_count; - - if (us > 0) - ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count); - } - - // - // Simple test for DII: call "cube_struct". (It's not timed - // since the copious mallocation of DII would bias numbers against - // typical stub-based calls.) - // - do { - // - // Create the request ... - // - CORBA_Request_ptr req; - - req = objref->_request ((const CORBA_String) "cube_struct", env); - if (env.exception () != 0) { - print_exception (env.exception (), "DII request create"); - break; - } - - // - // ... initialise the argument list and result ... - // - Cubit_Many arg, *result; - - arg.o = 3; arg.l = 5; arg.s = -7; - - CORBA_Any tmp_arg (TC_Cubit_Many, &arg, CORBA_B_FALSE); - - req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env); - if (env.exception () != 0) { - print_exception (env.exception (), "DII request arg add"); - CORBA_release (req); - break; - } - - req->result ()->value () - ->replace (TC_Cubit_Many, 0, CORBA_B_TRUE, env); - if (env.exception () != 0) { - print_exception (env.exception (), "DII request result type"); - CORBA_release (req); - break; - } - - // - // Make the invocation, verify the result - // - req->invoke (); - if (req->env ()->exception () != 0) { - print_exception (req->env ()->exception (), "DII invoke"); - CORBA_release (req); - break; - } - - result = (Cubit_Many *) req->result ()->value ()->value (); - - if (result->o != 27 || result->l != 125 || result->s != -343) - ACE_OS::fprintf (stderr, "DII cube_struct -- bad results\n"); - else - dmsg ("DII cube_struct ... success!!"); - - CORBA_release (req); - - } while (0); - - // - // Two more tests, using the "cube_union" function - // - cube_union_dii(call_count, error_count, objref, env); - if (env.exception () != 0) - error_count++; - - cube_union_stub(i, call_count, error_count, objref, env); - if (env.exception () != 0) - error_count++; - - if (exit_later) { - aCubit->Cubit_please_exit (env); - dexc (env, "server, please ACE_OS::exit"); - } - - CORBA_release (objref); - - return (error_count == 0) ? 0 : 1; -} - - -static void -cube_union_stub(unsigned i, - unsigned &call_count, - unsigned &error_count, - CORBA_Object_ptr objref, - CORBA_Environment &env) -{ - Cubit_ptr aCubit = Cubit::_narrow(objref); - // - // Cube a "union" ... - // - Cubit_oneof u, *r; - - call_count++; - - u._disc = e_2nd; - u.l = 3; - - r = aCubit->Cubit_cube_union (u, env); - if (env.exception () != 0) { - print_exception (env.exception (), "from cube_union"); - error_count++; - } else { - dmsg ("cube union ..."); - u.l = u.l * u.l * u.l ; - - if (u.l != r->l) { - ACE_OS::printf ("** cube_union ERROR\n"); - error_count++; - } - - delete r; - } - - // - // Cube another "union" which uses the default arm ... - // - call_count++; - - u._disc = e_5th; - u.cm.l = func (i); - u.cm.s = func (i); - u.cm.o = func (i); - - u.cm.l = 7; - u.cm.s = 5; - u.cm.o = 3; - - r = aCubit->Cubit_cube_union (u, env); - if (env.exception () != 0) { - print_exception (env.exception (), "from cube_union"); - error_count++; - } else { - dmsg ("cube union ..."); - u.cm.l = u.cm.l * u.cm.l * u.cm.l; - u.cm.s = u.cm.s * u.cm.s * u.cm.s; - u.cm.o = u.cm.o * u.cm.o * u.cm.o; - - if (u.cm.l != r->cm.l - || u.cm.s != r->cm.s - || u.cm.o != r->cm.o) { - ACE_OS::printf ("** cube_union ERROR\n"); - error_count++; - } - - delete r; - } -} - - -static void -cube_union_dii (unsigned &call_count, - unsigned &error_count, - CORBA_Object_ptr objref, - CORBA_Environment &env) -{ - // - // Create the request ... - // - CORBA_Request_ptr req; - - call_count++; - - req = objref->_request ((const CORBA_String) "cube_union", env); - if (env.exception () != 0) { - error_count++; - - print_exception (env.exception (), "cube_union_dii request create"); - return; - } - - // - // ... initialise the argument list and result ... - // - Cubit_oneof u, *r; - - u._disc = e_3rd; - u.cm.l = 5; - u.cm.s = -7; - u.cm.o = 3; - - CORBA_Any tmp_arg (TC_Cubit_oneof, &u, CORBA_B_FALSE); - - req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env); - if (env.exception () != 0) { - error_count++; - print_exception (env.exception (), "cube_union_dii request arg add"); - CORBA_release (req); - return; - } - - req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA_B_TRUE, env); - if (env.exception () != 0) { - error_count++; - print_exception (env.exception (), "cube_union_dii result type"); - CORBA_release (req); - return; - } - - // - // Make the invocation, verify the result - // - req->invoke (); - if (req->env ()->exception () != 0) { - error_count++; - print_exception (req->env ()->exception (),"cube_union_dii invoke"); - CORBA_release (req); - return; - } - - r = (Cubit_oneof *) req->result ()->value ()->value (); - - if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) { - error_count++; - ACE_OS::fprintf (stderr, "cube_union_dii -- bad results\n"); - } - else - dmsg ("cube_union_dii ... success!!"); - - CORBA_release (req); -} diff --git a/TAO/IIOP/test/cubit.cpp b/TAO/IIOP/test/cubit.cpp deleted file mode 100644 index 38f23fac373..00000000000 --- a/TAO/IIOP/test/cubit.cpp +++ /dev/null @@ -1,578 +0,0 @@ -// $Id$ - -// @(#)cubit.cpp 1.2 95/09/29 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written C-style "Cubit" stubs and "skeletons" -// -// NOTE: these "skeletons" are really the methods, using DSI. No real -// ORB would be implemented in this particular way. Several things would -// be more typical of real (static) skeletons: -// -// * Most of the "in" (and much of the "out") parameter data would -// be preallocated on the stack, not heap allocated. (Static -// preallocation doesnt' really work in a multithreaded system, -// and moreover can waste a lot of space.) -// -// * The ORB core wouldn't be told about parameters using heap -// allocated data structures (e.g. NVList). -// -// * Skeletons would need to some kind of "marshal the response NOW" -// API so that stack-allocated "out" values wouldn't become invalid -// up until they were safely marshaled. -// -// * They'd handle exceptions rather than just generating debugging -// messages when they happen. -// -// * Method code would be called by the skeletons, not written as -// part of the "skeleton" itself! -// -// A key part of turning this code into a complete ORB would be to ensure -// that skeletons were always efficient and correct. They might not need -// to be sharable between different implementations of the same OMG-IDL -// object interface, but many ORBs choose to be structured that way. -// - -#include "cubit.h" // for stubs ... -#include <corba/boa.h> // ... and skeletons - -#include <corba/debug.h> // ... and debugging - - -// -// CUBE OCTET -// - -static const TAO_Param_Data Cubit_cube_octet_params [] = { - { _tc_CORBA_Octet, PARAM_RETURN, 0 }, - { _tc_CORBA_Octet, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_octet_calldata = { - "cube_octet", CORBA_B_TRUE, - 2, &Cubit_cube_octet_params [0], - 0, 0 -}; - - -CORBA_Octet -Cubit_cube_octet ( - Cubit_ptr target, - CORBA_Octet o, - CORBA_Environment &env -) -{ - CORBA_Octet retval = 0; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &Cubit_cube_octet_calldata, - &retval, &o); - data->Release (); - } - return retval; -} - -static void -_cube_octet_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_Octet); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_octet, add value"); - - req.params (nvlist, env); - dexc (env, "cube_octet, get params"); - - CORBA_Octet* value = new CORBA_Octet; - - *value = *(CORBA_Octet *)nv->value ()->value (); - // dmsg1 ("cube octet, parameter '%d'", *value); - *value = (CORBA_Octet) ((*value) * (*value) * (*value)); - // dmsg1 ("cube octet, result '%d'", *value); - - CORBA_Any* any = - new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_octet, result"); -} - - -// -// CUBE SHORT -// - -static const TAO_Param_Data Cubit_cube_short_params [] = { - { _tc_CORBA_Short, PARAM_RETURN, 0 }, - { _tc_CORBA_Short, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_short_calldata = { - "cube_short", CORBA_B_TRUE, - 2, &Cubit_cube_short_params [0], - 0, 0 -}; - - -CORBA_Short -Cubit_cube_short (Cubit_ptr target, - CORBA_Short s, - CORBA_Environment &env) -{ - CORBA_Short retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &Cubit_cube_short_calldata, - &retval, &s); - data->Release (); - } - return retval; -} - -static void -_cube_short_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_Short); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_short, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_short, get params"); - - CORBA_Short* value = new CORBA_Short; - - *value = *(CORBA_Short *)nv->value ()->value (); - // dmsg1 ("cube short, parameter '%d'", *value); - *value =(CORBA_Short) ((*value) * (*value) * (*value)); - // dmsg1 ("cube short, result '%d'", *value); - - CORBA_Any* any = - new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_short, result"); -} - - -// -// CUBE LONG -// - -static const TAO_Param_Data Cubit_cube_long_params [] = { - { _tc_CORBA_Long, PARAM_RETURN, 0 }, - { _tc_CORBA_Long, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_long_calldata = { - "cube_long", CORBA_B_TRUE, - 2, &Cubit_cube_long_params [0], - 0, 0 -}; - - -CORBA_Long -Cubit_cube_long (Cubit_ptr target, - CORBA_Long l, - CORBA_Environment &env) -{ - CORBA_Long retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else - { - data->do_call (env, &Cubit_cube_long_calldata, - &retval, &l); - data->Release (); - } - return retval; -} - - -static void -_cube_long_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_Long); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_long, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_long, get params"); - - CORBA_Long* value = new CORBA_Long; - - *value = *(CORBA_Long *)nv->value ()->value (); - // dmsg1 ("cube long, parameter '%d'", *value); - *value = (*value) * (*value) * (*value); - // dmsg1 ("cube long, result '%d'", *value); - - CORBA_Any* any = - new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_long, result"); -} - -// -// Encapsulated parameters for struct "Cubit_Many" typecode. -// None of these parameters is complicated, so this is just -// a linear sequence of element encodings -// -// NOTE: it's important that this be longword aligned!! -// -static const CORBA_Long _oc_Cubit_Many [] = { - 1, // byte order flag (TRICKY!) - - 1, 0, // empty string: repository/type ID - 1, 0, // empty string: struct name - - 3, // three struct elements - - // First structure element: name, typecode for Octet - 1, 0, // empty string: name "o" - tk_octet, - - // Second structure element: name, typecode for Long - 1, 0, // empty string: name "l" - tk_long, - - // Third structure element: name, typecode for Short - 1, 0, // empty string: name "s" - tk_short, -}; - -static CORBA_TypeCode _tc_Cubit_Many (tk_struct, - sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many; - - -// -// CUBE STRUCT -// - -static const TAO_Param_Data Cubit_cube_struct_params [] = { - { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) }, - { &_tc_Cubit_Many, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_struct_calldata = { - "cube_struct", CORBA_B_TRUE, - 2, &Cubit_cube_struct_params [0], - 0, 0 -}; - -Cubit_Many * -Cubit_cube_struct (Cubit_ptr target, - Cubit_Many &values, - CORBA_Environment &env) -{ - Cubit_Many *retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else - { - data->do_call (env, &Cubit_cube_struct_calldata, - &retval, &values); - data->Release (); - } - return retval; -} - - -static void -_cube_struct_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_Many); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_struct, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_struct, get params"); - - Cubit_Many *value; - Cubit_Many *retval = new Cubit_Many; - - value = (Cubit_Many *)nv->value ()->value (); - - retval->o = (CORBA_Octet) (value->o * value->o * value->o); - retval->s = (CORBA_Short) (value->s * value->s * value->s); - retval->l = value->l * value->l * value->l; - - // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o); - // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s); - // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l); - - CORBA_Any *any = - new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - -// -// CUBE UNION -// - -// -// NOTE: not all union typecodes can be encoded as an array -// of "long "values, but this one can. Ones with discriminants -// that are one or two bytes long can't easily be coded portably. -// -// The benefit of doing it as an array of "long" values is -// twofold: (a) easier to read; (b) on most systems it's then -// adequately aligned for the typecode interpreter to use, so -// no additional runtime copy needs to be made. -// -static const CORBA_Long _oc_Cubit_oneof [] = { - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "oneof" - - // - // discriminant typecode: - // - tk_enum, // tk_enum - 72, // encapsulation length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted enum name, "discrim" - 6, // 5 elements in the enum - - 1, 0, // omitted member name, "e_0th" - 1, 0, // omitted member name, "e_1st" - 1, 0, // omitted member name, "e_2nd" - 1, 0, // omitted member name, "e_3rd" - 1, 0, // omitted member name, "e_4th" - 1, 0, // omitted member name, "e_5th" - - 4, // default member index (zero based) - 5, // number of union members - - // the 1st union branch arm - e_0th, // member label value - 1, 0, // omitted member name, "o" - tk_octet, // member typecode - - // the 2nd union branch arm - e_1st, // member label value - 1, 0, // omitted member name, "s" - tk_short, // member typecode - - // the 3rd union branch arm - e_2nd, // member label value - 1, 0, // omitted member name, "l" - tk_long, // member typecode - - // the 4th union branch arm - e_3rd, // member label value - 1, 0, // omitted member name, "cm" - - // the 4th union member typecode - tk_struct, // tk_struct - 60, // encap length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "Many" - 3, // three struct members - - // First structure element - 1, 0, // omitted member name, "o" - tk_octet, // member type, tk_octet - - // Second structure element - 1, 0, // omitted member name, "l" - tk_long, // member type, tk_long - - // Third structure element - 1, 0, // omitted member name, "s" - tk_short, // member type, tk_short - - // the 5th union branch arm - 4, // the 5th member label value - 1, 0, // omitted member name, "cm" - ~0, // indirected typecode (~0) - -84 // offset to struct "Many" typecode -}; - -static CORBA_TypeCode _tc_Cubit_oneof (tk_union, - (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof; - -static const TAO_Param_Data Cubit_cube_union_params [] = { - { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) }, - { &_tc_Cubit_oneof, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_union_calldata = { - "cube_union", CORBA_B_TRUE, - 2, &Cubit_cube_union_params [0], - 0, 0 -}; - -Cubit_oneof * -Cubit_cube_union (Cubit_ptr target, - Cubit_oneof &values, - CORBA_Environment &env) -{ - Cubit_oneof *retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else - { - data->do_call (env, &Cubit_cube_union_calldata, - &retval, &values); - data->Release (); - } - return retval; -} - - -static void -_cube_union_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_oneof); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_union_3rd, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_union_3rd, get params"); - - Cubit_oneof *v; - Cubit_oneof *r = new Cubit_oneof; - - v = (Cubit_oneof *)nv->value ()->value (); - r->_disc = v->_disc; - - switch (v->_disc) { - case e_0th: - r->o = (CORBA_Octet) (v->o * v->o * v->o); - break; - - case e_1st: - r->s = (CORBA_Short) (v->s * v->s * v->s); - break; - - case e_2nd: - r->l = v->l * v->l * v->l; - break; - - case e_3rd: - default: - r->cm.o = (CORBA_Octet) (v->cm.o * v->cm.o * v->cm.o); - r->cm.s = (CORBA_Short) (v->cm.s * v->cm.s * v->cm.s); - r->cm.l = v->cm.l * v->cm.l * v->cm.l; - break; - } - - CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - - -// -// PLEASE EXIT -// - -static const TAO_Call_Data Cubit_please_exit_calldata = { - "please_exit", CORBA_B_FALSE, - 0, 0, - 0, 0 -}; - -void -Cubit_please_exit ( - Cubit_ptr target, - CORBA_Environment &env -) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &Cubit_please_exit_calldata - ); - data->Release (); - } -} - -static void -_please_exit_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - dmsg ("I've been asked to shut down..."); - req.oa ()->please_shutdown (env); - dexc (env, "please_exit, please_shutdown"); -} - - -const CORBA_Char *Cubit__id = (CORBA_Char *) - "IDL:Eng.SUN.COM/Cubit:1.1"; - - -// -// table of all operations, used by operation dispatch to get to the -// right skeleton ... could be sorted by the IDL compiler so bsearch -// is effective, perhaps with help from opname hashes and a small cache -// (e.g. like Obj-C?). for now, just lsearch. -// -const TAO_Skel_Entry Cubit_operations [] = { - { &Cubit_cube_octet_calldata, _cube_octet_skel }, - { &Cubit_cube_short_calldata, _cube_short_skel }, - { &Cubit_cube_long_calldata, _cube_long_skel }, - { &Cubit_cube_struct_calldata, _cube_struct_skel }, - { &Cubit_cube_union_calldata, _cube_union_skel }, - { &Cubit_please_exit_calldata, _please_exit_skel }, - { 0, 0 } // last entry -}; diff --git a/TAO/IIOP/test/cubit.h b/TAO/IIOP/test/cubit.h deleted file mode 100644 index 78d6b604052..00000000000 --- a/TAO/IIOP/test/cubit.h +++ /dev/null @@ -1,108 +0,0 @@ -// $Id$ - -// @(#)cubit.hh 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Hand-crafted C language binding glue ... -// -// This doesn't use C++ since doing the obvious derivation -// (all parent interfaces are virtual public parents) makes -// object references have different "views". That is, a -// pointer to a Cubit (i.e. a Cubit_ptr) would not have -// the same binary value as a pointer to a CORBA_Object -// (i.e. a CORBA_Object_ptr, generic objref). That'd -// mean lots of narrowing/widening/RTTI infrastructure. -// - -#ifndef _CUBIT_HH -#define _CUBIT_HH - -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ - -#include <corba/orb.h> -#include <corba/stub.h> - - -// -// C style binding -// - -typedef CORBA_Object Cubit; -typedef Cubit *Cubit_ptr, *CubitRef; - -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; - -struct Cubit_Many { - CORBA_Octet o; - CORBA_Long l; - CORBA_Short s; -}; - -enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2, - e_3rd = 3, e_4th = 4, e_5th = 5}; - -struct Cubit_oneof { - Cubit_discrim _disc; - - union { - CORBA_Octet o; - CORBA_Short s; - CORBA_Long l; - Cubit_Many cm; - }; -}; - -CORBA_Octet -Cubit_cube_octet ( - Cubit_ptr target, - CORBA_Octet o, - CORBA_Environment &env -); - -CORBA_Short -Cubit_cube_short ( - Cubit_ptr target, - CORBA_Short s, - CORBA_Environment &env -); - -CORBA_Long -Cubit_cube_long ( - Cubit_ptr target, - CORBA_Long l, - CORBA_Environment &env -); - -Cubit_Many * -Cubit_cube_struct ( - Cubit_ptr target, - Cubit_Many &values, - CORBA_Environment &env -); - -Cubit_oneof * -Cubit_cube_union ( - Cubit_ptr target, - Cubit_oneof &values, - CORBA_Environment &env -); - -void -Cubit_please_exit ( - Cubit_ptr target, - CORBA_Environment &env -); - -extern const CORBA_Char *Cubit__id; // type ID - -extern const TAO_Skel_Entry Cubit_operations []; - -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ - -#endif // _CUBIT_HH diff --git a/TAO/IIOP/test/cubit.idl b/TAO/IIOP/test/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/test/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/test/cubitC.cpp b/TAO/IIOP/test/cubitC.cpp deleted file mode 100644 index 8bcb0b4f4d9..00000000000 --- a/TAO/IIOP/test/cubitC.cpp +++ /dev/null @@ -1,383 +0,0 @@ -// $Id$ - -// @(#)cubitC.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include "cubitC.h" // for stubs ... - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj) -{ - if (obj) - obj->AddRef(); - - return obj; -} - -Cubit_ptr Cubit::_narrow(CORBA_Object_ptr obj) -{ - CORBA_Environment env; - if (obj->_is_a("IDL:Cubit:1.0", env)) - { - STUB_Object *istub; - if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - return Cubit::_nil(); - } - Cubit_ptr new_obj = new Cubit(istub); - return Cubit::_duplicate(new_obj); - } - return Cubit::_nil(); -} - -Cubit_ptr Cubit::_nil() -{ - return (Cubit_ptr)NULL; -} - -// -// CUBE OCTET -// - -static const TAO_Param_Data Cubit_cube_octet_params [] = -{ - { _tc_CORBA_Octet, PARAM_RETURN, 0 }, - { _tc_CORBA_Octet, PARAM_IN, 0 } -}; - - -static const TAO_Call_Data Cubit_cube_octet_calldata = -{ - "cube_octet", CORBA_B_TRUE, - 2, &Cubit_cube_octet_params [0], - 0, 0 -}; - - -CORBA_Octet -Cubit::Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env) -{ - CORBA_Octet retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_octet_calldata, - &retval, &o); - istub->Release (); - - return retval; -} - - -// -// CUBE SHORT -// - -static const TAO_Param_Data Cubit_cube_short_params [] = -{ - { _tc_CORBA_Short, PARAM_RETURN, 0 }, - { _tc_CORBA_Short, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_short_calldata = -{ - "cube_short", CORBA_B_TRUE, - 2, &Cubit_cube_short_params [0], - 0, 0 -}; - - -CORBA_Short -Cubit::Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env) -{ - CORBA_Short retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call(env, &Cubit_cube_short_calldata, - &retval, &s); - - istub->Release (); - - return retval; -} - -// -// CUBE LONG -// - -static const TAO_Param_Data Cubit_cube_long_params [] = -{ - { _tc_CORBA_Long, PARAM_RETURN, 0 }, - { _tc_CORBA_Long, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_long_calldata = -{ - "cube_long", CORBA_B_TRUE, - 2, &Cubit_cube_long_params [0], - 0, 0 -}; - - -CORBA_Long -Cubit::Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env) -{ - CORBA_Long retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_long_calldata, - &retval, &l); - istub->Release (); - - return retval; -} - - -// -// Encapsulated parameters for struct "Cubit_Many" typecode. -// None of these parameters is complicated, so this is just -// a linear sequence of element encodings -// -// NOTE: it's important that this be longword aligned!! -// -static const CORBA_Long _oc_Cubit_Many [] = -{ - 1, // byte order flag (TRICKY!) - - 1, 0, // empty string: repository/type ID - 1, 0, // empty string: struct name - - 3, // three struct elements - - // First structure element: name, typecode for Octet - 1, 0, // empty string: name "o" - tk_octet, - - // Second structure element: name, typecode for Long - 1, 0, // empty string: name "l" - tk_long, - - // Third structure element: name, typecode for Short - 1, 0, // empty string: name "s" - tk_short, -}; - -static CORBA_TypeCode _tc_Cubit_Many (tk_struct, - sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many; - - -// -// CUBE STRUCT -// - -static const TAO_Param_Data Cubit_cube_struct_params [] = -{ - { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) }, - { &_tc_Cubit_Many, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_struct_calldata = -{ - "cube_struct", CORBA_B_TRUE, - 2, &Cubit_cube_struct_params [0], - 0, 0 -}; - -Cubit_Many* -Cubit::Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env) -{ - Cubit_Many *retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_struct_calldata, - &retval, &values); - istub->Release (); - - return retval; -} - - -// -// CUBE UNION -// - -// -// NOTE: not all union typecodes can be encoded as an array -// of "long "values, but this one can. Ones with discriminants -// that are one or two bytes long can't easily be coded portably. -// -// The benefit of doing it as an array of "long" values is -// twofold: (a) easier to read; (b) on most systems it's then -// adequately aligned for the typecode interpreter to use, so -// no additional runtime copy needs to be made. -// -static const CORBA_Long _oc_Cubit_oneof [] = -{ - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "oneof" - - // - // discriminant typecode: - // - tk_enum, // tk_enum - 72, // encapsulation length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted enum name, "discrim" - 6, // 5 elements in the enum - - 1, 0, // omitted member name, "e_0th" - 1, 0, // omitted member name, "e_1st" - 1, 0, // omitted member name, "e_2nd" - 1, 0, // omitted member name, "e_3rd" - 1, 0, // omitted member name, "e_4th" - 1, 0, // omitted member name, "e_5th" - - 4, // default member index (zero based) - 5, // number of union members - - // the 1st union branch arm - e_0th, // member label value - 1, 0, // omitted member name, "o" - tk_octet, // member typecode - - // the 2nd union branch arm - e_1st, // member label value - 1, 0, // omitted member name, "s" - tk_short, // member typecode - - // the 3rd union branch arm - e_2nd, // member label value - 1, 0, // omitted member name, "l" - tk_long, // member typecode - - // the 4th union branch arm - e_3rd, // member label value - 1, 0, // omitted member name, "cm" - - // the 4th union member typecode - tk_struct, // tk_struct - 60, // encap length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "Many" - 3, // three struct members - - // First structure element - 1, 0, // omitted member name, "o" - tk_octet, // member type, tk_octet - - // Second structure element - 1, 0, // omitted member name, "l" - tk_long, // member type, tk_long - - // Third structure element - 1, 0, // omitted member name, "s" - tk_short, // member type, tk_short - - // the 5th union branch arm - 4, // the 5th member label value - 1, 0, // omitted member name, "cm" - ~0, // indirected typecode (~0) - -84 // offset to struct "Many" typecode -}; - -static CORBA_TypeCode _tc_Cubit_oneof (tk_union, - (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof; - -static const TAO_Param_Data Cubit_cube_union_params [] = -{ - { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) }, - { &_tc_Cubit_oneof, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_union_calldata = -{ - "cube_union", CORBA_B_TRUE, - 2, &Cubit_cube_union_params [0], - 0, 0 -}; - -Cubit_oneof* -Cubit::Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env) -{ - Cubit_oneof *retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_union_calldata, - &retval, &values); - istub->Release (); - - return retval; -} - - - -// -// PLEASE EXIT -// - -static const TAO_Call_Data Cubit_please_exit_calldata = -{ - "please_exit", CORBA_B_FALSE, - 0, 0, - 0, 0 -}; - -void -Cubit::Cubit_please_exit (CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - - istub->do_call (env, &Cubit_please_exit_calldata); - istub->Release (); -} diff --git a/TAO/IIOP/test/cubitC.h b/TAO/IIOP/test/cubitC.h deleted file mode 100644 index 98610b55116..00000000000 --- a/TAO/IIOP/test/cubitC.h +++ /dev/null @@ -1,104 +0,0 @@ -// $Id$ - -// @(#)cubitC.h 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation -***************************************************************************/ - -#ifndef _CUBIT_HH -#define _CUBIT_HH - -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ - -#include "corba/orb.h" -#include "corba/stub.h" - -#include <iostream.h> - -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; - -struct Cubit_Many -{ - CORBA_Octet o; - CORBA_Long l; - CORBA_Short s; -}; - -enum Cubit_discrim - { e_0th = 0, e_1st = 1, e_2nd = 2, - e_3rd = 3, e_4th = 4, e_5th = 5 }; - -struct Cubit_oneof -{ - Cubit_discrim _disc; - - union - { - CORBA_Octet o; - CORBA_Short s; - CORBA_Long l; - Cubit_Many cm; - }; -}; - -class Cubit; -typedef Cubit *Cubit_ptr; -typedef Cubit_ptr Cubit_ref; - -class Cubit : public virtual CORBA_Object -{ -public: - - static Cubit_ptr _duplicate(Cubit_ptr obj); - static Cubit_ptr _narrow(CORBA_Object_ptr obj); - static Cubit_ptr _nil(); - - virtual - CORBA_Octet Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env); - - virtual - CORBA_Short Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env); - - virtual - CORBA_Long Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env); - - virtual - Cubit_Many* Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env); - - virtual - Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env); - - virtual - void Cubit_please_exit (CORBA_Environment &env); - -protected: - Cubit() { } - Cubit(STUB_Object *objref) - : CORBA_Object(objref) { } - virtual ~Cubit() { } - - -}; - -extern const CORBA_Char *Cubit__id; // type ID - -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ - -#endif // _CUBIT_HH diff --git a/TAO/IIOP/test/cubitS.cpp b/TAO/IIOP/test/cubitS.cpp deleted file mode 100644 index bf77e70abd6..00000000000 --- a/TAO/IIOP/test/cubitS.cpp +++ /dev/null @@ -1,234 +0,0 @@ -// $Id$ - -// @(#)cubitS.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written C-style "Cubit" stubs and "skeletons" -// - -#include "cubitS.h" -#include "cubitC.cpp" - -#include "connect.h" -#include "params.h" - -#include "corba/debug.h" // ... and debugging -#include "corba/optable.h" // TAO Dynamic Operation Table -#include "method_db.i" -#include "iiopobj.h" - -#if defined(CUBIT_USE_DYNAMIC_HASH) -TAO_Dynamic_Hash_OpTable tao_cubit_optable(7); // Dynamic Operation Table -#else -TAO_Linear_OpTable tao_cubit_optable(7); -#endif - -_skel_Cubit::_skel_Cubit(const char* obj_name) -{ - const char* mn = "_skel_Cubit::_skel_Cubit()"; - - // Initialize Method Database - initialize_method_db (&tao_cubit_optable); - - char *type_id = "IDL:Cubit:1.0"; - // CORBA_String type_id = "IDL:Cubit:1.0"; - IIOP_Object *data; - - CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); - if (oa == 0) - { - // We just have to assume that oa will be good, or we have to - // throw an exception. For now we "assume", but we'll - ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to locate a valid object adapter\n", mn)); - return; - } - - this->optable_ = &tao_cubit_optable; - data = new IIOP_Object(type_id); - - 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+1); - - this->set_parent(data); - this->sub_ = this; - - if (oa->bind(data->profile.object_key, this) == -1) - { - ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to bind object to key '%s': %p\n", mn, data->profile.object_key.buffer)); - return; - } -} - -void -_skel_Cubit::_cube_octet_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_Octet); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_octet, add value"); - - req.params (nvlist, env); - dexc (env, "cube_octet, get params"); - - // Call Implementation - CORBA_Octet *value = new CORBA_Octet; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - - *value = the_cubit->Cubit_cube_octet(*(CORBA_Octet *)nv->value()->value(), env); - - CORBA_Any *any = new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_octet, result"); -} - -void -_skel_Cubit::_cube_short_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_Short); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_short, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_short, get params"); - - // Call Implementation - CORBA_Short *value = new CORBA_Short; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - *value = the_cubit->Cubit_cube_short(*(CORBA_Short *)nv->value ()->value (), env); - - CORBA_Any *any = new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_short, result"); -} - -void -_skel_Cubit::_cube_long_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_Long); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_long, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_long, get params"); - - // Call Implementation - CORBA_Long *value = new CORBA_Long; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - *value = the_cubit->Cubit_cube_long(*(CORBA_Long *)nv->value ()->value (), env); - - CORBA_Any *any = - new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_long, result"); -} - -void -_skel_Cubit::_cube_struct_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_Many); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_struct, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_struct, get params"); - - // Call Implementation - Cubit_Many *value; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - value = the_cubit->Cubit_cube_struct(*(Cubit_Many*)nv->value()->value(), env); - - Cubit_Many *retval = new Cubit_Many; - retval->o = (CORBA_Octet)value->o; - retval->s = (CORBA_Short)value->s; - retval->l = value->l; - - // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o); - // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s); - // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l); - - CORBA_Any *any = new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - -void -_skel_Cubit::_cube_union_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_oneof); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_union_3rd, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_union_3rd, get params"); - - // Call Implementation - Cubit_oneof *v; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - v = the_cubit->Cubit_cube_union(*(Cubit_oneof *)nv->value ()->value (), env); - - Cubit_oneof *r = new Cubit_oneof; - r->_disc = v->_disc; - r->o = (CORBA_Octet) (v->o); - r->s = (CORBA_Short) (v->s); - r->l = v->l; - r->cm.o = (CORBA_Octet) (v->cm.o); - r->cm.s = (CORBA_Short) (v->cm.s); - r->cm.l = v->cm.l; - - CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - -void -_skel_Cubit::_please_exit_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - the_cubit->Cubit_please_exit(env); -} diff --git a/TAO/IIOP/test/cubitS.h b/TAO/IIOP/test/cubitS.h deleted file mode 100644 index a4b4b853901..00000000000 --- a/TAO/IIOP/test/cubitS.h +++ /dev/null @@ -1,84 +0,0 @@ -// $Id$ - -// @(#)cubitS.h 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation -***************************************************************************/ - -#ifndef _SKEL_CUBIT_HH -#define _SKEL_CUBIT_HH - -#include "cubitC.h" - -class _skel_Cubit; -typedef _skel_Cubit *_skel_Cubit_ptr; -typedef _skel_Cubit_ptr _skel_Cubit_ref; - -class _skel_Cubit : public Cubit -{ -public: - virtual - CORBA_Octet Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env) = 0; - static - void _cube_octet_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - CORBA_Short Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env) = 0; - - static - void _cube_short_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - CORBA_Long Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env) = 0; - - static - void _cube_long_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - Cubit_Many* Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env) = 0; - - static - void _cube_struct_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env) = 0; - - static - void _cube_union_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - void Cubit_please_exit (CORBA_Environment &env) = 0; - - static - void _please_exit_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); -protected: - _skel_Cubit(const char* obj_name = 0); - virtual ~_skel_Cubit() { } - -}; - -#endif // _SKEL_CUBIT_HH diff --git a/TAO/IIOP/test/cubit_i.cpp b/TAO/IIOP/test/cubit_i.cpp deleted file mode 100644 index ec3d3717768..00000000000 --- a/TAO/IIOP/test/cubit_i.cpp +++ /dev/null @@ -1,93 +0,0 @@ -// $Id$ - -// @(#)cubit_i.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written Cubit Implementation -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include "cubit_i.h" - -#include <corba/boa.h> // ... and skeletons -#include <corba/debug.h> // ... and debugging - -#include "connect.h" -#include "params.h" - -Cubit_i::Cubit_i(const char* obj_name) -: _skel_Cubit(obj_name) -{ -} - -Cubit_i::~Cubit_i() -{ -} - -CORBA_Octet -Cubit_i::Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env) -{ - - return (CORBA_Octet) (o * o * o); -} - -CORBA_Short -Cubit_i::Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env) -{ - return (CORBA_Short) (s * s * s); -} - - -CORBA_Long -Cubit_i::Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env) -{ - return (CORBA_Long) (l * l * l); -} - -Cubit_Many* -Cubit_i::Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env) -{ - values.o = values.o * values.o * values.o; - values.s = values.s * values.s * values.s; - values.l = values.l * values.l * values.l; - - return &values; -} - -Cubit_oneof* -Cubit_i::Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env) -{ - switch (values._disc) { - case e_0th: - values.o = (CORBA_Octet) (values.o * values.o * values.o); - break; - case e_1st: - values.s = (CORBA_Short) (values.s * values.s * values.s); - break; - case e_2nd: - values.l = values.l * values.l * values.l; - break; - case e_3rd: - default: - values.cm.o = (CORBA_Octet) (values.cm.o * values.cm.o * values.cm.o); - values.cm.s = (CORBA_Short) (values.cm.s * values.cm.s * values.cm.s); - values.cm.l = values.cm.l * values.cm.l * values.cm.l; - } - return &values; -} - -void Cubit_i::Cubit_please_exit (CORBA_Environment &env) -{ - TAO_OA_Parameters* params = TAO_OA_PARAMS::instance(); - - dmsg ("I've been asked to shut down..."); - params->oa()->please_shutdown(env); - dexc (env, "please_exit, please_shutdown"); -} diff --git a/TAO/IIOP/test/cubit_i.h b/TAO/IIOP/test/cubit_i.h deleted file mode 100644 index 7ddf1947cd3..00000000000 --- a/TAO/IIOP/test/cubit_i.h +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -// @(#)cubit_i.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written Cubit Implementation -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation -***************************************************************************/ - -#ifndef _CUBIT_I_HH -#define _CUBIT_I_HH - -#include "cubitS.h" - -class Cubit_i; -typedef Cubit_i *Cubit_i_ptr; -typedef Cubit_i_ptr Cubit_i_ref; - -class Cubit_i : public _skel_Cubit -{ -public: - Cubit_i(const char* obj_name = 0); - ~Cubit_i(); - - virtual - CORBA_Octet Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env); - - virtual - CORBA_Short Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env); - - virtual - CORBA_Long Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env); - - virtual - Cubit_Many* Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env); - - virtual - Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env); - - virtual - void Cubit_please_exit (CORBA_Environment &env); -}; - -#endif // _CUBIT_I_HH diff --git a/TAO/IIOP/test/method_db.i b/TAO/IIOP/test/method_db.i deleted file mode 100644 index a95573043ac..00000000000 --- a/TAO/IIOP/test/method_db.i +++ /dev/null @@ -1,69 +0,0 @@ -// $Id$ - -// @(#)method_db.i 05/14/97 - -// This file provides a way of initializing the method database -// Written by: Brian Mendel - -#include "cubitS.h" - -static void -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); - - 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(); - - if (ACE_OS::strcmp ((char*)value, "IDL:Cubit:1.0") == 0 - || ACE_OS::strcmp ((char *)value, _tc_CORBA_Object->id (env)) == 0) - retval = new CORBA_Boolean (CORBA_B_TRUE); - else - retval = new CORBA_Boolean (CORBA_B_FALSE); - - CORBA_Any *any = new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "_is_a, result"); -} - - -struct method_db -{ - CORBA_String opname; - TAO_Skeleton skel_ptr; -}; - -static const method_db cubit_operations[] = { - { "_is_a", &is_a_skel }, - { "cube_octet", &_skel_Cubit::_cube_octet_skel }, - { "cube_short", &_skel_Cubit::_cube_short_skel }, - { "cube_long", &_skel_Cubit::_cube_long_skel }, - { "cube_struct", &_skel_Cubit::_cube_struct_skel }, - { "cube_union", &_skel_Cubit::_cube_union_skel }, - { "please_exit", &_skel_Cubit::_please_exit_skel }, - { 0, 0 } -}; - - -void initialize_method_db (TAO_Operation_Table *the_optable) -{ - for (int ndx = 0; ndx < 7; ndx++) - the_optable->bind(cubit_operations[ndx].opname, - cubit_operations[ndx].skel_ptr); - -} diff --git a/TAO/IIOP/test/results/Orbix b/TAO/IIOP/test/results/Orbix deleted file mode 100644 index c3abce78d3f..00000000000 --- a/TAO/IIOP/test/results/Orbix +++ /dev/null @@ -1,133 +0,0 @@ -Cubit results over Ethernet with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 1.876 533 - 2 2.202 454 - 3 2.740 364 - -MT-Orbix Thread-Per-Request 1 1.886 530 - 2 3.1 322 - 3 5.0 200 - -MT-Orbix Thread-Pool (25) 1 1.875 533 - 2 3.1 322 - 3 5.1 196 - -MT-Orbix Thread-Per-Session 1 2.002 499 - 2 3.306 302 - 3 5.15 194 - - -Cubit results over ATM with 20,000 calls ----------------------------------------- - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 1.818 550 - 2 1.968 508 - 3 2.803 356 - - -MT-Orbix Thread-Per-Request 1 1.846 541 - 2 3.1 322 - 3 4.98 200 - -MT-Orbix Thread-Pool (25) 1 1.913 522 - 2 3.18 314 - 3 5.1 196 - -MT-Orbix Thread-Per-Session 1 1.959 510 - 2 3.29 303 - 3 5.15 194 - - -Prime_Factor results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 7.918 126 - 2 14.300 70 - 3 21.000 47 - - -MT-Orbix Thread-Per-Request 1 8.302 120 - 2 10.128 98 - 3 13.722 72 - -MT-Orbix Thread-Pool (25) 1 8.442 118 - 2 15.764 63 - 3 22.595 44 - -MT-Orbix Thread-Per-Session 1 8.956 111 - 2 9.581 104 - 3 16.702 59 - -IO-intensive results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 6.667 149 - 2 12.165 82 - 3 18.634 54 - - -MT-Orbix Thread-Per-Request 1 6.812 146 - 2 6.937 144 - 3 7.706 128 - -MT-Orbix Thread-Pool (25) 1 6.813 146 - 2 6.954 144 - 3 7.776 128 - -MT-Orbix Thread-Per-Session 1 6.85 145 - 2 7.253 137 - 3 7.645 130 - - TNF client-side profile for MT-Orbix without filters for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -cond_wait 6.23 4250.242 1824 2.330 106.171 1.205 0.091 -mutex_lock 0.23 159.830 56662 0.003 1.215 0.002 0.000 -mutex_unlock 0.22 146.756 56663 0.003 0.326 0.002 0.000 -cond_signal 0.09 61.030 1825 0.033 0.475 0.009 0.000 -rw_rdlock 0.01 7.179 1826 0.004 0.014 0.003 0.000 -rw_unlock 0.01 6.548 1827 0.004 0.014 0.003 0.000 -rw_wrlock 0.00 0.004 1 0.004 0.004 0.004 0.000 - - TNF server-side profile for MT-Orbix without filters for 20000 calls - - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -cond_timedwait 1.25 923.527 797 1.159 20.219 0.324 0.028 -mutex_lock 0.21 153.839 56435 0.003 4.342 0.002 0.000 -mutex_unlock 0.20 149.208 56433 0.003 3.559 0.002 0.000 -cond_signal 0.03 21.506 809 0.027 1.826 0.003 0.002 -rw_unlock 0.02 16.058 3224 0.005 2.915 0.003 0.001 -rw_rdlock 0.02 11.924 3221 0.004 0.087 0.003 0.000 -rw_wrlock 0.00 0.010 2 0.005 0.005 0.004 0.000 - - TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls - - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.55 797.890 57618 0.014 4.624 0.002 0.000 -cond_timedwait 0.52 748.560 478 1.566 3.918 0.222 0.019 -mutex_unlock 0.36 514.627 57616 0.009 3.975 0.002 0.000 -cond_signal 0.02 24.216 1151 0.021 1.161 0.002 0.001 -rw_rdlock 0.01 13.120 2301 0.006 1.180 0.003 0.001 -rw_unlock 0.01 10.575 2307 0.005 0.316 0.003 0.000 -thr_sigsetmask 0.00 1.949 30 0.065 1.064 0.013 0.035 -rw_wrlock 0.00 0.033 6 0.006 0.008 0.004 0.001 - - - diff --git a/TAO/IIOP/test/results/TAO b/TAO/IIOP/test/results/TAO deleted file mode 100644 index de4a7bf23ae..00000000000 --- a/TAO/IIOP/test/results/TAO +++ /dev/null @@ -1,92 +0,0 @@ -Cubit results over Ethernet with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 1.172 853 - 2 1.342 745 - 3 1.902 525 - -TAO threaded version 1 1.174 851 - 2 1.219 820 - 3 1.600 625 - - -Cubit results over ATM with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 1.161 861 - 2 1.302 768 - 3 1.732 577 - -TAO threaded version 1 1.170 854 - 2 1.3 769 - 3 1.600 625 - - -Cubit results over ATM after optimizations with 20,000 calls ------------------------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 1.127 887 - 2 1.238 807 - 3 1.501 666 - -TAO threaded version 1 1.057 946 - 2 1.225 816 - 3 1.471 679 - -Prime_Factor results over ATM with 20,000 calls -------------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 7.407 135 - 2 13.7 73 - 3 19.7 51 - -TAO threaded version 1 7.389 135 - 2 8.080 124 - 3 10.726 93 - -IO-bound results over ATM with 20,000 calls --------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 6.404 156 - 2 11.909 83 - 3 17.324 57 - -TAO threaded version 1 6.378 156 - 2 6.449 155 - 3 6.500 153 - - - - - Sample client-side profile for TAO for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -rw_rdlock 0.40 146.579 20006 0.007 1.200 0.005 0.000 -rw_unlock 0.25 91.386 20009 0.005 0.058 0.004 0.000 -mutex_lock 0.06 21.087 5265 0.004 0.178 0.002 0.000 -mutex_unlock 0.04 14.372 5271 0.003 0.075 0.002 0.000 -rw_wrlock 0.00 0.045 3 0.015 0.034 0.005 0.008 - - - Sample server-side profile for TAO for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 1.12 154.491 54507 0.003 0.140 0.002 0.000 -mutex_unlock 1.06 145.638 54508 0.003 0.310 0.002 0.000 -rw_rdlock 0.27 37.265 6813 0.005 0.037 0.004 0.000 -rw_unlock 0.20 27.792 6813 0.004 0.045 0.004 0.000 - diff --git a/TAO/IIOP/test/results/Visibroker b/TAO/IIOP/test/results/Visibroker deleted file mode 100644 index 8d6bb2457c7..00000000000 --- a/TAO/IIOP/test/results/Visibroker +++ /dev/null @@ -1,79 +0,0 @@ -Cubit results over Ethernet with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - - -Visibroker reactive 1 1.167 856 - 2 1.39 718 - 3 1.664 600 - -Visibroker thr-per-connection 1 1.077 928 - 2 1.228 814 - 3 1.789 558 - - - -Cubit results over ATM with 20,000 calls ----------------------------------------- - - Clients Latency (ms) Calls/Sec - -Visibroker reactive 1 1.195 836 - 2 1.241 805 - 3 1.56 641 - -Visibroker thr-per-connection 1 1.060 943 - 2 1.327 753 - 3 2.108 474 - - -Prime_Factor results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -Visibroker reactive 1 7.43 134 - 2 13.652 73 - 3 17.738 56 - -Visibroker thr-per-connection 1 7.371 135 - 2 8.561 116 - 3 11.376 87 - -IO-intensive results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -Visibroker reactive 1 6.424 155 - 2 11.895 84 - 3 17.468 57 - -Visibroker thr-per-connection 1 6.41 156 - 2 6.496 154 - 3 6.524 153 - - - - - TNF client-side profile for Visibroker for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_unlock 1.31 188.930 61797 0.003 1.027 0.002 0.000 -mutex_lock 1.21 175.465 61790 0.003 0.330 0.002 0.000 - - - TNF server-side profile for Visibroker for 20000 calls - - Profile - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.18 165.141 60432 0.003 0.501 0.002 0.000 -mutex_unlock 0.16 153.891 60432 0.003 0.373 0.002 0.000 - - diff --git a/TAO/IIOP/test/results/orbs.xls b/TAO/IIOP/test/results/orbs.xls Binary files differdeleted file mode 100644 index 149078dd383..00000000000 --- a/TAO/IIOP/test/results/orbs.xls +++ /dev/null diff --git a/TAO/IIOP/test/svr.cpp b/TAO/IIOP/test/svr.cpp deleted file mode 100644 index f96a537dbb4..00000000000 --- a/TAO/IIOP/test/svr.cpp +++ /dev/null @@ -1,214 +0,0 @@ -// $Id$ - -// @(#)svr.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: simple IIOP server for "cubit.idl" interface. -// -// Starts up, builds an objref, prints its string in debug mode, -// listens for messages, responds to them. -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" - -#include "corba/orb.h" -#include "corba/debug.h" -#include "connect.h" - -#include "cubit_i.h" - -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - -// Global Variables -CORBA_String key = (CORBA_String)"key0"; -int num_of_objs = 1; - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_Get_Opt opts (argc, argv, "dk:n:"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - - case 'd': // debug flag - TAO_debug_level++; - continue; - - case 'k': // key (str) - key = (CORBA_String) opts.optarg; - continue; - - case 'n': // idle seconds b4 exit - num_of_objs = ACE_OS::atoi(opts.optarg); - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-k {object_key}]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - - -// -// Standard command line parsing utilities used. -// -int -main (int argc, char *argv[]) -{ - CORBA_Environment env; - CORBA_Object_ptr obj = 0; - CORBA_ORB_ptr orb_ptr; - CORBA_BOA_ptr oa_ptr; - char *orb_name = "internet"; - int idle = -1; - - orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env); - if (env.exception () != 0) { - print_exception (env.exception (), "ORB init"); - return 1; - } - - // Initialize the Basic Object Adapter - oa_ptr = orb_ptr->BOA_init(argc, argv, "ROA"); - if (oa_ptr == 0) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to initialize the BOA.\n"), 1); - - - // - // Parse remaining command line and verify parameters. - // - parse_args(argc, argv); - - // Create implementation object with user specified key - Cubit_i_ptr *my_cubit = new Cubit_i_ptr[num_of_objs]; - for (int ndx = 0; ndx < num_of_objs; ndx++) - { - CORBA_String obj_str = CORBA_string_alloc(ACE_OS::strlen ((char *)key)+2); - sprintf(obj_str, "%s%d", (char*)key, ndx); - my_cubit[ndx] = new Cubit_i(obj_str); - if (my_cubit[ndx] == 0) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object&d\n", ndx), 2); - - if (TAO_debug_level >= 1) - { - // Why are we getting the BOA_ptr from here when we've already - // got it above? - CORBA_OctetSeq obj_key; - obj_key.buffer = (CORBA_Octet *) obj_str; - obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str); - - if (oa_ptr->find(obj_key, obj) == -1) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3); - - // - // Stringify the objref we'll be implementing, and - // print it to stdout. Someone will take that string - // and give it to some client. Then release the object. - // - CORBA_String str; - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("Object Created at: '%ul'", obj); - dmsg1 ("listening as object '%s'", str); - - } - CORBA_string_free(obj_str); - } -// Cubit_i_ptr my_cubit = new Cubit_i(key); -// if (my_cubit1 == 0) -// ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object\n"), 2); - -/* if (TAO_debug_level >= 1) - { - // Why are we getting the BOA_ptr from here when we've already - // got it above? - CORBA_OctetSeq obj_key; - obj_key.buffer = (CORBA_Octet *) key; - obj_key.length = obj_key.maximum = ACE_OS::strlen ((char *)key); - - if (oa_ptr->find(obj_key, obj) == -1) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3); - - // - // Stringify the objref we'll be implementing, and - // print it to stdout. Someone will take that string - // and give it to some client. Then release the object. - // - CORBA_String str; - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("listening as object '%s'", str); - - obj_key.buffer = (CORBA_Octet *)"key1"; - obj_key.length = obj_key.maximum = 4; - if (oa_ptr->find(obj_key, obj) == -1) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3); - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("listening as object '%s'", str); - } -*/ - // Handle requests for this object until we're killed, or one of - // the methods asks us to exit. - // - int terminationStatus = 0; - - -#if !defined(USE_HOMEBREW_EVENT_LOOP) - ACE_Reactor::run_event_loop(); -#else - while (1) - { - int result = params->reactor()->handle_events (); - - if (result == -1) - { - terminationStatus = -1; - break; - } - } -#endif - - // - // Shut down the OA -- recycles all underlying resources (e.g. file - // descriptors, etc). - // - oa_ptr->clean_shutdown (env); - return 0; -} diff --git a/TAO/IIOP/test/test.mak b/TAO/IIOP/test/test.mak deleted file mode 100644 index a27147d5f32..00000000000 --- a/TAO/IIOP/test/test.mak +++ /dev/null @@ -1,463 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-!IF "$(CFG)" == ""
-CFG=server - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to server - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\
- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "server - Win32 Debug"
-RSC=rc.exe
-CPP=cl.exe
-
-!IF "$(CFG)" == "client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "client\Release"
-# PROP BASE Intermediate_Dir "client\Release"
-# PROP BASE Target_Dir "client"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir "client"
-OUTDIR=.
-INTDIR=.\Release
-
-ALL : "$(OUTDIR)\client.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\clnt.obj"
- -@erase "$(INTDIR)\cubitC.obj"
- -@erase "$(OUTDIR)\client.exe"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\
- /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe"
-LINK32_OBJS= \
- "$(INTDIR)\clnt.obj" \
- "$(INTDIR)\cubitC.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "client\Debug"
-# PROP BASE Intermediate_Dir "client\Debug"
-# PROP BASE Target_Dir "client"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir "client"
-OUTDIR=.
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\client.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\clnt.obj"
- -@erase "$(INTDIR)\cubitC.obj"
- -@erase "$(INTDIR)\vc40.idb"
- -@erase "$(INTDIR)\vc40.pdb"
- -@erase "$(OUTDIR)\client.exe"
- -@erase "$(OUTDIR)\client.ilk"
- -@erase "$(OUTDIR)\client.pdb"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe"
-LINK32_OBJS= \
- "$(INTDIR)\clnt.obj" \
- "$(INTDIR)\cubitC.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "server - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "server\Release"
-# PROP BASE Intermediate_Dir "server\Release"
-# PROP BASE Target_Dir "server"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir "server"
-OUTDIR=.
-INTDIR=.\Release
-
-ALL : "$(OUTDIR)\server.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\cubit_i.obj"
- -@erase "$(INTDIR)\cubitS.obj"
- -@erase "$(INTDIR)\svr.obj"
- -@erase "$(OUTDIR)\server.exe"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\
- /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe"
-LINK32_OBJS= \
- "$(INTDIR)\cubit_i.obj" \
- "$(INTDIR)\cubitS.obj" \
- "$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "server - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "server\Debug"
-# PROP BASE Intermediate_Dir "server\Debug"
-# PROP BASE Target_Dir "server"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir "server"
-OUTDIR=.
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\server.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\cubit_i.obj"
- -@erase "$(INTDIR)\cubitS.obj"
- -@erase "$(INTDIR)\svr.obj"
- -@erase "$(INTDIR)\vc40.idb"
- -@erase "$(INTDIR)\vc40.pdb"
- -@erase "$(OUTDIR)\server.exe"
- -@erase "$(OUTDIR)\server.ilk"
- -@erase "$(OUTDIR)\server.pdb"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe"
-LINK32_OBJS= \
- "$(INTDIR)\cubit_i.obj" \
- "$(INTDIR)\cubitS.obj" \
- "$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-.c{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.cpp{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.cxx{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.c{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-.cpp{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-.cxx{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-################################################################################
-# Begin Target
-
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
-
-!IF "$(CFG)" == "client - Win32 Release"
-
-!ELSEIF "$(CFG)" == "client - Win32 Debug"
-
-!ENDIF
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\clnt.cpp
-DEP_CPP_CLNT_=\
- "..\..\..\ace\config-win32.h"\
- ".\cubitC.h"\
- {$(INCLUDE)}"\ace\ACE.h"\
- {$(INCLUDE)}"\ace\ACE.i"\
- {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
- {$(INCLUDE)}"\ace\Auto_Ptr.h"\
- {$(INCLUDE)}"\ace\Auto_Ptr.i"\
- {$(INCLUDE)}"\ace\config-win32-common.h"\
- {$(INCLUDE)}"\ace\config.h"\
- {$(INCLUDE)}"\ace\Get_Opt.h"\
- {$(INCLUDE)}"\ace\Get_Opt.i"\
- {$(INCLUDE)}"\ace\Log_Msg.h"\
- {$(INCLUDE)}"\ace\Log_Priority.h"\
- {$(INCLUDE)}"\ace\Log_Record.h"\
- {$(INCLUDE)}"\ace\Log_Record.i"\
- {$(INCLUDE)}"\ace\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\SString.h"\
- {$(INCLUDE)}"\ace\SString.i"\
- {$(INCLUDE)}"\ace\stdcpp.h"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-NODEP_CPP_CLNT_=\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
-
-
-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cubitC.cpp
-DEP_CPP_CUBIT=\
- ".\cubitC.h"\
-
-NODEP_CPP_CUBIT=\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
-
-
-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"
-
-
-# End Source File
-# End Target
-################################################################################
-# Begin Target
-
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
-
-!IF "$(CFG)" == "server - Win32 Release"
-
-!ELSEIF "$(CFG)" == "server - Win32 Debug"
-
-!ENDIF
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\cubitS.cpp
-DEP_CPP_CUBITS=\
- ".\cubitC.cpp"\
- ".\cubitC.h"\
- ".\cubitS.h"\
- ".\method_db.i"\
-
-NODEP_CPP_CUBITS=\
- ".\connect.h"\
- ".\corba\debug.h"\
- ".\corba\optable.h"\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
- ".\iiopobj.h"\
- ".\params.h"\
-
-
-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cubit_i.cpp
-DEP_CPP_CUBIT_=\
- ".\cubit_i.h"\
- ".\cubitC.h"\
- ".\cubitS.h"\
-
-NODEP_CPP_CUBIT_=\
- ".\connect.h"\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
- ".\params.h"\
-
-
-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\svr.cpp
-DEP_CPP_SVR_C=\
- "..\..\..\ace\config-win32.h"\
- ".\cubit_i.h"\
- ".\cubitC.h"\
- ".\cubitS.h"\
- {$(INCLUDE)}"\ace\ACE.h"\
- {$(INCLUDE)}"\ace\ACE.i"\
- {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
- {$(INCLUDE)}"\ace\Auto_Ptr.h"\
- {$(INCLUDE)}"\ace\Auto_Ptr.i"\
- {$(INCLUDE)}"\ace\config-win32-common.h"\
- {$(INCLUDE)}"\ace\config.h"\
- {$(INCLUDE)}"\ace\Get_Opt.h"\
- {$(INCLUDE)}"\ace\Get_Opt.i"\
- {$(INCLUDE)}"\ace\Log_Msg.h"\
- {$(INCLUDE)}"\ace\Log_Priority.h"\
- {$(INCLUDE)}"\ace\Log_Record.h"\
- {$(INCLUDE)}"\ace\Log_Record.i"\
- {$(INCLUDE)}"\ace\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\SString.h"\
- {$(INCLUDE)}"\ace\SString.i"\
- {$(INCLUDE)}"\ace\stdcpp.h"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-NODEP_CPP_SVR_C=\
- ".\connect.h"\
- ".\corba\debug.h"\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
-
-
-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"
-
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/TAO/IIOP/test/test.mdp b/TAO/IIOP/test/test.mdp Binary files differdeleted file mode 100644 index dc1aea7d5be..00000000000 --- a/TAO/IIOP/test/test.mdp +++ /dev/null diff --git a/TAO/IIOP/test/test1.cpp b/TAO/IIOP/test/test1.cpp deleted file mode 100644 index 753a3784e43..00000000000 --- a/TAO/IIOP/test/test1.cpp +++ /dev/null @@ -1,392 +0,0 @@ -// $Id$ - -// @(#)test1.cpp 1.4 95/09/28 -// Copyright 1995 by Sun Microsystems, Inc. -// All Rights Reserved -// -// TEST stubs for "test1" -// - -#include <stdio.h> - -#include "test1.h" - - -// -// Define all the stubs ... it's a lot less error prone to do it with -// macros than by hand! -// -// NOTE: the "calldata" is exported for use by the skeletons. At some -// point skeletons will probably be fully abstracted; for now they aren't. -// -// Also, for some reason, name mangling is changed by the explicit -// declaration as "extern" -- if it's not done, linking fails. -// -#define DEFINE_TEST3(typename, truetype, truetypename) \ - static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \ - { _tc_CORBA_ ## truetypename, PARAM_RETURN, 0 }, \ - { _tc_CORBA_ ## truetypename, PARAM_IN, 0 }, \ - { _tc_CORBA_ ## truetypename, PARAM_OUT, 0 }, \ - { _tc_CORBA_ ## truetypename, PARAM_INOUT, 0 }, \ - }; \ - \ - extern const TAO_Call_Data test1_ ## typename ## _calldata; \ - \ - const TAO_Call_Data test1_ ## typename ## _calldata = { \ - "test_" #typename, CORBA_B_TRUE, \ - 4, &test1_ ## typename ## _paramdata [0], \ - 0, 0, \ - }; \ - \ - CORBA_ ## truetype \ - test1_test_ ## typename (test1_ptr target, \ - CORBA_ ## truetype in_a1, \ - CORBA_ ## truetype &out_a2, \ - CORBA_ ## truetype &inout_a3, \ - CORBA_Environment &env) { \ - CORBA_ ## truetype _retval; \ - STUB_Object *_obj; \ - if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \ - != NOERROR) \ - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); \ - else { \ - _obj->do_call (env, &test1_ ## typename ## _calldata, \ - &_retval, &in_a1, &out_a2, &inout_a3); \ - _obj->Release (); \ - } \ - return _retval; \ - } - -// changed extern const calldata test1_ ## typename ## _calldata; -// to const calldata test1_ ## typename ## _calldata; \ - -// changed CORBA_ ## truetype _retval = 0; to changed CORBA_ ## truetype _retval; - -#define DEFINE_TEST(typename, truetype) \ - DEFINE_TEST3(typename, truetype, truetype) - - -// -// Generate a system exception, passing an operation ID that's -// not allowed by IIOP (much less this interface) and verifying -// that the server returns some kind of system exception. -// -static const TAO_Call_Data illegal_calldata = { - "+_illegal", CORBA_B_TRUE, - 0, 0, - 0, 0 -}; - -void -test_illegal (test1_ptr target, CORBA_Environment &env) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &illegal_calldata - ); - data->Release (); - } -} - - -extern const TAO_Call_Data test1_void_calldata; -const TAO_Call_Data test1_void_calldata = { - "test_void", CORBA_B_TRUE, - 0, 0, - 0, 0 -}; - -void -test1_test_void (test1_ptr target, CORBA_Environment &env) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &test1_void_calldata - ); - data->Release (); - } -} - -DEFINE_TEST (short, Short); -DEFINE_TEST (long, Long); -DEFINE_TEST (ushort, UShort); -DEFINE_TEST (ulong, ULong); - -#if defined(MIPS) -// -// NOTE: C/C++ compilers as a rule pass a "float" in the space that -// a "double" takes up. Conversions are evidently optional; portability -// forces the following "explicit temporary" hack to work on at least -// one MIPS platform, which converts the parameter to "double" and -// hence changes the binary representation. (Even if that is a compiler -// bug, it's probably required by now for binary compatibility!) -// -// A "-k ansi" compiler flag may be needed to get correct behaviour; -// passing the "in" parameters by reference apparently works too. At -// this time, none of these solutions is used by default. -// -// This stub-level hackery seems like it could be replaced inside of the -// stub interpreter, which could just manually convert "float" parameters -// (all of them) as special cases. But of course, that would slow the -// interpreter down on _every_ call, not just the ones that require it -// (such as this one). Tradeoffs! -// -static const TAO_Param_Data test1_float_paramdata [4] = { - { _tc_CORBA_Float , PARAM_RETURN , 0 }, - { _tc_CORBA_Float , PARAM_IN , 0 }, - { _tc_CORBA_Float , PARAM_OUT , 0 }, - { _tc_CORBA_Float , PARAM_INOUT , 0 } -}; - -extern const TAO_Call_Data test1_float_calldata; - -const TAO_Call_Data test1_float_calldata = { - "test_float", CORBA_B_TRUE, - 4 , &test1_float_paramdata [0], - 0 , 0 -}; - -CORBA_Float -test1_test_float ( - test1_ptr target, - CORBA_Float in_a1, - CORBA_Float &out_a2, - CORBA_Float &inout_a3, - CORBA_Environment &env -) -{ - CORBA_Float _retval; - - // These three temporaries required due to MIPS compiler bug - CORBA_Float _in_a1 = in_a1; - CORBA_Float _out_a2 = out_a2; - CORBA_Float _inout_a3 = inout_a3; - - target -> data -> do_call (env, - &test1_float_calldata, - &_retval, - &_in_a1, - &_out_a2, - &_inout_a3); - return _retval; -} - -#else -DEFINE_TEST (float, Float); -#endif // MIPS - - -DEFINE_TEST (double, Double); -DEFINE_TEST (boolean, Boolean); -DEFINE_TEST (char, Char); -DEFINE_TEST (octet, Octet); - -/* -CORBA_Any * -test1_test_any (test1_ptr target, - const CORBA_Any &in_a1, - CORBA_Any *&out_a2, - CORBA_Any &inout_a3, - CORBA_Environment &env) -{ - // XXX implement this stub! ... annoying that C++ mapping - // calls for so much special casing -} -*/ - - -DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode); -DEFINE_TEST3 (Principal, Principal_ptr, Principal); -DEFINE_TEST3 (Object, Object_ptr, Object); - -// NOTE: C++ mapping has "in" strings as "const", which doesn't -// show up in this macro ... -DEFINE_TEST3 (string, Char *, String); - -DEFINE_TEST (longlong, LongLong); -DEFINE_TEST (ulonglong, ULongLong); -DEFINE_TEST (wchar, WChar); - -// NOTE: C++ mapping has "in" strings as "const", which doesn't -// show up in this macro ... -DEFINE_TEST3 (wstring, WChar *, WString); - -#if !defined(NONNATIVE_LONGDOUBLE) -DEFINE_TEST (longdouble, LongDouble); -#endif - -#undef DEFINE_TEST - - -// -// Utility macros used to construct octet codes that are aligned -// on longword boundaries, and with a known byte order. This -// happens to use big endian encoding since it was convenient. -// (Longword alignment is a happy accident of the specification -// of OMG-IDL ... it could have been much worse!) -// -// It'd be much simpler to lay out such data in assembler! -// - -#if defined (WORDS_BIGENDIAN) -# define MAKE_BIG_LONG(a,b,c,d) \ - ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \ - | (((c) & 0xff) << 8) | ((d) & 0xff)) -# define BIG_ENDIAN_LONG(x) (x) - -#else // LITTLE_ENDIAN -# define MAKE_BIG_LONG(a,b,c,d) \ - ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \ - | (((b) & 0xff) << 8) | ((a) & 0xff)) -# define BYTE_FROM(n,integer) (((integer)>>(8*(n)))&0xff) -# define BIG_ENDIAN_LONG(integer) \ - MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\ - BYTE_FROM(1,integer), BYTE_FROM(0,integer)) -#endif - - - -// -// "x1" exception typecode ... must be longword aligned -// -static CORBA_Long oc_x1 [] = { - 0, // big endian flag + padding - BIG_ENDIAN_LONG (29), // length of ID string + NUL - MAKE_BIG_LONG ('I', 'D', 'L', ':'), // bytes of ID string - MAKE_BIG_LONG ('E', 'n', 'g', '.'), - MAKE_BIG_LONG ('S', 'U', 'N', '.'), - MAKE_BIG_LONG ('C', 'O', 'M', '/'), - MAKE_BIG_LONG ('t', 'e', 's', 't'), - MAKE_BIG_LONG ('1', '/', 'x', '1'), - MAKE_BIG_LONG (':', '1', '.', '0'), - 0, - BIG_ENDIAN_LONG (1), // (empty) namelen + NUL - 0, - BIG_ENDIAN_LONG (1), // only one struct member - BIG_ENDIAN_LONG (1), // (empty) member name + NUL - 0, - BIG_ENDIAN_LONG (tk_long) -}; -static CORBA_TypeCode tc_x1 (tk_except, sizeof oc_x1, - (unsigned char *)&oc_x1, CORBA_B_FALSE); -CORBA_TypeCode_ptr _tc_test1_x1 = &tc_x1; - - - -// -// "x2" exception typecode ... must be longword aligned -// -static CORBA_Long oc_x2 [] = { - 0, // big endian flag + padding - BIG_ENDIAN_LONG (29), // length of ID string + NUL - MAKE_BIG_LONG ('I', 'D', 'L', ':'), // bytes of ID string - MAKE_BIG_LONG ('E', 'n', 'g', '.'), - MAKE_BIG_LONG ('S', 'U', 'N', '.'), - MAKE_BIG_LONG ('C', 'O', 'M', '/'), - MAKE_BIG_LONG ('t', 'e', 's', 't'), - MAKE_BIG_LONG ('1', '/', 'x', '2'), - MAKE_BIG_LONG (':', '1', '.', '0'), - 0, - BIG_ENDIAN_LONG (1), // (empty) namelen + NUL - 0, - BIG_ENDIAN_LONG (2), // two struct members - - BIG_ENDIAN_LONG (1), // (empty) member name + NUL - 0, - BIG_ENDIAN_LONG (tk_objref), - BIG_ENDIAN_LONG (29), // type ID + NUL - MAKE_BIG_LONG ('I', 'D', 'L', ':'), // bytes of ID string - MAKE_BIG_LONG ('o', 'm', 'g', '.'), - MAKE_BIG_LONG ('o', 'r', 'g', '/'), - MAKE_BIG_LONG ('C', 'O', 'R', 'B'), - MAKE_BIG_LONG ('A', '/', 'O', 'b'), - MAKE_BIG_LONG ('j', 'e', 'c', 't'), - MAKE_BIG_LONG (':', '1', '.', '0'), - 0, - - BIG_ENDIAN_LONG (1), // (empty) member name + NUL - 0, - BIG_ENDIAN_LONG (tk_long) -}; -static CORBA_TypeCode tc_x2 (tk_except, sizeof oc_x2, - (unsigned char *)&oc_x2, CORBA_B_FALSE); -CORBA_TypeCode_ptr _tc_test1_x2 = &tc_x2; - - -// -// parameter, exception, and call descriptions for "test_throw" -// -static const TAO_Param_Data test1_test_throw_paramdata [1] = { - { _tc_CORBA_Long, PARAM_IN, 0 } -}; - -static CORBA_TypeCode_ptr test1_test_throw_excepts [2] = { - &tc_x1, &tc_x2 -}; - -extern const TAO_Call_Data test1_test_throw_calldata; - -const TAO_Call_Data test1_test_throw_calldata = { - "test_throw", CORBA_B_TRUE, - 1, &test1_test_throw_paramdata [0], - 2, &test1_test_throw_excepts [0] -}; - -// -// "test_throw" stub -// -void -test1_test_throw ( - test1_ptr target, - CORBA_Long case_num, - CORBA_Environment &env // throw (x1, x2) -) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &test1_test_throw_calldata, - &case_num); - data->Release (); - } -} - -// -// PLEASE EXIT -// - -static const TAO_Call_Data test1_please_exit_calldata = { - "please_exit", CORBA_B_FALSE, - 0, 0, - 0, 0 -}; - -void -test1_please_exit ( - test1_ptr target, - CORBA_Environment &env -) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &test1_please_exit_calldata - ); - data->Release (); - } -} - diff --git a/TAO/IIOP/test/test1.h b/TAO/IIOP/test/test1.h deleted file mode 100644 index 63e409d36c3..00000000000 --- a/TAO/IIOP/test/test1.h +++ /dev/null @@ -1,126 +0,0 @@ -// $Id$ - -// @(#)test1.hh 1.2 95/09/12 -// Copyright 1995 by Sun Microsystems, Inc. -// All Rights Reserved -// -// TEST interface for "test1" -// - -#ifndef _TEST1_HH -#define _TEST1_HH - -#include <corba/orb.h> -#include <corba/stub.h> - - -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ - -typedef CORBA_UShort test1_ushort; -typedef CORBA_ULong test1_ulong; - -typedef CORBA_LongLong test1_longlong; -typedef CORBA_ULongLong test1_ulonglong; -typedef CORBA_LongDouble test1_longdouble; - -typedef CORBA_Object test1; -typedef test1 *test1_ptr; - -#define DECL_TEST(typename, truetype) \ - truetype \ - test1_test_ ## typename ( \ - test1_ptr target, \ - truetype in_a1, \ - truetype &out_a2, \ - truetype &inout_a3, \ - CORBA_Environment &env \ - ) - -void test_illegal (test1_ptr target, CORBA_Environment &env); -void test1_test_void (test1_ptr target, CORBA_Environment &env); - -DECL_TEST (short, CORBA_Short); -DECL_TEST (long, CORBA_Long); -DECL_TEST (ushort, CORBA_UShort); -DECL_TEST (ulong, CORBA_ULong); -DECL_TEST (float, CORBA_Float); -DECL_TEST (double, CORBA_Double); -DECL_TEST (boolean, CORBA_Boolean); -DECL_TEST (char, CORBA_Char); -DECL_TEST (octet, CORBA_Octet); - -CORBA_Any * -test1_test_any ( - test1_ptr target, - const CORBA_Any &in_a1, - CORBA_Any *&out_a2, - CORBA_Any &inout_a3, - CORBA_Environment &env -); - -DECL_TEST (TypeCode, CORBA_TypeCode_ptr); -DECL_TEST (Principal, CORBA_Principal_ptr); -DECL_TEST (Object, CORBA_Object_ptr); - -// NOTE: CORBA C++ mapping says the "in" string is const -DECL_TEST (string, CORBA_String); - -DECL_TEST (longlong, CORBA_LongLong); -DECL_TEST (ulonglong, CORBA_ULongLong); -DECL_TEST (wchar, CORBA_WChar); - -// NOTE: CORBA C++ mapping says the "in" string is const -DECL_TEST (wstring, CORBA_WString); - -DECL_TEST (longdouble, CORBA_LongDouble); - -#undef DECL_TEST - -extern CORBA_TypeCode_ptr _tc_test1_x1; - -class test1_x1 : public CORBA_UserException { - public: - CORBA_Long case_num; - - test1_x1 (CORBA_Long n) - : CORBA_UserException (_tc_test1_x1), case_num (n) - { } -}; - -extern CORBA_TypeCode_ptr _tc_test1_x2; - -class test1_x2 : public CORBA_UserException { - public: - CORBA_Object_ptr obj; - CORBA_Long case_num; - - test1_x2 (CORBA_Object_ptr obj1, - CORBA_Long n) - : CORBA_UserException (_tc_test1_x2), - obj (obj1), case_num (n) { } - - ~test1_x2 () - { CORBA_release (obj); } -}; - -void -test1_test_throw ( - test1_ptr target, - CORBA_Long case_num, - CORBA_Environment &env // throw (x1, x2) -); - -void -test1_please_exit ( - test1_ptr target, - CORBA_Environment &env -); - -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ - -#endif // _TEST1_HH - diff --git a/TAO/IIOP/test/test1.idl b/TAO/IIOP/test/test1.idl deleted file mode 100644 index d47ab676ef5..00000000000 --- a/TAO/IIOP/test/test1.idl +++ /dev/null @@ -1,80 +0,0 @@ -// $Id$ - -// @(#)test1.idl 1.1 95/09/11 -// Copyright 1994-1995 by Sun Microsystems, Inc. -// -// TEST basic marshaling tests for all IDL primitive types, modes -// -// This test omits constructed types (struct, union, enum, sequence, and -// array types), and only tests very simple user defined exceptions. -// -// Values returned are well defined functions of the input values: -// -// * For numeric types (octet, short, long, longlong, float, double, -// longdouble, and unsigned variants) the value is cubed. -// * For Boolean, it's the negation. -// * For Any, TypeCode, Principal, Object, char and wchar, -// string and wstring, it's the input value. -// -// The "return" and "out" parameter is the function of the "in" parameter; -// the "inout" parameter is the function of its original value. -// -// The "echo" test has all output values be the input values, with no -// changes to the bit patterns originally transmitted. While easier to -// use to identify some kinds of problem, it is not as complete a test. -// - -#define DECL_TEST(type) \ - type test_ ## type ( in type a1, out type a2, inout type a3) - -#pragma prefix "Eng.SUN.COM" // only for Sun-defined interfaces - -interface test1 { - void test_void (); - - typedef unsigned short ushort; - typedef unsigned long ulong; - - typedef long long longlong; - typedef unsigned long long ulonglong; - typedef long double longdouble; - - DECL_TEST (short); - DECL_TEST (long); - DECL_TEST (ushort); - DECL_TEST (ulong); - DECL_TEST (float); - DECL_TEST (double); - DECL_TEST (boolean); - DECL_TEST (char); - DECL_TEST (octet); - DECL_TEST (any); - DECL_TEST (TypeCode); - DECL_TEST (Principal); - DECL_TEST (Object); // CORBA::Object - DECL_TEST (string); // unbounded string - - DECL_TEST (longlong); - DECL_TEST (ulonglong); - DECL_TEST (wchar); - DECL_TEST (wstring); // unbounded wstring - DECL_TEST (longdouble); - - // - // All cases, "case_num" in the exception is the same as the 'in' param - // * negative or zero, throws x1 - // * positive even cases, throws x2 with obj = null objref - // * positive odd cases, throws x2 with obj = target objref - // - exception x1 { long case_num; }; - exception x2 { Object obj; long case_num; }; - - void test_throw (in long case_num) raises (x1, x2); - - // - // Aid for test cleanup in case server's not told to quit after - // being idle for some time period - // - oneway void please_exit (); -}; - diff --git a/TAO/IIOP/test/test1_clnt.cpp b/TAO/IIOP/test/test1_clnt.cpp deleted file mode 100644 index ea6705afa1c..00000000000 --- a/TAO/IIOP/test/test1_clnt.cpp +++ /dev/null @@ -1,638 +0,0 @@ -// $Id$ - -// @(#)test1_clnt.cpp 1.5 95/09/24 -// Copyright 1995 by Sun Microsystems, Inc. -// All Rights Reserved -// -// TEST client driver for "test1" -// - -#ifdef USE_IOSTREAM -#include <iostream.h> -#endif - -#include <stdio.h> -#include <string.h> -#include <ace/Get_Opt.h> - -#if unix -# include <unistd.h> - -#else // windows - -#endif // unix - -#include "test1.h" -#include <corba/debug.h> - - -#if !defined (_WIN32) -extern char *optarg; // missing on some platforms -#endif - -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - - -// -// All tests are specified so that the return value and "out" (second) -// parameters are easily tested functions of the "in" (first) parameter, -// and the "inout" (third) parameter is the same function the its -// initial value. Caller is expected to specify two different "in" -// values. This helps make the marshaled bits vary, and turn up a class -// of potential problems that'd be hidden if parameter order had no -// effect on the test. -// -// PERFORM_TEST calls a test for a given type, reporting in cases where -// the ORB or operation failed. The COMPARE symbol can be redefined -// to achieve different functions -- e.g. cubing numbers, identity, -// negation, etc. It should return true iff the correct result was -// returned. -// -// BAD_COMPARE_VALUES is to produce diagnostics when a test fails, -// showing the actual and expected values of returned parameters. -// This helps diagnose specific porting problems. -// -// The RELEASE symbol may be defined to free memory, eliminating client -// side memory leaks in the test. -// -#define RELEASE(X) // NOP by default -#define PERFORM_TEST(name,type,value1,value2) \ - { \ - CORBA_ ## type v1, v2, v3; \ - \ - v1 = (CORBA_ ## type)(value1); \ - v2 = 0; \ - v3 = (CORBA_ ## type)(value2); \ - \ - test_count++; \ - v1 = test1_test_ ## name (target, v1, v2, v3, env); \ - if (env.exception () != 0) { \ - print_exception (env.exception (), "perform test_" #name); \ - error_count++; \ - } else if (!COMPARE (CORBA_ ## type, v1, value1) \ - || !COMPARE (CORBA_ ## type, v2, value1) \ - || !COMPARE (CORBA_ ## type, v3, value2) ) { \ - ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \ - BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \ - error_count++; \ - } \ - RELEASE (v1); RELEASE (v2); RELEASE (v3); \ - } - -// -// This messing about is because the ostream op << cannot always -// be used with all kinds of data ... e.g. LongDouble, TypeCode. -// -#ifdef USE_IOSTREAM -# define DO_IO(x) x -#else -# define DO_IO(x) -#endif -#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \ - DO_IO( cerr << " v1=" << v1; \ - cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \ - cerr << " v2=" << v2; \ - cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \ - cerr << " v3=" << v3; \ - cerr << " expecting " << EXPVAL(CORBA_ ## type, value2) << "\n"); -#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \ - BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) - - -// -// test utility -- should be able to just use is_equivalent() directly -// but this implementation uses null pointers for nil, so this must -// check for nulls first. (May be noncompliant with C++ mapping!) -// -static CORBA_Boolean -compare_objrefs ( - CORBA_Object_ptr v1, - CORBA_Object_ptr v2 -) -{ - CORBA_Boolean temp; - CORBA_Environment env; - - if (v1 == v2) - return CORBA_B_TRUE; - - if (CORBA_is_nil (v1)) - return CORBA_is_nil (v2); - - temp = v1->_is_equivalent (v2, env); - if (env.exception () != 0) { - print_exception (env.exception (), "compare objref"); - return CORBA_B_FALSE; - } - return temp; -} - - -// -// Helper routine to help sure math (especially for floating point) -// gets done correctly. -// -template <class Type> -Type cube (Type arg) -{ - Type temp = arg; - - temp = temp * arg; - temp = temp * arg; - return temp; -} - - -static int skip_longdouble = 0; - -// -// This just performs the tests ... -// -void -do_tests ( - test1_ptr target, - unsigned loop_count, - unsigned &test_count, - unsigned &error_count -) -{ - int count; - - for (count = 0; count < loop_count; count++) { - CORBA_Environment env; - CORBA_Environment env2; // XXX - - // - // test_void - // - test_count++; - test1_test_void (target, env); - if (env.exception () != 0) { - print_exception (env.exception (), "perform test_void"); - error_count++; - } - - // - // Numeric tests ... try some variety in computation, no real - // rationale in the choice of initial parameter values except - // not to use the same values all the time. - // -#define EXPVAL(type,original_value) ((type) cube((type)(original_value))) -#define COMPARE(type,retval,original_value) \ - ((retval) == EXPVAL(type, original_value)) - - PERFORM_TEST (octet, Octet, count + 29, count - 22); - - PERFORM_TEST (short, Short, count - 23, count + 19); - PERFORM_TEST (ushort, UShort, count + 23, count - 19); - - PERFORM_TEST (long, Long, count - 17, count + 20); - PERFORM_TEST (ulong, ULong, count + 17, count - 20); - -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... - PERFORM_TEST (longlong, LongLong, count - 177, count + 3); - PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3); -#endif // !NONNATIVE_LONGLONG - -#if !defined (i386) - // - // XXX not sure what's wrong with the COMPARE macro with respect to - // floating point on x86, since fprintf shows the values basically - // look correct ... but these float/double tests fail. - // - PERFORM_TEST (float, Float, count - 0.29, count + 3.14159); - PERFORM_TEST (double, Double, count * 1.77, count * 2.71); -#endif // !defined (i386) - - -#ifndef NONNATIVE_LONGDOUBLE -#undef BAD_COMPARE_VALUES -#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP - - // - // don't try this between two platforms that don't provide - // arithmetic support for LongDouble values ... - // - if (!skip_longdouble) { - PERFORM_TEST (longdouble, LongDouble, - count - 2.33, count * 3.14159); - } - -# undef BAD_COMPARE_VALUES -# define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \ - BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) -#endif // !NONNATIVE_LONGDOUBLE - -#undef COMPARE -#undef EXPVAL - - - // - // Boolean -- negation - // -#define EXPVAL(type,original_value) (!(type)(original_value)) -#define COMPARE(type,retval,original_value) \ - (((type)(retval)) == EXPVAL(type,original_value)) - - PERFORM_TEST (boolean, Boolean, - (count & 0x01) != 0, (count & 0x01) == 0); -#undef COMPARE -#undef EXPVAL - - // - // Char, WChar -- identity - // -#define EXPVAL(type,original_value) ((type)(original_value)) -#define COMPARE(type,retval,original_value) \ - (((type)(retval)) == EXPVAL(type,original_value)) - - PERFORM_TEST (char, Char, count + 26, count - 5); - PERFORM_TEST (wchar, WChar, count, count + 25); -#undef COMPARE -#undef EXPVAL - - // - // Object_ptr -- identity (special comparision) - // -#define EXPVAL(type,original_value) ((type)(original_value)) -#define COMPARE(type,retval,original_value) \ - (compare_objrefs (retval, original_value) == CORBA_B_TRUE) -#undef RELEASE -#define RELEASE(obj) \ - { CORBA_release (obj); } - - PERFORM_TEST (Object, Object_ptr, target, CORBA_Object::_nil ()); -#undef COMPARE -#undef EXPVAL - - // - // TypeCode_ptr -- identity (special comparision), and verifies - // that most of the built-in typecode constants exist. - // - // XXX should try this on all standard and system exceptions! - // - // XXX this currently tests only marshaling/unmarshaling of - // "no parameter" TypeCodes ... complex ones (objref, struct, - // union, enum, sequence, array, alias, exception) are _NOT_ - // currently attempted. - // - // XXX for the simple typecodes (string, wstring), the single - // "bound" parameter isn't exercised/verified as it should be. - // -#define EXPVAL(type,original_value) ((type)(original_value)) -#define COMPARE(type,retval,original) \ - (((retval) == (original)) || \ - ((retval)->_kind == (original)->_kind)) - -#undef RELEASE -#define RELEASE(tc) \ - { CORBA_release (tc); } - -#undef BAD_COMPARE_VALUES -#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP - - { - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Null, _tc_CORBA_Void); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Short, _tc_CORBA_UShort); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Long, _tc_CORBA_ULong); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_LongLong, _tc_CORBA_ULongLong); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Float, _tc_CORBA_Double); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Boolean, _tc_CORBA_Octet); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Any, _tc_CORBA_TypeCode); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_LongDouble, _tc_CORBA_Principal); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Char, _tc_CORBA_String); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_WChar, _tc_CORBA_WString); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_LongDouble, _tc_CORBA_Octet); - - // - // Try all of the standard exception typecodes. - // - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_UNKNOWN, _tc_CORBA_BAD_PARAM); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_NO_MEMORY, _tc_CORBA_IMP_LIMIT); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_COMM_FAILURE, _tc_CORBA_INV_OBJREF); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_OBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INTERNAL, _tc_CORBA_MARSHAL); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INITIALIZE, _tc_CORBA_NO_IMPLEMENT); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_BAD_TYPECODE, _tc_CORBA_BAD_OPERATION); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_NO_RESOURCES, _tc_CORBA_NO_RESPONSE); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_PERSIST_STORE, _tc_CORBA_BAD_INV_ORDER); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_TRANSIENT, _tc_CORBA_FREE_MEM); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INV_IDENT, _tc_CORBA_INV_FLAG); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INTF_REPOS, _tc_CORBA_BAD_CONTEXT); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_OBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION); - - // - // All the built-in "user defined" system exceptions. - // - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_BadKind, _tc_CORBA_Bounds); - } -#undef COMPARE -#undef RELEASE - - // - // string (unbounded)-- identity (special comparision) - // -#define COMPARE(type,retval,original_value) \ - (strcmp ((char *)(retval), (char*)(original_value)) == 0) -#undef RELEASE -#define RELEASE(obj) CORBA_string_free(obj) - static const CORBA_Char str1 [] = "small"; - static const CORBA_Char str2 [] = - "relatively long string, constructed" - " with the aid of C++ implicit string" - " catenation, which simplifies much stuff"; - PERFORM_TEST (string, String, str1, str2); -#undef COMPARE -#undef RELEASE - - - // XXX any, principal, wstring ... output _is_ input - - - // - // Three test cases involve throwing user-defined exceptions. - // - { - CORBA_Exception *xp; - - // - // Case one: with parameter <= zero, must throw - // an "x1" exception whose "case_num" is that parameter - // - test_count++; - - test1_test_throw (target, -5, env); - if (env.exception () != 0) { - xp = env.exception (); - - if (strcmp ((char *)xp->id (), - (char *) _tc_test1_x1->id (env2)) != 0) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 1, " - "wrong exception thrown (id = '%s')\n", - xp->id ()); - } else { - test1_x1 *xp2 = (test1_x1 *) xp; - - if (xp2->case_num != -5) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 1, " - "wrong value (case_num = '%ld')\n", - xp2->case_num); - } - - // else, right exception was thrown - } - } else { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 1, " - "no exception thrown !!\n"); - } - - - // - // Case two: with positive odd parameter, must throw - // an "x2" exception whose obj is null, and whose case_num - // is that parameter - // - test_count++; - - test1_test_throw (target, 101, env); - if (env.exception () != 0) { - xp = env.exception (); - - if (strcmp ((char *)xp->id (), - (char *) _tc_test1_x2->id (env2)) != 0) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "wrong exception thrown (id = '%s')\n", - xp->id ()); - } else { - test1_x2 *xp2 = (test1_x2 *) xp; - - if (xp2->case_num != 101) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "wrong value (case_num = '%ld')\n", - xp2->case_num); - } - - if (!CORBA_is_nil (xp2->obj)) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "non-null objref thrown\n"); - } - - // else, right exception was thrown - } - } else { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "no exception thrown !!\n"); - } - - -#if 0 -// 18-sept-95: commented this out. Work remains to be done in -// this area: (a) ServerRequest::target operation unimplemented, -// so for the servers of current interest this test is no help; -// (b) probable pointer leak in exceptions holding data. - - // - // Case three: with positive even parameter, must throw - // an "x2" exception whose obj is the target, and whose - // case_num is that parameter - // - test_count++; - - test1_test_throw (target, 42, env); - if (env.exception () != 0) { - xp = env.exception (); - - if (strcmp ((char *)xp->id (), - (char *) _tc_test1_x2->id (env2)) != 0) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "wrong exception thrown (id = '%s')\n", - xp->id ()); - } else { - test1_x2 *xp2 = (test1_x2 *) xp; - - if (xp2->case_num != 42) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "wrong value (case_num = '%ld')\n", - xp2->case_num); - } - - CORBA_Boolean status; - - status = target->_is_equivalent (xp2->obj, env); - - if (env.exception () != 0) { - error_count++; - print_exception (env.exception (), - "test_throw/3 call to is_equivalent"); - } else if (status != CORBA_B_TRUE) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "non-equivalent objref thrown\n"); - } - - // else, right exception was thrown - } - } else { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "no exception thrown !!\n"); - } - - env.clear (); -#endif // 0 - - } - - // - // test_illegal -- generate a BAD_OPERATION system exception - // from the remote process - // - test_count++; - test_illegal (target, env); - if (env.exception () == 0 - || ACE_OS::strcmp ((char *) env.exception()->id(), - (char *) _tc_CORBA_BAD_OPERATION->id (env2)) != 0) { - ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n"); - error_count++; - } - } -} - - -int -main (int argc, char *argv[]) -{ - CORBA_ORB_ptr orb_ptr; - CORBA_Environment env; - CORBA_Object_ptr objref = CORBA_Object::_nil(); - unsigned loop_count = 1; - unsigned tests = 0, errors = 0; - int exit_later = 0; - - orb_ptr = CORBA_ORB_init (argc, argv, "internet", env); - if (env.exception () != 0) { - dexc (env, "ORB initialisation"); - return 1; - } - - // - // Parse and verify parameters. - // - ACE_Get_Opt get_opt (argc, argv, "dln:O:x"); - int c; - - while ((c = get_opt ()) != -1) - switch (c) { - case 'd': // debug flag - TAO_debug_level++; - continue; - - case 'l': // skip "long double" test - skip_longdouble++; - continue; - - case 'n': // loop count - loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg); - continue; - - case 'O': // stringified objref - { - objref = orb_ptr->string_to_object ( - (CORBA_String)get_opt.optarg, env); - if (env.exception () != 0) { - dexc (env, "string2object"); - return 1; - } - } - continue; - - case 'x': - exit_later++; - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-l]" - " [-n loopcount]" - " [-O objref]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - if (CORBA_is_nil (objref) == CORBA_B_TRUE) { - ACE_OS::fprintf (stderr, "%s: must identify non-null target objref\n", - argv [0]); - return 1; - } - - - do_tests (objref, loop_count, tests, errors); - - char *progname = ACE_OS::strrchr (argv [0], '/'); - - if (progname != 0) - progname += 1; - else - progname = argv [0]; - - ACE_OS::fprintf (stderr, "%s: %d loops, %d tests (%d errors)\n", - progname, loop_count, tests, errors); - - if (exit_later) { - test1_please_exit (objref, env); - if (env.exception () != 0) - print_exception (env.exception (), "test1_please_exit"); - } - - CORBA_release (objref); - - return errors != 0; -} diff --git a/TAO/IIOP/test/test1_svr.cpp b/TAO/IIOP/test/test1_svr.cpp deleted file mode 100644 index 64d548a189a..00000000000 --- a/TAO/IIOP/test/test1_svr.cpp +++ /dev/null @@ -1,672 +0,0 @@ -// $Id$ - -// @(#)test1_svr.cpp 1.7 95/09/25 -// Copyright 1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: simple IIOP server for "test1.idl" interface. -// -// Starts up, builds an objref, prints its string, listens for -// messages, responds to them. -// - -#include <stdio.h> -#include <string.h> -#include <ace/Get_Opt.h> - -#if unix -# include <unistd.h> // for getopt on some systems - -#else // windows - -#endif - -#include "test1.h" -#include <corba/boa.h> -#include <roa.h> - -#include <corba/debug.h> - - - -#if !defined (_WIN32) -extern char *optarg; // missing on some platforms -#endif - -// -// Skeleton code ... just a macro for a bunch of DSI-based method code, -// in lieu of having an IDL compmiler generate static skeletons. Static -// skeletons would be more efficient; most mallocation could go away. -// -// Use by: defining OPERATION macro, call DEFINE_SKEL3 as needed, then -// undef OPERATION. -// -// NOTE: "v1_copy" below is needed to work around a bug with the -// HP9000 G++ 2.6.3 compiler, with "LongLong". -// -// XXX this could probably be a template ... or could even be merged -// directly into the Dynamic Implementation Routine below. -// -// XXX we must currently use IN_COPY_VALUE since the memory consumed -// by the parameters must be deallocated by the ORB. When we get an -// updated version of DSI which provides "send it now" semantics, -// these should preallocate the values and not use IN_COPY_VALUE. A -// net decrease in malloc overhead can be had that way. (NVList should -// also get a public constructor, and a way to provide the buffer.) -// -#define DEFINE_SKEL3(name,truetype,truetypename) \ - static void \ - _test1_test_ ## name ( \ - CORBA_ServerRequest &req, \ - CORBA_Object_ptr obj, \ - CORBA_Environment &env \ - ) \ - { \ - CORBA_NVList_ptr nvlist; \ - CORBA_ ## truetype scratch = 0; \ - CORBA_Any temp_value (_tc_CORBA_ ## truetypename, \ - &scratch, CORBA_B_FALSE); \ - \ - req.orb ()->create_list (3, nvlist); \ - (void) nvlist->add_value (0, temp_value, \ - CORBA_IN_COPY_VALUE|CORBA_ARG_IN, env); \ - (void) nvlist->add_value (0, temp_value, \ - CORBA_IN_COPY_VALUE|CORBA_ARG_OUT, env); \ - (void) nvlist->add_value (0, temp_value, \ - CORBA_IN_COPY_VALUE|CORBA_ARG_INOUT, env); \ - \ - req.params (nvlist, env); \ - if (env.exception () != 0) { \ - dexc (env, "test1_test_" # name "skeleton, req.params"); \ - return; \ - } \ - \ - CORBA_ ## truetype *v1, *v2, *retval; \ - \ - v1 = (CORBA_ ## truetype *) nvlist->item (0)->value ()->value (); \ - v2 = new CORBA_ ## truetype; \ - *v2 = (CORBA_ ## truetype) OPERATION (*v1); \ - retval = new CORBA_ ## truetype; \ - *retval = (CORBA_ ## truetype) OPERATION (*v1); \ - \ - CORBA_Any_ptr any_val; \ - \ - any_val = nvlist->item (1)->value (); \ - any_val->replace (any_val->type (), v2, CORBA_B_TRUE, env); \ - if (env.exception () != 0) { \ - dexc (env, "test1_test_" # name "skeleton, val2 replace"); \ - return; \ - } \ - \ - v1 = (CORBA_ ## truetype *) nvlist->item (2)->value ()->value (); \ - CORBA_ ## truetype v1copy = *v1; \ - *v1 = (CORBA_ ## truetype) OPERATION (v1copy); \ - \ - any_val = new CORBA_Any (_tc_CORBA_ ## truetypename, \ - retval, CORBA_B_TRUE); \ - req.result (any_val, env); \ - if (env.exception () != 0) { \ - dexc (env, "test1_test_" # name "skeleton, result"); \ - return; \ - } \ - } \ - extern TAO_Call_Data test1_ ## name ## _calldata; - - -extern const TAO_Call_Data test1_void_calldata; - -static void -_test1_test_void (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - - req.orb ()->create_list (0, nvlist); - req.params (nvlist, env); - - if (env.exception () != 0) - dexc (env, "test_throw, get params"); -} - - -// -// Dynamic Skeleton methods for numeric types ... these all just -// cube their parameters in various permutations -// -template <class Type> -Type cube (Type arg) -{ - Type temp = arg; - - temp = temp * arg; - temp = temp * arg; - return temp; -} - -#define OPERATION(n) cube(n) - -DEFINE_SKEL3 (octet, Octet, Octet) - -DEFINE_SKEL3 (short, Short, Short) -DEFINE_SKEL3 (ushort, UShort, UShort) - -DEFINE_SKEL3 (long, Long, Long) -DEFINE_SKEL3 (ulong, ULong, ULong) - -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... -DEFINE_SKEL3 (longlong, LongLong, LongLong) -DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong) -#endif // !NONNATIVE_LONGLONG - -DEFINE_SKEL3 (float, Float, Float) -DEFINE_SKEL3 (double, Double, Double) - -#if !defined (NONNATIVE_LONGDOUBLE) - // don't try this on platforms that don't support - // math on long doubles ... -DEFINE_SKEL3 (longdouble, LongDouble, LongDouble) -#endif // !NONNATIVE_LONGDOUBLE - -#undef OPERATION - -// -// Dynamic Skeleton methods for Boolean type ... just negates its -// parameters -// -#define OPERATION(x) (!(x)) -DEFINE_SKEL3 (boolean, Boolean, Boolean) -#undef OPERATION - -// -// For character types, output is same as input, no magic needed. -// -#define OPERATION(x) (x) -DEFINE_SKEL3 (char, Char, Char) -DEFINE_SKEL3 (wchar, WChar, WChar) -#undef OPERATION - -// -// For objref, typecode, output is same as input but duplication -// is needed -// -#define OPERATION(x) ((x) ? (x)->AddRef() : 0, x) -DEFINE_SKEL3 (Object, Object_ptr, Object) -DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode) -#undef OPERATION - -// -// For string, output is copy of input -// -#define OPERATION(x) (CORBA_string_copy(x)) -DEFINE_SKEL3 (string, String, String) -#undef OPERATION - -// -// For wstring, output is copy of input -// -#define OPERATION(x) (CORBA_wstring_copy(x)) -DEFINE_SKEL3 (wstring, WString, WString) -#undef OPERATION - -// -// XXX IMPLEMENT THE REST OF THE DATA TYPES -// -// any, principal -- out is in -// - - -// -// All cases, "case_num" in the exception is the same as the 'in' param -// * negative or zero, throws x1 -// * positive even cases, throws x2 with obj = null objref -// * positive odd cases, throws x2 with obj = target objref -// -// exception x1 { long case_num; }; -// exception x2 { Object obj; long case_num; }; -// -// void test_throw (in long case_num) raises (x1, x2); -// - -extern const TAO_Call_Data test1_test_throw_calldata; - -static void -_test1_test_throw (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (_tc_CORBA_Long); - CORBA_Long value; - - 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, "test_throw, get params"); - return; - } - - value = *(CORBA_Long *)nv->value ()->value (); - if (env.exception () != 0) - { - dexc (env, "test_throw, param value"); - return; - } - - CORBA_Any_ptr any; - - if (value <= 0) - { - test1_x1 *x; - - x = new test1_x1 (value); - any = new CORBA_Any (_tc_test1_x1, x, CORBA_B_TRUE); - - } - else if (value & 0x01) - { - test1_x2 *x; - - x = new test1_x2 (CORBA_Object::_nil (), value); - any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE); - - } - else - { -#if 0 - test1_x2 *x; - - x = new test1_x2 (req.oa()->target (), value); - any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE); -#else - // - // XXX right now, we don't have a target() operation on the - // BOA ... needs to be added. Verify the client side memory - // leak of pointers embedded in user exceptions is fixed, too. - // - env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO)); - return; -#endif - } - - req.exception (USER_EXCEPTION, any, env); -} - - -// -// This table is used to associate operation names with the Dynamic -// Skeleton method ... someday it could return static skeletons. -// -#define DECL_SKEL(name) \ - { & test1_ ## name ## _calldata, _test1_test_ ## name } - -static const TAO_Skel_Entry test1_operations [] = { - DECL_SKEL (void), - - DECL_SKEL (octet), - DECL_SKEL (char), - - DECL_SKEL (wchar), - - DECL_SKEL (short), - DECL_SKEL (ushort), - DECL_SKEL (long), - DECL_SKEL (ulong), - -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... - DECL_SKEL (longlong), - DECL_SKEL (ulonglong), -#endif - - DECL_SKEL (float), - DECL_SKEL (double), - -#if !defined (NONNATIVE_LONGDOUBLE) - // don't try this on platforms that don't support - // math on long doubles ... - DECL_SKEL (longdouble), -#endif // !NONNATIVE_LONGDOUBLE - - DECL_SKEL (boolean), - - DECL_SKEL (Object), - DECL_SKEL (TypeCode), - - DECL_SKEL (string), - DECL_SKEL (wstring), - - { & test1_test_throw_calldata, _test1_test_throw }, - - { 0, 0 } -}; - - -// -// Dispatch to method code ... -// -// Knows how to interpret "context" to get target objref, and where to -// get second level skeletons for that target. Both of those operations -// will generally be abstracted (into library and stub code) so the main -// body of this routine would be invisible to most applications. -// -// However, there are applications that need to do this stuff themselves -// (like bridging between environments, e.g. different ORBs, languages, or -// other object systems). Everything needed to work without using an IDL -// compiler is a public, supported API. -// -static void -level1_skeleton ( - CORBA_OctetSeq &key, - CORBA_ServerRequest &req, - void *context, - CORBA_Environment &env -) -{ - // - // Verify that the target object and "this" object have the - // same key. Normally, this would be used to figure out - // which object was the target, and hence which operations - // vector to dispatch the request. - // - CORBA_OctetSeq *obj_key; - - obj_key = (CORBA_OctetSeq *) context; - if (obj_key->length != key.length - || ACE_OS::memcmp (obj_key->buffer, key.buffer, - obj_key->length) != 0) - { - env.exception (new CORBA_OBJECT_NOT_EXIST (COMPLETED_NO)); -#ifdef DEBUG - if (TAO_debug_level) - dmsg_opaque ("request to nonexistent object, key = ", - key.buffer, key.length); -#endif - return; - } - - // - // Find a "level 2 skeleton" for this operation, then - // call it with the right per-object state. - // - const TAO_Skel_Entry *entry; - CORBA_String opname; - - opname = req.op_name (); - for (entry = &test1_operations [0]; entry->op_descriptor; entry++) - { - if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0) - { - // We pass a bogus object because this version of the cubit example is - // so tightly coupled that it doesn't use it. Future modifications will, - // hopefully! - CORBA_Object_ptr bogus_object = 0; - entry->impl_skeleton (req, bogus_object, env); - return; - } - } - - // - // XXX True top-level skeleton code would also have to understand - // the built-in operations: - // - // * _is_a (for narrowing tests) ... can be derived by searching an - // appropriately structured graph of level2 skeletons. - // - // * _non_existent ... if the level1 skeleton consults a module - // which understands object lifespans, this should be simple. - // - // * _get_interface ... could either (a) fail; (b) return the ref - // from some IFR; or most interestingly (c) return a ref to some - // code in this process that can answer all IFR queries from the - // skeleton data structures. - // - // * _get_implementation ... return some administrative hook to - // the object implementation: - // - // No other legal operations start with a character that's not an - // ASCII alphanumeric, for what it's worth. - // - // The skeleton might want to use data in the object key to find - // the objref's type; if it's integrated with object creation, and - // an per-process implementation repository, this should be easy. - // - - // - // bypass level 2 skeletons for this one ... - // - if (strcmp ((char *) opname, "please_exit") == 0) - { - dmsg ("I've been asked to shut down..."); - req.oa ()->please_shutdown (env); - dexc (env, "please_exit, please_shutdown"); - return; - } - - // - // No match. Operation not implemented; say so. - // - dmsg1 ("unknown operation, %s", opname); - env.exception (new CORBA_BAD_OPERATION (COMPLETED_NO)); -} - - -// -// Create and print the objref, listen for calls on it until done. -// -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - -int -OA_listen (CORBA_ORB_ptr orb_ptr, - CORBA_BOA_ptr oa_ptr, - CORBA_String key, - int idle) -{ - // - // Create the object we'll be implementing. - // - CORBA_OctetSeq obj_key; - CORBA_Object_ptr obj; - CORBA_Environment env; - - obj_key.buffer = (CORBA_Octet *) key; - obj_key.length = obj_key.maximum = ACE_OS::strlen (key); - - obj = oa_ptr->create (obj_key, (CORBA_String) "", env); - if (env.exception () != 0) - { - print_exception (env.exception (), "BOA::create"); - return 1; - } - - // - // Stringify the objref we'll be implementing, and - // print it to stdout. Someone will take that string - // and give it to some client. - // - CORBA_String str; - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) - { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("listening as object '%s'", str); - - // - // Clean up -- "key" is sufficient to dispatch all requests. - // - CORBA_release (obj); - CORBA_string_free (str); - env.clear (); - - // - // Handle requests for this object until we're killed, or one of - // the methods makes us exit. - // - // NOTE: apart from registering the top level skeleton, the rest - // of this loop is exactly what BOA::run() does. It's here to - // show there's no magic. - // -#if 0 - oa_ptr->register_dir (level1_skeleton, &obj_key, env); -#else - oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env); -#endif - if (env.exception () != 0) - { - print_exception (env.exception (), "register_dir"); - return 1; - } - - for (;;) { - if (idle == -1) - oa_ptr->get_request (CORBA_B_FALSE, 0, env); - else - { - timeval tv; - - tv.tv_sec = idle; - tv.tv_usec = 0; - oa_ptr->get_request (CORBA_B_FALSE, &tv, env); - } - - CORBA_Exception_ptr xp; - - if ((xp = env.exception ()) != 0) - { - CORBA_Environment env2; // XXX - char *id; - - id = env.exception ()->id (); - - // - // We get BAD_INV_ORDER if we call get_request() after - // shutdown was initiated. Simpler to rely on that - // than to arrange any handshaking in this simple app. - // - if (strcmp (id, _tc_CORBA_BAD_INV_ORDER->id (env2)) == 0) - { - break; - - // - // Other exceptions are errors. - // - } - else - { - print_exception (env.exception (), "BOA::get_request"); - return 1; - } - } - env.clear (); - } - - // - // Shut down the OA -- recycles all underlying resources (e.g. file - // descriptors, etc). - // - // XXX shutdown is not quite the same as release, unless we want mem - // leaks to cause some rude failure modes. BOA just hasn't been - // updated yet to have any handshake about this though. - // - oa_ptr->Release (); - return 0; -} - - -// -// Standard command line parsing utilities used. -// -int -main (int argc, char *argv[]) -{ - CORBA_Environment env; - CORBA_ORB_ptr orb_ptr; - CORBA_BOA_ptr oa_ptr; - CORBA_String key = (CORBA_String) "elvis"; - char *oa_name = 0; - char *orb_name = "internet"; - int idle = -1; - - // - // Parse the command line, get options - // - ACE_Get_Opt get_opt (argc, argv, "dln:O:x"); - int c; - - while ((c = get_opt ()) != -1) - switch (c) - { - case 'd': // more debug noise - TAO_debug_level++; - continue; - - case 'i': // idle seconds b4 exit - idle = ACE_OS::atoi (get_opt.optarg); - continue; - - case 'k': // key (str) - key = (CORBA_String) get_opt.optarg; - continue; - - case 'o': // orb name - orb_name = get_opt.optarg; - continue; - - case 'p': // portnum - oa_name = get_opt.optarg; - continue; - - // XXX set debug filters ... - - // - // XXX ignore OMG-specified options ... hope nobody ever tries - // to use that "-ORB* param" and "-OA* param" syntax, it flies - // in the face of standard command parsing algorithms which - // require single-character option specifiers. - // - - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-i idle_seconds]" - " [-k object_key=elvis]" - " [-o orbname=internet]" - " [-p oa_name]" - "\n", argv [0] - ); - return 1; - } - - orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env); - if (env.exception () != 0) { - print_exception (env.exception (), "ORB init"); - return 1; - } - - // - // The BOA may or may not actually be named ... - // - oa_ptr = CORBA_BOA::get_named_boa (orb_ptr, oa_name, env); - if (env.exception () != 0) { - print_exception (env.exception (), "OA init"); - return 1; - } - - return OA_listen (orb_ptr, oa_ptr, key, idle); -} - diff --git a/TAO/IIOP/test/tnf/Orbix.svr.summary b/TAO/IIOP/test/tnf/Orbix.svr.summary deleted file mode 100644 index 1c01995f7d5..00000000000 --- a/TAO/IIOP/test/tnf/Orbix.svr.summary +++ /dev/null @@ -1,32 +0,0 @@ - Profile for 10000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.04 8.505 3386 0.003 0.349 0.002 0.000 -mutex_unlock 0.04 8.205 3386 0.002 0.127 0.002 0.000 - - - Profile for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.01 8.875 3386 0.003 0.373 0.002 0.000 -mutex_unlock 0.01 8.353 3386 0.002 0.093 0.002 0.000 - - Profile for 30000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.02 8.979 3386 0.003 0.386 0.002 0.000 -mutex_unlock 0.02 8.465 3386 0.002 0.030 0.002 0.000 - - Profile for 40000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.01 8.849 3388 0.003 0.355 0.002 0.000 -mutex_unlock 0.01 7.937 3388 0.002 0.029 0.002 0.000 diff --git a/TAO/IIOP/test/tnf/clnt.summary b/TAO/IIOP/test/tnf/clnt.summary deleted file mode 100644 index bed4a22d35e..00000000000 --- a/TAO/IIOP/test/tnf/clnt.summary +++ /dev/null @@ -1,43 +0,0 @@ - Profile for 10000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -rw_rdlock 0.28 53.642 10006 0.005 0.192 0.004 0.000 -rw_unlock 0.28 52.672 10009 0.005 0.037 0.005 0.000 -mutex_lock 0.06 11.366 2765 0.004 0.161 0.002 0.000 -mutex_unlock 0.04 6.996 2771 0.003 0.028 0.002 0.000 -rw_wrlock 0.00 0.047 3 0.016 0.034 0.006 0.007 - - Profile for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -rw_rdlock 0.40 146.579 20006 0.007 1.200 0.005 0.000 -rw_unlock 0.25 91.386 20009 0.005 0.058 0.004 0.000 -mutex_lock 0.06 21.087 5265 0.004 0.178 0.002 0.000 -mutex_unlock 0.04 14.372 5271 0.003 0.075 0.002 0.000 -rw_wrlock 0.00 0.045 3 0.015 0.034 0.005 0.008 - - Profile for 30000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -rw_rdlock 0.41 241.807 30006 0.008 1.181 0.005 0.000 -rw_unlock 0.24 141.506 30009 0.005 0.503 0.004 0.000 -mutex_lock 0.07 38.545 7765 0.005 0.171 0.002 0.000 -mutex_unlock 0.03 19.591 7771 0.003 0.078 0.002 0.000 -rw_wrlock 0.00 0.045 3 0.015 0.033 0.005 0.007 - - Profile for 40000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -rw_rdlock 0.39 307.763 40006 0.008 2.031 0.005 0.000 -rw_unlock 0.23 184.537 40009 0.005 0.138 0.004 0.000 -mutex_lock 0.05 38.808 10265 0.004 0.173 0.002 0.000 -mutex_unlock 0.03 25.931 10271 0.003 0.078 0.002 0.000 -rw_wrlock 0.00 0.043 3 0.014 0.033 0.004 0.008 diff --git a/TAO/IIOP/test/tnf/svr.summary b/TAO/IIOP/test/tnf/svr.summary deleted file mode 100644 index 6e1c024aacd..00000000000 --- a/TAO/IIOP/test/tnf/svr.summary +++ /dev/null @@ -1,49 +0,0 @@ - Profile for 10000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_unlock 1.18 191.077 54588 0.004 1.158 0.003 0.000 -mutex_lock 1.18 190.652 54587 0.003 0.198 0.003 0.000 -rw_rdlock 0.29 46.844 6823 0.007 0.173 0.004 0.000 -rw_unlock 0.18 28.419 6823 0.004 0.064 0.004 0.000 - - Profile for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 1.12 154.491 54507 0.003 0.140 0.002 0.000 -mutex_unlock 1.06 145.638 54508 0.003 0.310 0.002 0.000 -rw_rdlock 0.27 37.265 6813 0.005 0.037 0.004 0.000 -rw_unlock 0.20 27.792 6813 0.004 0.045 0.004 0.000 - - Profile for 30000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 1.19 150.344 54654 0.003 0.621 0.002 0.000 -mutex_unlock 1.15 144.776 54655 0.003 0.071 0.002 0.000 -rw_rdlock 0.27 33.772 6832 0.005 0.078 0.004 0.000 -rw_unlock 0.19 23.613 6832 0.003 0.105 0.003 0.000 - - Profile for 40000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_unlock 1.48 209.259 54770 0.004 18.223 0.002 0.000 -mutex_lock 1.46 206.619 54769 0.004 10.473 0.002 0.000 -rw_rdlock 0.78 110.047 6846 0.016 38.115 0.003 0.006 -rw_unlock 0.17 23.844 6846 0.003 0.112 0.003 0.000 - - Profile for 50000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_unlock 1.19 150.149 54477 0.003 0.152 0.002 0.000 -mutex_lock 1.18 149.113 54477 0.003 1.376 0.002 0.000 -rw_rdlock 0.34 43.048 6809 0.006 10.113 0.003 0.001 -rw_unlock 0.19 23.796 6810 0.003 0.326 0.003 0.000 diff --git a/TAO/IIOP/tests/Cubit/Build/clnt.bld b/TAO/IIOP/tests/Cubit/Build/clnt.bld deleted file mode 100755 index 76e60ef8967..00000000000 --- a/TAO/IIOP/tests/Cubit/Build/clnt.bld +++ /dev/null @@ -1,8 +0,0 @@ -#!build -default: - program - :debuglevel=multi -../cubit.cpp - C++ -../clnt.cpp - C++ diff --git a/TAO/IIOP/tests/Cubit/Build/default.bld b/TAO/IIOP/tests/Cubit/Build/default.bld deleted file mode 100755 index cdf3e2e8210..00000000000 --- a/TAO/IIOP/tests/Cubit/Build/default.bld +++ /dev/null @@ -1,19 +0,0 @@ -#!build -default: - nobuild - :debuglevel=multi - :target=vxwppc - :sourcedirs=/home/ace/ACE_wrappers.vxworks - :sourcedirs=../../proto/include - :sourcedirs=../.. - :libraries=../../proto/lib/tao.a - :libraries=/home/ace/ACE_wrappers.vxworks/ace/libACE.a - :libraries=/appl/newgreen/vxppc603/indlib.o - :defines=DEBUG -clnt.bld - program - :debuglevel=multi -svr.bld - program - :debuglevel=multi - :defines=USE_ACE_EVENT_HANDLING diff --git a/TAO/IIOP/tests/Cubit/Build/svr.bld b/TAO/IIOP/tests/Cubit/Build/svr.bld deleted file mode 100755 index 7c8725356b2..00000000000 --- a/TAO/IIOP/tests/Cubit/Build/svr.bld +++ /dev/null @@ -1,8 +0,0 @@ -#!build -default: - program - :debuglevel=multi -../svr.cpp - C++ -../cubit.cpp - C++ diff --git a/TAO/IIOP/tests/Cubit/Orbix/Makefile b/TAO/IIOP/tests/Cubit/Orbix/Makefile deleted file mode 100644 index 96935fb78fc..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the Gateway application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = README - -DIRS = base_server \ - client \ - tpr \ - tpool \ - tps - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile b/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile deleted file mode 100644 index 3bf0684dfd5..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h deleted file mode 100644 index 584efa67c8d..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h +++ /dev/null @@ -1,345 +0,0 @@ -// $Id$ - -#ifndef _cubitC_h -#define _cubitC_h - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -#include "corba.h" - - - -class Cubit; -typedef Cubit *Cubit_ptr; -typedef Cubit_ptr CubitRef; - -#ifndef _Cubit_var_ -#define _Cubit_var_ -class Cubit_var -{ - public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } -#if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } -#else - operator Cubit_ptr&() { return _ptr; } -#endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); - private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} -}; -#endif -class Cubit: public virtual CORBA_Object -{ - private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} - public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); - protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} - public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); - -#if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); -#else - return _narrow(obj_var); -#endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } -}; - - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp deleted file mode 100644 index d72803fed0c..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp +++ /dev/null @@ -1,228 +0,0 @@ -// $Id$ - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h deleted file mode 100644 index 3ca717e2b49..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h +++ /dev/null @@ -1,120 +0,0 @@ -// $Id$ - -#ifndef _cubitS_h -#define _cubitS_h - -#include "cubitC.h" - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -class _sk_Cubit : public Cubit -{ - protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} - public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - -}; -template <class T> -class _tie_Cubit : public Cubit -{ - public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } - - private: - T& _ref; -}; - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp deleted file mode 100644 index e96b6e33dcd..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) { -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h deleted file mode 100644 index 033aa7f0cb1..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp deleted file mode 100644 index 527fa13d76e..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#define IT_EX_MACROS - -#include "cubit_impl.h" // server header file - -int -main (int , char**) -{ - -#ifdef Cubit_USE_BOA - Cubit_var cb = new Cubit_Impl; - cout << "Using BOA approach" << endl; -#else - Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl); - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // - // Go get some work to do.... - // - IT_TRY { - CORBA::Orbix.impl_is_ready("Cubit", IT_X); - } - IT_CATCHANY { - cout << IT_X << endl; - } - IT_ENDTRY; - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp deleted file mode 100644 index da78690cc2c..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -#include "tpr.h" - -void * -worker(void *vp) -{ - ACE_Thread_Control tc (ACE_Thread_Manager::instance ()); - CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp); - return NULL; -} - - -int -tpr_filter::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment&) -{ -// thread_t tid; -// thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid); - - ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance (); - thr_mgr->spawn (ACE_THR_FUNC (worker), - (void *) &r, - THR_DETACHED); - - return -1; -} - -tpr_filter tpr_dispatcher; diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h deleted file mode 100644 index b5e8be94cf1..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" - -// -// Create a thread filter to dispatch incoming calls -// -class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); -}; diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/client/Makefile deleted file mode 100644 index 73f775bee2f..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitC.cpp client.cpp - -CLT_OBJS = cubitC.o client.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: client - -client: $(addprefix $(VDIR),$(CLT_OBJS)) - $(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK) - - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i cubit.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp b/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp deleted file mode 100644 index f199078b601..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp +++ /dev/null @@ -1,234 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : client.C -// DESCRIPTION: -// -// Client for the Cubit example -// -//**************************************************************************** - -#include "ace/OS.h" -#include "ace/Get_Opt.h" -#include "cubit.h" - -int LOOP_COUNT; -char SERVER_HOST [1024]; - -inline int func (unsigned i) { return i - 117; } -void run_tests (Cubit_var, int); - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_OS::strcpy (SERVER_HOST, "localhost"); - ACE_Get_Opt opts (argc, argv, "dh:n:O:x"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - case 'h': - ACE_OS::strcpy (SERVER_HOST, opts.optarg); - continue; - case 'd': // debug flag - continue; - - case 'n': // loop count - LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg); - continue; - - case 'O': // stringified objref - continue; - - case 'x': - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-n loopcount]" - " [-h SERVER_HOST]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - - -// -// Mainline -// -int -main (int argc, char *argv[]) -{ - if (parse_args (argc, argv) != 0) - return -1; - - Cubit_var cb; - // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ; - - // - // Initialise client's binding to an - // arbitrary cubit server (at some host) - // - TRY { - cb = Cubit::_bind ("", SERVER_HOST, IT_X); - } - CATCHANY { - cerr << "Binding failed: " << IT_X; - } - ENDTRY; - - run_tests (cb, LOOP_COUNT); - return 0; -} - - -void -run_tests (Cubit_var cb, int loop_count) -{ - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - ACE_Time_Value before, after; - - before = ACE_OS::gettimeofday(); - - // - // Cube an octet. - // - - for (i = 0; i < loop_count; i++) - { - - call_count++; - - CORBA::Octet arg_octet = func (i), ret_octet; - - TRY { - ret_octet = cb->cube_octet (arg_octet); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - ACE_OS::printf ("** cube_octet(%d) (--> %d)\n", arg_octet , ret_octet); - error_count++; - } - - - // - // Cube a short. - // - call_count++; - - CORBA::Short arg_short = func (i), ret_short; - - TRY { - ret_short = cb->cube_short (arg_short); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) { - ACE_OS::printf ("** cube_short(%d) (--> %d)\n", arg_short , ret_short); - error_count++; - } - - // - // Cube a long. - // - - call_count++; - - CORBA::Long arg_long = func (i), ret_long; - - TRY { - ret_long = cb->cube_long (arg_long); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - } - ENDTRY; - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - ACE_OS::printf ("** cube_long(%d) (--> %d)\n", arg_long , ret_long); - error_count++; - } - - - // - // Cube a "struct" ... - // - Cubit::Many arg_struct, ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - TRY { - ret_struct = cb->cube_struct (arg_struct); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l ; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s ; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o ; - - if (arg_struct.l != ret_struct.l - || arg_struct.s != ret_struct.s - || arg_struct.o != ret_struct.o ) - { - cerr << "** cube_struct ERROR\n"; - error_count++; - } - } - - - after = ACE_OS::gettimeofday(); - - if (call_count > 0) - { - if (error_count == 0) - { - ACE_Time_Value diff = after - before; - unsigned long us = diff.sec() * 1000 * 1000 + diff.usec(); - - us /= call_count; - - if (us > 0) - ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count); - } -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile deleted file mode 100644 index 63cc8a65e02..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitC.cpp client.cpp - -CLT_OBJS = cubitC.o client.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: client - -client: $(addprefix $(VDIR),$(CLT_OBJS)) - $(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK) - - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h -.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i cubit.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp deleted file mode 100644 index 1afdecbadf4..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp +++ /dev/null @@ -1,237 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : client.C -// DESCRIPTION: -// -// Client for the Cubit example -// -//**************************************************************************** - -#include "ace/OS.h" -#include "ace/Get_Opt.h" -#include "cubit.h" - -int LOOP_COUNT; -char SERVER_HOST [1024]; - -inline int func (unsigned i) { return i - 117; } -void run_tests (Cubit_var, int); - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_OS::strcpy (SERVER_HOST, "localhost"); - ACE_Get_Opt opts (argc, argv, "dh:n:O:x"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - case 'h': - ACE_OS::strcpy (SERVER_HOST, opts.optarg); - continue; - case 'd': // debug flag - continue; - - case 'n': // loop count - LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg); - continue; - - case 'O': // stringified objref - continue; - - case 'x': - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-n loopcount]" - " [-h SERVER_HOST]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - - -// -// Mainline -// -int -main (int argc, char *argv[]) -{ - if (parse_args (argc, argv) != 0) - return -1; - - Cubit_var cb; - Cubit_Factory_var cf; - - // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ; - - // - // Initialise client's binding to an - // arbitrary cubit server (at some host) - // - TRY { - cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X); - } - CATCHANY { - cerr << "Binding failed: " << IT_X; - } - ENDTRY; - cb = cf->create_cubit ("My_Cubit"); - - run_tests (cb, LOOP_COUNT); - return 0; -} - - -void -run_tests (Cubit_var cb, int loop_count) -{ - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - ACE_Time_Value before, after; - - before = ACE_OS::gettimeofday(); - - // - // Cube an octet. - // - - for (i = 0; i < loop_count; i++) - { - - call_count++; - - CORBA::Octet arg_octet = func (i), ret_octet; - - TRY { - ret_octet = cb->cube_octet (arg_octet); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - ACE_OS::printf ("** cube_octet(%d) (--> %d)\n", arg_octet , ret_octet); - error_count++; - } - - - // - // Cube a short. - // - call_count++; - - CORBA::Short arg_short = func (i), ret_short; - - TRY { - ret_short = cb->cube_short (arg_short); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) { - ACE_OS::printf ("** cube_short(%d) (--> %d)\n", arg_short , ret_short); - error_count++; - } - - // - // Cube a long. - // - - call_count++; - - CORBA::Long arg_long = func (i), ret_long; - - TRY { - ret_long = cb->cube_long (arg_long); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - } - ENDTRY; - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - ACE_OS::printf ("** cube_long(%d) (--> %d)\n", arg_long , ret_long); - error_count++; - } - - - // - // Cube a "struct" ... - // - Cubit::Many arg_struct, ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - TRY { - ret_struct = cb->cube_struct (arg_struct); - } - CATCHANY { - cerr << "Call failed: " << IT_X; - error_count++; - } - ENDTRY; - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l ; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s ; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o ; - - if (arg_struct.l != ret_struct.l - || arg_struct.s != ret_struct.s - || arg_struct.o != ret_struct.o ) - { - cerr << "** cube_struct ERROR\n"; - error_count++; - } - } - - - after = ACE_OS::gettimeofday(); - - if (call_count > 0) - { - if (error_count == 0) - { - ACE_Time_Value diff = after - before; - unsigned long us = diff.sec() * 1000 * 1000 + diff.usec(); - - us /= call_count; - - if (us > 0) - ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count); - } -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h deleted file mode 100644 index 3a2dd546608..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h +++ /dev/null @@ -1,1113 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include <CORBA.h> - -#include <string.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#ifndef _Cubit_Factory_defined -#define _Cubit_Factory_defined -class Cubit_Factory_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_Factory_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) {} - - - Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_dispatch () {} - - Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_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 Cubit_Factory; - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - - -#ifndef Cubit_FactoryForwH -#define Cubit_FactoryForwH -CORBA::ObjectRef Cubit_Factory_getBase (void *); -void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env); -void Cubit_Factory_release (Cubit_Factory_ptr); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr ); -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env); -Cubit_Factory_ptr Cubit_Factory_nil (); -#endif -#define Cubit_Factory_IMPL "Cubit_Factory" - - -class Cubit_Factory; - -typedef Cubit_Factory Cubit_FactoryProxy; -#define Cubit_Factory_IR "Cubit_Factory" -#define Cubit_Factory_IMPL "Cubit_Factory" - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - -class Cubit_Factory: public virtual CORBA::Object { -public: - Cubit_Factory (char *IT_OR); - Cubit_Factory (ObjectReference *IT_OR); - Cubit_Factory () : CORBA::Object (1) {} -protected: - Cubit_Factory_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _bind (CORBA::Environment &IT_env); - static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;} - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef Cubit_FactoryVarH -#define Cubit_FactoryVarH - -#ifndef Cubit_FactoryvPtr -#define Cubit_FactoryvPtr -typedef Cubit_Factory* Cubit_Factory_vPtr; -typedef const Cubit_Factory* Cubit_Factory_cvPtr; -#endif - -class Cubit_Factory_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_Factory_var &IT_s) { - { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_Factory_var (const Cubit_Factory_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_Factory_var () { - _ptr = Cubit_Factory_nil (); - } - - Cubit_Factory_var (Cubit_Factory *IT_p) { - _ptr = IT_p; - } - - Cubit_Factory_var &operator= (Cubit_Factory *IT_p) { - Cubit_Factory_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) { - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_Factory_var () { - Cubit_Factory_release (_ptr); - } - - Cubit_Factory* operator-> () { - return _ptr; - } - - operator Cubit_Factory_cvPtr () const { return _ptr;} - operator Cubit_Factory_vPtr& () { return _ptr;} - - protected: - Cubit_Factory *_ptr; - private: - Cubit_Factory_var &operator= (const CORBA::_var &IT_s); - Cubit_Factory_var (const CORBA::_var &IT_s); - Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s); - Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_Factory_var (const CORBA::_mgr &IT_s); - Cubit_Factory_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef Cubit_FactoryMgrH -#define Cubit_FactoryMgrH - -class Cubit_Factory_mgr : public CORBA::_mgr -{ - public: - - Cubit_Factory_mgr () { - _ptr = Cubit_Factory_nil (); - _release = 1; - } - - Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_Factory_mgr () { - if (_release) - Cubit_Factory_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 Cubit_Factory* () const { - return (Cubit_Factory*) _ptr; - } - - Cubit_Factory_ptr operator-> () const { - return _ptr; - } - - Cubit_Factory *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const; -#endif - -#ifndef Cubit_FactorySeqElemH -#define Cubit_FactorySeqElemH - -class Cubit_Factory_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); - } - - Cubit_Factory_ptr operator->() const { return *_ptr;} - - protected: - Cubit_Factory_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit_Factory(X) Cubit_Factory##X - -#define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit_Factory \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - - - - -class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_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 Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory; - -class Cubit_FactoryBOAImpl : public virtual Cubit_Factory { -public: - Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) - m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); -} - - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh deleted file mode 100644 index 72e2fb81395..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh +++ /dev/null @@ -1,1111 +0,0 @@ - -#ifndef cubit_hh -#define cubit_hh - -#include <CORBA.h> - -#include <string.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#ifndef _Cubit_Factory_defined -#define _Cubit_Factory_defined -class Cubit_Factory_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_Factory_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) {} - - - Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_dispatch () {} - - Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_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 Cubit_Factory; - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - - -#ifndef Cubit_FactoryForwH -#define Cubit_FactoryForwH -CORBA::ObjectRef Cubit_Factory_getBase (void *); -void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env); -void Cubit_Factory_release (Cubit_Factory_ptr); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr ); -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env); -Cubit_Factory_ptr Cubit_Factory_nil (); -#endif -#define Cubit_Factory_IMPL "Cubit_Factory" - - -class Cubit_Factory; - -typedef Cubit_Factory Cubit_FactoryProxy; -#define Cubit_Factory_IR "Cubit_Factory" -#define Cubit_Factory_IMPL "Cubit_Factory" - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - -class Cubit_Factory: public virtual CORBA::Object { -public: - Cubit_Factory (char *IT_OR); - Cubit_Factory (ObjectReference *IT_OR); - Cubit_Factory () : CORBA::Object (1) {} -protected: - Cubit_Factory_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _bind (CORBA::Environment &IT_env); - static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;} - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef Cubit_FactoryVarH -#define Cubit_FactoryVarH - -#ifndef Cubit_FactoryvPtr -#define Cubit_FactoryvPtr -typedef Cubit_Factory* Cubit_Factory_vPtr; -typedef const Cubit_Factory* Cubit_Factory_cvPtr; -#endif - -class Cubit_Factory_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_Factory_var &IT_s) { - { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_Factory_var (const Cubit_Factory_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_Factory_var () { - _ptr = Cubit_Factory_nil (); - } - - Cubit_Factory_var (Cubit_Factory *IT_p) { - _ptr = IT_p; - } - - Cubit_Factory_var &operator= (Cubit_Factory *IT_p) { - Cubit_Factory_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) { - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_Factory_var () { - Cubit_Factory_release (_ptr); - } - - Cubit_Factory* operator-> () { - return _ptr; - } - - operator Cubit_Factory_cvPtr () const { return _ptr;} - operator Cubit_Factory_vPtr& () { return _ptr;} - - protected: - Cubit_Factory *_ptr; - private: - Cubit_Factory_var &operator= (const CORBA::_var &IT_s); - Cubit_Factory_var (const CORBA::_var &IT_s); - Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s); - Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_Factory_var (const CORBA::_mgr &IT_s); - Cubit_Factory_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef Cubit_FactoryMgrH -#define Cubit_FactoryMgrH - -class Cubit_Factory_mgr : public CORBA::_mgr -{ - public: - - Cubit_Factory_mgr () { - _ptr = Cubit_Factory_nil (); - _release = 1; - } - - Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_Factory_mgr () { - if (_release) - Cubit_Factory_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 Cubit_Factory* () const { - return (Cubit_Factory*) _ptr; - } - - Cubit_Factory_ptr operator-> () const { - return _ptr; - } - - Cubit_Factory *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const; -#endif - -#ifndef Cubit_FactorySeqElemH -#define Cubit_FactorySeqElemH - -class Cubit_Factory_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); - } - - Cubit_Factory_ptr operator->() const { return *_ptr;} - - protected: - Cubit_Factory_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit_Factory(X) Cubit_Factory##X - -#define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit_Factory \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - - - - -class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_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 Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory; - -class Cubit_FactoryBOAImpl : public virtual Cubit_Factory { -public: - Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) - m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); -} - - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl deleted file mode 100644 index 41309e997ea..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - - interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); - }; - - - interface Cubit_Factory { - Cubit create_cubit (in string name); - }; - diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp deleted file mode 100644 index d19c387bcd2..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp +++ /dev/null @@ -1,712 +0,0 @@ -// $Id$ - - - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - -Cubit_Factory::Cubit_Factory (char *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef Cubit_FactoryForwC -#define Cubit_FactoryForwC -CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){ - return (Cubit_Factory*) IT_p;} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p) { - Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) { - return Cubit_Factory:: _nil ();} - -Cubit_Factory_ptr Cubit_Factory_nil () { - return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit_Factory::_duplicate(IT_p, IT_env)); } -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) { - return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_Factory_IMPL, Cubit_Factory_IR); -} - - - -Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit_Factory:: _nil(); - } - - Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - -void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New2 () { - return new class Cubit_Factory((char*)0);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () { - return new class Cubit_Factory((char*)0);} - -void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit_Factory*)IT_p)->_pptr ();} - -void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_Factory_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1); - -Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return new Cubit; - } - CORBA::Request IT_r (this, "create_cubit",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.encodeStringOp (name); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit_ptr IT_result; - IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return new Cubit; -} - - - - - -#ifndef Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit_Factory"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp deleted file mode 100644 index 56cf33174a6..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp +++ /dev/null @@ -1,284 +0,0 @@ -// $Id$ - - - -#include "cubit.hh" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#define Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"create_cubit")) { - Cubit_ptr IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~create_cubit~+name{0},>{O~Cubit},N{}\ -")) - return 1; - char * name; - - IT_r.decodeStringOp(name); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit_Factory*)IT_pp)->create_cubit ( name, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - CORBA::string_free (name); - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -O~Cubit\ -", IT_env)) return 1; - { - CORBA::Object* IT_l1 = (CORBA::Object*) IT_result; - IT_r << IT_l1; - } - if (IT_result) Cubit_release (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/tests/Cubit/Orbix/orb.mk b/TAO/IIOP/tests/Cubit/Orbix/orb.mk deleted file mode 100644 index cf7b12d3b1b..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/orb.mk +++ /dev/null @@ -1,146 +0,0 @@ -# ------------------------------------------------------------ -# Orbix 2.2 implicit rules for SunOS/GNU Make -# ------------------------------------------------------------ -# -# If you cut'n'paste this into your /usr/include/make/default.mk -# file, beware! This is not officially supported by Iona -# Technologies, and you may want to be a bit of a Makefile hacker -# to make it integrate well with your site's setup. - -# The best thing to do would be put it in a standard place and -# anyone who wants the Orbix implicit rule set can include -# it with an "include <pathname>/orbix.mk" line in their -# Makefile. A good place to put it might be /usr/include/make. - -# These rules define default C++, C++FLAGS and C++SUFFIX. -# C++ is the C++ compiler to use; C++FLAGS are command-line -# flags to the C++ compiler for use in compiling C++ source -# files into objects; C++SUFFIX is the filename suffix -# indicating C++ source. By default, it's set to "C" for AT&T C++, -# and "cc" for GNU g++. - -# Feel free to override these in your Makefiles *after* -# including this file. - -# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL -# compiler appends to the user-specified file. The dependency for -# specified_file.o in the linking target should appear _after_ any use -# of the IDL compiler which takes the -M flag. Putting it _last_ -# is normally the best approach. - -# Note that these rule definitions use pattern matching, -# and therefore only work with SunOS make and GNU make. - -# They may not work with other vendor's versions of make. -# If they do not, you may wish to try using GNU make, which -# is free software produced by the Free Software Foundation. - -# If the version of make you wish to use does not support -# pattern matching, use the sample explicit rule set in -# the comments at the end of this file. - -# ------------------------------------------------------------ -# Essential: set these to the locations into which you -# have installed Orbix' components: - -ORBIX_BINDIR = /opt/Orbix_2.2MT/corba2/bin -ORBIX_LIBDIR = /opt/Orbix_2.2MT/corba2/lib -ORBIX_INCDIR = /opt/Orbix_2.2MT/corba2/include - -#------------------------------------------------------------- -# To compile the demos, you should change these values as -# appropriate for your particular system installation -#------------------------------------------------------------- - -X11BASE = /usr/openwin -X11INCDIR = $(X11BASE)/include -X11LIBDIR = $(X11BASE)/lib - -# C++ = CC -# C++FLAGS = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT -# C++SUFFIX = cpp - -# ------------------------------------------------------------ -# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked -# Use -Bdynamic or -Bstatic as appropriate. -# ------------------------------------------------------------ - -ITCLT = -Bstatic -lorbixmt -IRCLT = -Bstatic -lIRcltmt -ITSRV = -Bstatic -lorbixmt -ITIIOP = -Bstatic -liiopmt -ITDSI = -Bstatic -lDSImt -ITIFR = -Bstatic -lifrmt - -# ------------------------------------------------------------ -# SYSLIBS must be dynamically linked; otherwise you can expect to -# get linkage errors for symbols in the nsl library -# ------------------------------------------------------------ - -LDFLAGS += -L$(ORBIX_LIBDIR) -SYSLIBS = -Bdynamic -lnsl -lsocket - -IDL = $(ORBIX_BINDIR)/idl -IDLFLAGS = - -# ------------------------------------------------------------ -# The following section defines implicit rules for creating -# *.{C,S}.C files, rules for compiling those -# into objects, and even a rule for compiling C++ source into -# objects (in case one isn't already defined). - -# ------------------------------------------------------------ -# first, put the new suffixes at the *head* of the suffix list, -# overriding any existing .C compilation method. -.SUFFIXES: -.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES) - -# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES) -# ------------------------------------------------------------ -# *[CS].o must be compiled here, and depends -# mostly on the C++ files produced from the IDL file. - -%C.o: %C.$(C++SUFFIX) - $(C++) -c $(C++FLAGS) $< - -%S.o: %S.$(C++SUFFIX) - $(C++) -c $(C++FLAGS) $< - -%.o: %.$(C++SUFFIX) - $(C++) -c $(C++FLAGS) $< - -# and here's how to compile C++ files from the IDL file. -# only ONE of these rules will be run at make-time, - -%S.$(C++SUFFIX): %.idl - $(IDL) $(IDLFLAGS) $< - -%C.$(C++SUFFIX): %.idl - $(IDL) $(IDLFLAGS) $< - -%.hh: %.idl - $(IDL) $(IDLFLAGS) $< - -# ------------------------------------------------------------ -# If the version of make you wish to use does not support -# pattern matching, here's a sample of an explicit rule set. - -# We assume the IDL file is called "foobar.idl", we wish -# to compile "foobarC.o", "foobarS.o", and -# "foobar.hh", and the C++ file suffix. -# ------------------------------------------------------------ - -# foobarC.o: foobar.hh foobarC.C -# $(C++) -c ($C++FLAGS) foobarC.C -# -# foobarS.o: foobar.hh foobarS.C -# $(C++) -c ($C++FLAGS) foobarS.C -# -# foobarC.C: foobar.idl -# $(IDL) -c ($IDLFLAGS) foobar.idl -# -# foobarS.C: foobar.idl -# $(IDL) -c ($IDLFLAGS) foobar.idl -# -# foobar.hh: foobar.idl -# $(IDL) -c ($IDLFLAGS) foobar.idl diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile deleted file mode 100644 index 0e425af78b1..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp deleted file mode 100644 index d72803fed0c..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp +++ /dev/null @@ -1,228 +0,0 @@ -// $Id$ - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp deleted file mode 100644 index e96b6e33dcd..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) { -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h deleted file mode 100644 index 033aa7f0cb1..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp deleted file mode 100644 index ac107f69ec4..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#define IT_EX_MACROS - -#include "cubit_impl.h" // server header file -#include "tpool.h" - -int -main (int argc, char** argv) -{ - - -#ifdef Cubit_USE_BOA - Cubit_var cb = new Cubit_Impl; - cout << "Using BOA approach" << endl; -#else - Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl); - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // Register our thread-pool dispatcher - int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS; - Thread_Pool tpool_dispatcher (n_threads); - - // - // Go get some work to do.... - // - IT_TRY { - CORBA::Orbix.impl_is_ready("Cubit", IT_X); - } - IT_CATCHANY { - cout << IT_X << endl; - } - IT_ENDTRY; - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp deleted file mode 100644 index 219503a22d7..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -#include "tpool.h" - -Thread_Pool::Thread_Pool (int n_threads) - : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()) -{ - if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "activate failed")); -} - -int -Thread_Pool::svc (void) -{ - cout << "Pool thread activated" << endl; - while (1) - { - // Dequeue message - ACE_Message_Block *mb; - this->msg_queue ()->dequeue_head (mb); - CORBA::Request *vp = (CORBA::Request *) mb->base (); - mb->release (); - // Hand it off to Orbix - CORBA::Orbix.continueThreadDispatch (*vp); - } - return -1; -} - - -int -Thread_Pool::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment&) -{ -// thread_t tid; -// thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid); - - // Enqueue the request - ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r)); - this->msg_queue ()->enqueue (mb); - // Done - return -1; -} - - - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h deleted file mode 100644 index 337a7f54e65..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" -#include "ace/Task.h" - -class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter -{ -public: - Thread_Pool (int n_threads); - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); - virtual int svc (void); - -}; - - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile deleted file mode 100644 index 650d6aaf259..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h deleted file mode 100644 index 1fd0a2d3c7d..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h +++ /dev/null @@ -1,729 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include "ace/OS.h" -#include <CORBA.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp deleted file mode 100644 index 1d10b058a70..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp +++ /dev/null @@ -1,559 +0,0 @@ -// $Id$ - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h deleted file mode 100644 index 584efa67c8d..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h +++ /dev/null @@ -1,345 +0,0 @@ -// $Id$ - -#ifndef _cubitC_h -#define _cubitC_h - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -#include "corba.h" - - - -class Cubit; -typedef Cubit *Cubit_ptr; -typedef Cubit_ptr CubitRef; - -#ifndef _Cubit_var_ -#define _Cubit_var_ -class Cubit_var -{ - public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } -#if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } -#else - operator Cubit_ptr&() { return _ptr; } -#endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); - private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} -}; -#endif -class Cubit: public virtual CORBA_Object -{ - private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} - public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); - protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} - public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); - -#if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); -#else - return _narrow(obj_var); -#endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } -}; - - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp deleted file mode 100644 index d72803fed0c..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp +++ /dev/null @@ -1,228 +0,0 @@ -// $Id$ - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h deleted file mode 100644 index 3ca717e2b49..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h +++ /dev/null @@ -1,120 +0,0 @@ -// $Id$ - -#ifndef _cubitS_h -#define _cubitS_h - -#include "cubitC.h" - -/************************************************************************/ -/* */ -/* This file is automatically generated by ORBeline IDL compiler */ -/* Do not modify this file. */ -/* */ -/* ORBeline (c) is copyrighted by PostModern Computing, Inc. */ -/* */ -/* The generated code conforms to OMG's IDL C++ mapping as */ -/* specified in OMG Document Number: 94-9-14. */ -/* */ -/************************************************************************/ - -class _sk_Cubit : public Cubit -{ - protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} - public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - -}; -template <class T> -class _tie_Cubit : public Cubit -{ - public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } - - private: - T& _ref; -}; - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp deleted file mode 100644 index e96b6e33dcd..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) { -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h deleted file mode 100644 index 033aa7f0cb1..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp deleted file mode 100644 index 527fa13d76e..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#define IT_EX_MACROS - -#include "cubit_impl.h" // server header file - -int -main (int , char**) -{ - -#ifdef Cubit_USE_BOA - Cubit_var cb = new Cubit_Impl; - cout << "Using BOA approach" << endl; -#else - Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl); - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // - // Go get some work to do.... - // - IT_TRY { - CORBA::Orbix.impl_is_ready("Cubit", IT_X); - } - IT_CATCHANY { - cout << IT_X << endl; - } - IT_ENDTRY; - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp deleted file mode 100644 index da78690cc2c..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -#include "tpr.h" - -void * -worker(void *vp) -{ - ACE_Thread_Control tc (ACE_Thread_Manager::instance ()); - CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp); - return NULL; -} - - -int -tpr_filter::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment&) -{ -// thread_t tid; -// thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid); - - ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance (); - thr_mgr->spawn (ACE_THR_FUNC (worker), - (void *) &r, - THR_DETACHED); - - return -1; -} - -tpr_filter tpr_dispatcher; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h deleted file mode 100644 index b5e8be94cf1..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" - -// -// Create a thread filter to dispatch incoming calls -// -class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); -}; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile deleted file mode 100644 index 69701ba3b63..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -#---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 -# -# Makefile for the ACE_MT_CORBA_Handler tests -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp - -SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o - -LDLIBS = - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Orbix related macros and target settings. -#---------------------------------------------------------------------------- - - -ORBIX_BINDIR = $(ORBIX_ROOT)/bin -ORBIX_LIBDIR = $(ORBIX_ROOT)/corba2/lib -ORBIX_INCDIR = $(ORBIX_ROOT)/corba2/include - -# Remove -DCubit_USE_BOA from below to use the TIE approach - -CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA -LDFLAGS += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace - -IDLFLAGS = -s S.cpp -c C.cpp -B - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -all: server - -server: $(addprefix $(VDIR),$(SVR_OBJS)) - $(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK) - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp -.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/ReactorEx.h \ - $(ACE_ROOT)/ace/ReactorEx.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i -.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/ReactorEx.h \ - $(ACE_ROOT)/ace/ReactorEx.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i -.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.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/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Wheel.h \ - $(ACE_ROOT)/ace/Timer_Wheel_T.h \ - $(ACE_ROOT)/ace/ReactorEx.h \ - $(ACE_ROOT)/ace/ReactorEx.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h deleted file mode 100644 index 3a2dd546608..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h +++ /dev/null @@ -1,1113 +0,0 @@ -// $Id$ - - -#ifndef cubit_hh -#define cubit_hh - -#include <CORBA.h> - -#include <string.h> - - -#ifndef _Cubit_defined -#define _Cubit_defined -class Cubit_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_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) {} - - - Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_dispatch () {} - - Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_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 Cubit; - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - - -#ifndef CubitForwH -#define CubitForwH -CORBA::ObjectRef Cubit_getBase (void *); -void Cubit_release (Cubit *, CORBA::Environment &IT_env); -void Cubit_release (Cubit_ptr); -Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env); -Cubit* Cubit_duplicate (Cubit_ptr ); -Cubit_ptr Cubit_nil (CORBA::Environment &IT_env); -Cubit_ptr Cubit_nil (); -#endif -#define Cubit_IMPL "Cubit" - - -class Cubit; - -typedef Cubit CubitProxy; -#define Cubit_IR "Cubit$v1.1" -#define Cubit_IMPL "Cubit" - -#ifndef CubitPtr -#define CubitPtr - -typedef Cubit* Cubit_ptr; - -typedef Cubit* CubitRef; - -#endif - -class Cubit: public virtual CORBA::Object { -public: - Cubit (char *IT_OR); - Cubit (ObjectReference *IT_OR); - Cubit () : CORBA::Object (1) {} -protected: - Cubit_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_ptr _duplicate( - Cubit_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _bind (CORBA::Environment &IT_env); - static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_ptr) CORBA::OBJECT_NIL;} - -#ifndef Cubit_Many_defined -#define Cubit_Many_defined - -struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - Many(const Many &); - Many(); - ~Many(); - Many& operator= (const Many&); -}; - -#ifndef Cubit_ManyVarH -#define Cubit_ManyVarH - -#ifndef Cubit_ManyvPtr -#define Cubit_ManyvPtr -typedef Many* Many_vPtr; -typedef const Many* Many_cvPtr; -#endif - -class Many_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Many_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - Many_var (const Many_var &IT_s) { - (void) copyHelper (IT_s); - } - - Many_var () { - _ptr = new Many; -; - } - - Many_var (Many *IT_p) { - _ptr = IT_p; - } - - Many_var &operator= (Many *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - Many_var &operator= (const Many_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new Many; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~Many_var () { - delete _ptr; - } - - Many* operator-> () { - return _ptr; - } - - operator Many_cvPtr () const { return _ptr;} - operator Many_vPtr& () { return _ptr;} - operator Many& () const { return * _ptr;} - - protected: - Many *_ptr; - private: - Many_var &operator= (const CORBA::_var &IT_s); - Many_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - -enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX}; - -#ifndef Cubit_oneof_defined -#define Cubit_oneof_defined - -struct oneof { - private: - - discrim __d; - union { - CORBA::Octet _o_; - CORBA::Short _s_; - CORBA::Long _l_; - Many * _cm_; - }; - - public: - - void encodeOp (CORBA::Request &IT_r) const; - void decodeOp (CORBA::Request &IT_r); - void decodeInOutOp (CORBA::Request &IT_r); - - private: - - unsigned char isSet; - - public: - - discrim _d () const { return __d; } - - CORBA::Octet o () const { - return _o_; - } - - void o (CORBA::Octet IT_member) { - if (isSet && (__d != Cubit::e_0th)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_0th; - isSet = 1; - _o_ = IT_member; - } - - CORBA::Short s () const { - return _s_; - } - - void s (CORBA::Short IT_member) { - if (isSet && (__d != Cubit::e_1st)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_1st; - isSet = 1; - _s_ = IT_member; - } - - CORBA::Long l () const { - return _l_; - } - - void l (CORBA::Long IT_member) { - if (isSet && (__d != Cubit::e_2nd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_2nd; - isSet = 1; - _l_ = IT_member; - } - - Many& cm () { - return (*_cm_); - } - - const Many& cm () const { - return (*_cm_); - } - - void cm (const Many& IT_member) { - if (isSet && (__d != Cubit::e_3rd)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = Cubit::e_3rd; - - if (!isSet) { - _cm_ = new Many; - isSet = 1; - } - *(_cm_) = IT_member; - } - - - oneof(); - oneof(const oneof &); - ~oneof(); - oneof& operator= (const oneof&); -}; - -#ifndef Cubit_oneofVarH -#define Cubit_oneofVarH - -#ifndef Cubit_oneofvPtr -#define Cubit_oneofvPtr -typedef oneof* oneof_vPtr; -typedef const oneof* oneof_cvPtr; -#endif - -class oneof_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const oneof_var &IT_s) { - if (!IT_s._ptr) { - _ptr = IT_s._ptr; - } else - { - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - } - return 1; - } - - public: - - oneof_var (const oneof_var &IT_s) { - (void) copyHelper (IT_s); - } - - oneof_var () { - _ptr = NULL; - } - - oneof_var (oneof *IT_p) { - _ptr = IT_p; - } - - oneof_var &operator= (oneof *IT_p) { - if (_ptr != IT_p) { - delete _ptr; - } - _ptr = IT_p; - return (*this); - } - - oneof_var &operator= (const oneof_var &IT_s) { - if (_ptr != IT_s._ptr) { - delete _ptr; - } - _ptr = new oneof; - *(_ptr) = *(IT_s._ptr); - return (*this); - } - - ~oneof_var () { - delete _ptr; - } - - oneof* operator-> () { - return _ptr; - } - - operator oneof_cvPtr () const { return _ptr;} - operator oneof_vPtr& () { return _ptr;} - operator oneof& () const { return * _ptr;} - - protected: - oneof *_ptr; - private: - oneof_var &operator= (const CORBA::_var &IT_s); - oneof_var (const CORBA::_var &IT_s); -}; - -#endif - - -#endif - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef CubitVarH -#define CubitVarH - -#ifndef CubitvPtr -#define CubitvPtr -typedef Cubit* Cubit_vPtr; -typedef const Cubit* Cubit_cvPtr; -#endif - -class Cubit_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_var &IT_s) { - { - _ptr = Cubit_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_var (const Cubit_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_var () { - _ptr = Cubit_nil (); - } - - Cubit_var (Cubit *IT_p) { - _ptr = IT_p; - } - - Cubit_var &operator= (Cubit *IT_p) { - Cubit_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_var &operator= (const Cubit_var &IT_s) { - Cubit_release (_ptr); - _ptr = Cubit_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_var () { - Cubit_release (_ptr); - } - - Cubit* operator-> () { - return _ptr; - } - - operator Cubit_cvPtr () const { return _ptr;} - operator Cubit_vPtr& () { return _ptr;} - - protected: - Cubit *_ptr; - private: - Cubit_var &operator= (const CORBA::_var &IT_s); - Cubit_var (const CORBA::_var &IT_s); - Cubit_var &operator= (const CORBA::_mgr &IT_s); - Cubit_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_var (const CORBA::_mgr &IT_s); - Cubit_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef CubitMgrH -#define CubitMgrH - -class Cubit_mgr : public CORBA::_mgr -{ - public: - - Cubit_mgr () { - _ptr = Cubit_nil (); - _release = 1; - } - - Cubit_mgr (const Cubit_mgr &IT_s) { - _ptr = Cubit_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_mgr &operator= (Cubit *IT_p) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (const Cubit_mgr &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_mgr &operator= (Cubit_var &IT_s) { - if (_ptr && _release) - Cubit_release (_ptr); - _ptr = Cubit_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_mgr () { - if (_release) - Cubit_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 Cubit* () const { - return (Cubit*) _ptr; - } - - Cubit_ptr operator-> () const { - return _ptr; - } - - Cubit *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_mgr Cubit_mgr_IT_const; -#endif - -#ifndef CubitSeqElemH -#define CubitSeqElemH - -class Cubit_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_SeqElem &operator= (Cubit_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_release (*(_ptr)); - *(_ptr) = Cubit_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); - } - - Cubit_ptr operator->() const { return *_ptr;} - - protected: - Cubit_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit(X) Cubit##X - -#define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit \ -virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_octet ( o,IT_env);\ -}\ - \ -virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_short ( s,IT_env);\ -}\ - \ -virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_long ( l,IT_env);\ -}\ - \ -virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_struct ( values,IT_env);\ -}\ - \ -virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->cube_union ( values,IT_env);\ -}\ - \ -virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -m_obj->please_exit (IT_env);\ -}\ - - - - -class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_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 CubitProxyFactoryClass CubitProxyFactory; - -class CubitBOAImpl : public virtual Cubit { -public: - CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) - m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); -} - - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; - virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#ifndef _Cubit_Factory_defined -#define _Cubit_Factory_defined -class Cubit_Factory_dispatch : public virtual CORBA::PPTR { -public: - - Cubit_Factory_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) {} - - - Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_dispatch () {} - - Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o) - : PPTR (IT_OR,IT_p,IT_o) {} - - - Cubit_Factory_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 Cubit_Factory; - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - - -#ifndef Cubit_FactoryForwH -#define Cubit_FactoryForwH -CORBA::ObjectRef Cubit_Factory_getBase (void *); -void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env); -void Cubit_Factory_release (Cubit_Factory_ptr); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env); -Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr ); -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env); -Cubit_Factory_ptr Cubit_Factory_nil (); -#endif -#define Cubit_Factory_IMPL "Cubit_Factory" - - -class Cubit_Factory; - -typedef Cubit_Factory Cubit_FactoryProxy; -#define Cubit_Factory_IR "Cubit_Factory" -#define Cubit_Factory_IMPL "Cubit_Factory" - -#ifndef Cubit_FactoryPtr -#define Cubit_FactoryPtr - -typedef Cubit_Factory* Cubit_Factory_ptr; - -typedef Cubit_Factory* Cubit_FactoryRef; - -#endif - -class Cubit_Factory: public virtual CORBA::Object { -public: - Cubit_Factory (char *IT_OR); - Cubit_Factory (ObjectReference *IT_OR); - Cubit_Factory () : CORBA::Object (1) {} -protected: - Cubit_Factory_ptr __duplicate( - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) { - CORBA::Object::__duplicate (IT_env); - return this; - } -public: - static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, - CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); -public: - static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _bind (CORBA::Environment &IT_env); - static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); - static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;} - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException); -}; - -#ifndef Cubit_FactoryVarH -#define Cubit_FactoryVarH - -#ifndef Cubit_FactoryvPtr -#define Cubit_FactoryvPtr -typedef Cubit_Factory* Cubit_Factory_vPtr; -typedef const Cubit_Factory* Cubit_Factory_cvPtr; -#endif - -class Cubit_Factory_var : public CORBA::_var -{ - private: - - unsigned char copyHelper (const Cubit_Factory_var &IT_s) { - { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - } - return 1; - } - - public: - - Cubit_Factory_var (const Cubit_Factory_var &IT_s) { - (void) copyHelper (IT_s); - } - - Cubit_Factory_var () { - _ptr = Cubit_Factory_nil (); - } - - Cubit_Factory_var (Cubit_Factory *IT_p) { - _ptr = IT_p; - } - - Cubit_Factory_var &operator= (Cubit_Factory *IT_p) { - Cubit_Factory_release (_ptr); - _ptr = IT_p; - return (*this); - } - - Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) { - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - return (*this); - } - - ~Cubit_Factory_var () { - Cubit_Factory_release (_ptr); - } - - Cubit_Factory* operator-> () { - return _ptr; - } - - operator Cubit_Factory_cvPtr () const { return _ptr;} - operator Cubit_Factory_vPtr& () { return _ptr;} - - protected: - Cubit_Factory *_ptr; - private: - Cubit_Factory_var &operator= (const CORBA::_var &IT_s); - Cubit_Factory_var (const CORBA::_var &IT_s); - Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s); - Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s); - Cubit_Factory_var (const CORBA::_mgr &IT_s); - Cubit_Factory_var (const CORBA::_SeqElem &IT_s); -}; - -#endif - - -#ifndef Cubit_FactoryMgrH -#define Cubit_FactoryMgrH - -class Cubit_Factory_mgr : public CORBA::_mgr -{ - public: - - Cubit_Factory_mgr () { - _ptr = Cubit_Factory_nil (); - _release = 1; - } - - Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) { - _ptr = Cubit_Factory_duplicate (IT_s._ptr); - _release = 1; - } - - Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = IT_p; - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s._ptr); - _release = 1; - return (*this); - } - - Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) { - if (_ptr && _release) - Cubit_Factory_release (_ptr); - _ptr = Cubit_Factory_duplicate(IT_s); - _release = 1; - return (*this); - } - - ~Cubit_Factory_mgr () { - if (_release) - Cubit_Factory_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 Cubit_Factory* () const { - return (Cubit_Factory*) _ptr; - } - - Cubit_Factory_ptr operator-> () const { - return _ptr; - } - - Cubit_Factory *_ptr; - - protected: - - unsigned char _release; -}; - -typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const; -#endif - -#ifndef Cubit_FactorySeqElemH -#define Cubit_FactorySeqElemH - -class Cubit_Factory_SeqElem : public CORBA::_SeqElem -{ - public: - - Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) { - _ptr = IT_p; - _release = rel; - } - - Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) { - if (_ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = IT_p; - } - return (*this); - } - - Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) { - if (_ptr && IT_s._ptr) { - if (*(_ptr) && _release) - Cubit_Factory_release (*(_ptr)); - *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr)); - } - return (*this); - } - - operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); - } - - Cubit_Factory_ptr operator->() const { return *_ptr;} - - protected: - Cubit_Factory_ptr *_ptr; - unsigned char _release; -}; - -#endif - - -#define TIE_Cubit_Factory(X) Cubit_Factory##X - -#define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - \ - }; \ - - -#define QUALS_Cubit_Factory \ -virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ -return m_obj->create_cubit ( name,IT_env);\ -}\ - - - - -class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { -public: - Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_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 Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory; - -class Cubit_FactoryBOAImpl : public virtual Cubit_Factory { -public: - Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { - if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) - m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); -} - - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; -}; - - -#endif - - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl deleted file mode 100644 index 41309e997ea..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - - interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); - }; - - - interface Cubit_Factory { - Cubit create_cubit (in string name); - }; - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp deleted file mode 100644 index d19c387bcd2..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp +++ /dev/null @@ -1,712 +0,0 @@ -// $Id$ - - - -#include "cubit.h" - -Cubit::Cubit (char *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit::Cubit (ObjectReference *IT_OR) { - m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef CubitForwC -#define CubitForwC -CORBA::ObjectRef Cubit_getBase(void *IT_p){ - return (Cubit*) IT_p;} - -void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_release (Cubit_ptr IT_p) { - Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_ptr Cubit_nil (CORBA::Environment &) { - return Cubit:: _nil ();} - -Cubit_ptr Cubit_nil () { - return Cubit_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit::_duplicate(IT_p, IT_env)); } -Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) { - return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_IMPL, Cubit_IR); -} - - - -Cubit* Cubit:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit:: _nil(); - } - - Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - - -#ifndef Cubit_Many_Ops -#define Cubit_Many_Ops - -void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const { - - IT_r.insertOctet (o); - - IT_r << l; - - IT_r << s; -} - -void Cubit::Many:: decodeOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) { - - IT_r.extractOctet (o); - - IT_r >> l; - - IT_r >> s; -} - -Cubit::Many ::~Many () { -} - -Cubit::Many:: Many (const Cubit::Many &IT_s) - { - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; -} - -Cubit::Many:: Many () { -} - -Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) { - if (this == &IT_s) return *this; - o = IT_s.o; - l = IT_s.l; - s = IT_s.s; - return *this; -} - - -#endif - - -#ifndef Cubit_oneof_Ops -#define Cubit_oneof_Ops -void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const { - if (!isSet) return; - { - CORBA::ULong IT_0 = (CORBA::ULong) __d; - IT_r << IT_0; - } - switch (__d) { - case Cubit::e_0th: - IT_r.insertOctet (_o_); - break; - case Cubit::e_1st: - IT_r << _s_; - break; - case Cubit::e_2nd: - IT_r << _l_; - break; - case Cubit::e_3rd: - default: - (*_cm_).encodeOp (IT_r); - break; - } - -} - -void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) { - isSet = 0; - { - CORBA::ULong IT_1; - IT_r >> IT_1; - __d = Cubit::discrim(IT_1); - } - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - -} -void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) { - Cubit::discrim IT_d; - { - CORBA::ULong IT_2; - IT_r >> IT_2; - IT_d = Cubit::discrim(IT_2); - } - if (IT_d == __d) - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeInOutOp (IT_r); - break; - } - - else { - this->oneof:: ~oneof(); - memset(this, 0, sizeof(*this)); - __d = IT_d; - switch (__d) { - case Cubit::e_0th: - if (!isSet) { - isSet = 1; - } - IT_r.extractOctet (_o_); - break; - case Cubit::e_1st: - if (!isSet) { - isSet = 1; - } - IT_r >> _s_; - break; - case Cubit::e_2nd: - if (!isSet) { - isSet = 1; - } - IT_r >> _l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - (*_cm_).decodeOp (IT_r); - break; - } - isSet = 1; - } - -} - -Cubit::oneof:: oneof() { - memset(this, 0, sizeof(*this)); - isSet = 0; -} - -Cubit::oneof ::~oneof() { - if (!isSet) return; - switch (__d) { - case Cubit::e_0th: break; - case Cubit::e_1st: break; - case Cubit::e_2nd: break; - case Cubit::e_3rd: - default: if (_cm_) delete _cm_; - break; - } - - isSet = 0; -} - -Cubit::oneof:: oneof (const Cubit::oneof &IT_s) { - isSet = 0; - memset(this, 0, sizeof(*this)); - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; -} - -Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) { - if (this == &IT_s) return *this; - if (isSet && (__d != IT_s.__d)) - { - this-> oneof::~oneof(); - memset(this, 0, sizeof(*this)); - } - - __d = IT_s.__d; - switch (__d) { - case Cubit::e_0th: isSet = 1; - _o_ = IT_s._o_; - break; - case Cubit::e_1st: isSet = 1; - _s_ = IT_s._s_; - break; - case Cubit::e_2nd: isSet = 1; - _l_ = IT_s._l_; - break; - case Cubit::e_3rd: - default: - if (!isSet) { - _cm_ = new Cubit::Many; - isSet = 1; - } - *(_cm_) = *(IT_s._cm_); - break; - } - isSet = 1; - return *this; -} - - -#endif - -void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -void* CubitProxyFactoryClass::New2 () { - return new class Cubit((char*)0);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit(IT_OR);} - -CORBA::Object* CubitProxyFactoryClass::New2Object () { - return new class Cubit((char*)0);} - -void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit*)IT_p)->_pptr ();} - -void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -CubitProxyFactoryClass CubitProxyFactory(1); - -CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_octet",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.insertOctet (o); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Octet IT_result; - IT_r.extractOctet (IT_result); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_short",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << s; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Short IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return 0; - } - CORBA::Request IT_r (this, "cube_long",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r << l; - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - CORBA::Long IT_result; - IT_r >> IT_result; - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return 0; -} - -Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::Many IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_struct",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::Many IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::Many IT_l1; - return IT_l1; - } -} - -Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - { - Cubit::oneof IT_l0; - return IT_l0; - } - } - CORBA::Request IT_r (this, "cube_union",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - values.encodeOp (IT_r); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit::oneof IT_result; - IT_result.decodeOp (IT_r); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - { - Cubit::oneof IT_l1; - return IT_l1; - } -} - -void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return ; - } - CORBA::Request IT_r (this, "please_exit",IT_env,1,1); - - IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env); - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } -} - - - - - -#ifndef Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit"); - return 0; -} - -#endif - -Cubit_Factory::Cubit_Factory (char *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} -Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) { - m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this); -} - -#ifndef Cubit_FactoryForwC -#define Cubit_FactoryForwC -CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){ - return (Cubit_Factory*) IT_p;} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - CORBA::release(IT_p, IT_env);} - -void Cubit_Factory_release (Cubit_Factory_ptr IT_p) { - Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); } - -Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) { - return Cubit_Factory:: _nil ();} - -Cubit_Factory_ptr Cubit_Factory_nil () { - return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());} - -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) { - return (Cubit_Factory::_duplicate(IT_p, IT_env)); } -Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) { - return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); } -#endif - -Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (!obj) { - return (obj); - } - Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env); - return IT_obj; -} - - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env) { - return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, - Cubit_Factory_IMPL, Cubit_Factory_IR); -} - - - -Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) { - return _bind (NULL,NULL,CORBA::Context(), IT_env); } - - -Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host, - CORBA::Environment &IT_env) { - return _bind (IT_markerServer, host, CORBA::Context (), IT_env); } -Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) { - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (CORBA::is_nil (IT_obj)) { - return Cubit_Factory:: _nil(); - } - - Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env); - IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL; - if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) { - IT_env.exception_free(); - } - return IT_p; - } - -void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -void* Cubit_FactoryProxyFactoryClass::New2 () { - return new class Cubit_Factory((char*)0);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) { - return new class Cubit_Factory(IT_OR);} - -CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () { - return new class Cubit_Factory((char*)0);} - -void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) { - void *IT_l; - if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env)) - return IT_p; - else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env)) - return IT_l; - else return NULL; - } - - -CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) { - return ((class Cubit_Factory*)IT_p)->_pptr ();} - -void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) { - add (seq, Cubit_Factory_IR); - CORBA::ObjectFactoryClass::baseInterfaces (seq); -} - -Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1); - -Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) { - - CORBA::EnvExcRaiser IT_raise; - CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv); - if (IT_env || m_isNull) { - return new Cubit; - } - CORBA::Request IT_r (this, "create_cubit",IT_env,1,0); - if (!IT_r.isException (IT_env)) { - - IT_r.encodeStringOp (name); - } - - IT_r.invoke (CORBA::Flags(0),IT_env); - if (!IT_r.isException (IT_env)) { - Cubit_ptr IT_result; - IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR); - IT_r.checkEnv (IT_env); - return IT_result; - } - if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) { - IT_r.checkEnv (IT_env); - } - return new Cubit; -} - - - - - -#ifndef Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char, void *) { - IT_r.makeRuntimeException1 ("Cubit_Factory"); - return 0; -} - -#endif - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp deleted file mode 100644 index e4637a23680..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp +++ /dev/null @@ -1,284 +0,0 @@ -// $Id$ - - - -#include "cubit.h" - - -#define Cubit_dispatch_impl - -unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"cube_octet")) { - CORBA::Octet IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_octet~+o{o},>{o},N{}\ -")) - return 1; - CORBA::Octet o; - - IT_r.extractOctet (o); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_octet ( o, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -o\ -", IT_env)) return 1; - IT_r.insertOctet (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_short")) { - CORBA::Short IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_short~+s{s},>{s},N{}\ -")) - return 1; - CORBA::Short s; - - IT_r >> s; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_short ( s, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -s\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_long")) { - CORBA::Long IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_long~+l{l},>{l},N{}\ -")) - return 1; - CORBA::Long l; - - IT_r >> l; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_long ( l, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -l\ -", IT_env)) return 1; - IT_r << IT_result; - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_struct")) { - Cubit::Many IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\ -")) - return 1; - Cubit::Many values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_struct ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -R~Cubit::Many~o{o},l{l},s{s}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"cube_union")) { - Cubit::oneof IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - IT_r.tcPreAssert ( -"\ -Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\ -"); - if (!IT_r.tcAssert ("\ -e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\ -")) - return 1; - Cubit::oneof values; - - values.decodeOp (IT_r); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit*)IT_pp)->cube_union ( values, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\ -", IT_env)) return 1; - IT_result.encodeOp (IT_r); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (!strcmp(IT_s,"please_exit")) { - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~please_exit~>{v},O{}\ -")) - return 1; - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - ((Cubit*)IT_pp)->please_exit (IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#define Cubit_Factory_dispatch_impl - -unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, - unsigned char IT_isTarget, void *IT_pp) { - if (!IT_pp) - IT_pp = m_obj; - const char *IT_s = IT_r.getOperation (); - if (!strcmp(IT_s,"create_cubit")) { - Cubit_ptr IT_result; - CORBA::Environment IT_env (IT_r); - CORBA::Filter* IT_f = CORBA::Orbix.getFilter (); - if (!IT_r.tcAssert ("\ -Ro~create_cubit~+name{0},>{O~Cubit},N{}\ -")) - return 1; - char * name; - - IT_r.decodeStringOp(name); - - if (IT_f && !IT_r.isException (IT_env)) - IT_f->inRequestPostM (IT_r, IT_env); - if (!IT_r.isException (IT_env)) { - try { - IT_result = ((Cubit_Factory*)IT_pp)->create_cubit ( name, IT_env); - - } catch (CORBA::SystemException &IT_exSys) { - IT_env.propagate (&IT_exSys); - } catch (CORBA::UserException &IT_exUsr) { - IT_env.propagate (&IT_exUsr); - } - } - CORBA::string_free (name); - - if (!IT_r.isException (IT_env)) { - if (!IT_r.convertToReply ("\ -O~Cubit\ -", IT_env)) return 1; - { - CORBA::Object* IT_l1 = (CORBA::Object*) IT_result; - IT_r << IT_l1; - } - if (IT_result) Cubit_release (IT_result); - } - - else IT_r.makeSystemException (IT_env); - return 1; - } - - if (IT_isTarget) - IT_r.makeRuntimeException2 (); - - return 0; -} - -#include "cubitC.cpp" - diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp deleted file mode 100644 index 02c30756efc..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) { -} - -Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) { - cerr << "Creating Cubit for " << name << endl; - -#ifdef Cubit_USE_BOA - Cubit_Impl_Task *cubit = new Cubit_Impl_Task (); -#else - Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task); -#endif - Cubit::_duplicate ((Cubit *)cubit); - cubit->activate (1); - return (Cubit *) cubit; -} - -int -Cubit_Impl_Task::svc (void) -{ - while (1) - { - // Dequeue message - ACE_Message_Block *mb; - this->msg_queue ()->dequeue_head (mb); - CORBA::Request *vp = (CORBA::Request *) mb->base (); - mb->release (); - // Hand it off to Orbix - CORBA::Orbix.continueThreadDispatch (*vp); - } - return 0; -} - -void * -Cubit_Impl_Task::_deref (void) -{ - return this; -} diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h deleted file mode 100644 index 0fea9857af3..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubit.h" -#include "ace/Task.h" - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual CubitBOAImpl { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ -public: - virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); - -}; - -#ifdef Cubit_USE_BOA -class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl { -#else -class Cubit_Factory_Impl { -#endif - -public: - virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException); -}; - -class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> { -public: - // For ACE_Task - int svc (void); - // for narrowing - virtual void *_deref (); -}; - -#ifndef Cubit_USE_BOA -DEF_TIE_Cubit (Cubit_Impl) -DEF_TIE_Cubit_Factory (Cubit_Factory_Impl) -#endif /* Cubit_USE_BOA */ - -#endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp deleted file mode 100644 index 19a86b75ffd..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -#include "tps.h" - -int -TPS_Filter::inRequestPreMarshal(CORBA::Request &r, CORBA::Environment& env) -{ - // Get target - CORBA::Object_ptr obj = r.target (); - Cubit * cb = Cubit::_narrow (obj, env); - - if (env) // Not for our object!! - return 1; // continue in the same thread - - // Enqueue the request - Cubit_Impl_Task *ct; - if (CORBA::is_nil (cb)) - return 1; - ct = (Cubit_Impl_Task *) DEREF(cb); - if (ct) { - ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r)); - ct->msg_queue ()->enqueue (mb); - } - // Done - return -1; -} - -TPS_Filter tps_filter; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h deleted file mode 100644 index 362c9ed4e91..00000000000 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ - -#include "cubit.h" -#include "cubit_impl.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" -#include "ace/Task.h" - -class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter -{ -public: - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); -}; diff --git a/TAO/IIOP/tests/Cubit/README b/TAO/IIOP/tests/Cubit/README deleted file mode 100644 index 5eaf42ec2e3..00000000000 --- a/TAO/IIOP/tests/Cubit/README +++ /dev/null @@ -1,7 +0,0 @@ - Cubit - -This is the example from the SunSoft's IIOP 1.4 distribution modified -to work with TAO. There is a Cubit example for Orbix and -VisiBroker. - -Benchmarking results are under results and tnf directories. diff --git a/TAO/IIOP/tests/Cubit/TAO/Makefile b/TAO/IIOP/tests/Cubit/TAO/Makefile deleted file mode 100644 index 04f34a6cc36..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/Makefile +++ /dev/null @@ -1,121 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the ACE-ified Sun Ref. implementation -# of IIOP ORB -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lcorba - -PROG_SRCS = svr.cpp clnt.cpp cubit.cpp \ - test1.cpp test1_clnt.cpp test1_svr.cpp \ - echo_clnt.cpp echo_svr.cpp - -LSRC = $(PROG_SRCS) - -CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o -CUBIT_CLT_OBJS = clnt.o cubitC.o - -BASIC_SVR_OBJS = test1.o test1_svr.o -BASIC_CLT_OBJS = test1.o test1_clnt.o - -ECHO_SVR_OBJS = test1.o echo_svr.o -ECHO_CLT_OBJS = test1.o echo_clnt.o - -BIN = svr clnt test1_svr test1_clnt -BUILD = $(BIN) -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -# Local modifications to variables imported by includes above. -LDFLAGS += -L../../../proto/lib -CPPFLAGS += -I../../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG - -svr: $(addprefix $(VDIR),$(CUBIT_SVR_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -clnt: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -test1_svr: $(addprefix $(VDIR),$(BASIC_SVR_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -test1_clnt: $(addprefix $(VDIR),$(BASIC_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -######## -# Sanity check builds by running basic functionality tests. -# -# "sleep 5" in the server startup is usually enough to get the -# objref into the file so the client can read it. -# -check: $(TESTS) - @echo "testing with 'cube' calls, stub + DII, IOR strings" - @./svr -i30 -o non-internet > obj.1 & sleep 5 - @./clnt -n250 -O `cat obj.1` -x - @echo '' - @echo "testing request forwarding with 'cube' calls, stub + DII" - @./svr -f -i30 > obj.2 & sleep 5 - @./clnt -n250 -O `cat obj.2` -x - @echo '' - @echo "testing transmission of primitive data types" - @./test1_svr -i30 > obj.3 & sleep 5 - @./test1_clnt -n50 -O `cat obj.3` -x - @echo '' -# @echo "testing echo of primitive data values" -# @./echo_svr -i30 > obj.4 & sleep 5 -# @./echo_clnt -O `cat obj.4` -x -# @echo '' - @echo "testing with 'cube' calls, MT-ized (no forwarding)" - @./svr -t -i30 -o non-internet > obj.5 & sleep 5 - @./clnt -n250 -O `cat obj.5` -x - @echo '' - -ifdef LOCALRULES -######## -# CUBIT test -svr: svr.o cubit.o - $(LINK.cc) -o svr svr.o cubit.o $(LDLIBS) $(POSTLINK) -clnt: cubit.o clnt.o - $(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS) $(POSTLINK) - -######## -# BASIC DATATYPES test -test1_clnt: test1.o test1_clnt.o - $(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS) $(POSTLINK) -test1_svr: test1.o test1_svr.o - $(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS) $(POSTLINK) - -######## -# ECHO test ... "test1" where the operation semantics are violated; -# this aids some porting work, but is a less rigorous test -echo_clnt: test1.o echo_clnt.o - $(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS) $(POSTLINK) -echo_svr: test1.o echo_svr.o - $(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS) $(POSTLINK) -endif - -clean: - -rm -rf *.o $(BIN) obj.* core Templates.DB .make.state - -install: - -@echo "Nothing to install, these are tests!" - - - - - diff --git a/TAO/IIOP/tests/Cubit/TAO/clnt.cpp b/TAO/IIOP/tests/Cubit/TAO/clnt.cpp deleted file mode 100644 index 3e78e8be2f1..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/clnt.cpp +++ /dev/null @@ -1,510 +0,0 @@ -// $Id$ - -// @(#)clnt.cpp 1.2 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: Simple "cube" client, calling hand-crafted stubs. -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include <ace/Get_Opt.h> -//#include <crtdbg.h> - -#if unix -# include <unistd.h> -# include <sys/time.h> - -#elif defined (VXWORKS) -# include <unistd.h> -# include <time.h> - -#else // windows - -#endif // unix - -#include "cubitC.h" - -#include <corba/debug.h> - - -#if !defined (_WIN32) -extern char *optarg; // missing on some platforms -#endif - -inline int func (unsigned i) { return i - 117; } - -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - - -// -// forward declarations -// -static void cube_union_stub(unsigned, unsigned&, unsigned&, - CORBA_Object_ptr, CORBA_Environment &); - -static void cube_union_dii(unsigned &, unsigned &, - CORBA_Object_ptr, CORBA_Environment &); - -// Global variables -const char* TAO_arg_ior = 0; -unsigned loop_count = 1; -int exit_later = 0; - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_Get_Opt opts (argc, argv, "dn:O:x"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - - case 'd': // debug flag - TAO_debug_level++; - continue; - - case 'n': // loop count - loop_count = (unsigned) ACE_OS::atoi (opts.optarg); - continue; - - case 'O': // stringified objref - { - TAO_arg_ior = ACE_OS::strdup(opts.optarg); - } - continue; - - case 'x': - exit_later++; - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-n loopcount]" - " [-O objref]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - -int -main (int argc, char *argv[]) -{ - CORBA_ORB_ptr orb_ptr; - CORBA_Object_ptr objref = CORBA_Object::_nil(); - CORBA_Environment env; - - orb_ptr = CORBA_ORB_init(argc, argv, "internet", env); - if (env.exception() != 0) - { - print_exception(env.exception(), "ORB initialization"); - return 1; - } - - // - // Parse command line and verify parameters. - // - parse_args(argc, argv); - - if (TAO_arg_ior == 0) - ACE_ERROR_RETURN((LM_ERROR, "%s: must specify an object reference using -O <ior>\n", argv[0]), 1); - - objref = orb_ptr->string_to_object ((CORBA_String)TAO_arg_ior, env); - - ACE_OS::free((void*)TAO_arg_ior); - TAO_arg_ior = 0; - - if (env.exception () != 0) - { - print_exception (env.exception (), "string2object"); - return 1; - } - - if (CORBA_is_nil (objref) == CORBA_B_TRUE) - ACE_ERROR_RETURN((LM_ERROR, "%s: must identify non-null target objref\n", argv [0]), 1); - - // Narrow the CORBA_Object reference to the stub object, checking - // the type along the way using _is_a - Cubit_ptr aCubit = Cubit::_narrow(objref); - if (aCubit == 0) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"), 1); - - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - ACE_Time_Value before, after; - - before = ACE_OS::gettimeofday(); - - for (i = 0; i < loop_count; i++) - { - // - // Cube an octet. - // - CORBA_Octet arg_octet, ret_octet; - - call_count++; - ret_octet = aCubit->Cubit_cube_octet (arg_octet = func (i), env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_octet"); - error_count++; - } - else - { - dmsg2 ("cube octet: %d --> %d\n", arg_octet, ret_octet); - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - ACE_OS::printf ("** cube_octet(%d) ERROR (--> %d)\n", - (CORBA_Octet) func (i), ret_octet); - error_count++; - } - } - - // - // Cube a short. - // - CORBA_Short arg_short, ret_short; - - call_count++; - ret_short = aCubit->Cubit_cube_short (arg_short = func (i), env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_short"); - error_count++; - } - else - { - dmsg2 ("cube short: %d --> %d\n", arg_short, ret_short); - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) - { - ACE_OS::printf ("** cube_short(%d) ERROR (--> %d)\n", - (CORBA_Short) func (i), ret_short); - error_count++; - } - } - - // - // Cube a long. - // - CORBA_Long arg_long, ret_long; - - call_count++; - ret_long = aCubit->Cubit_cube_long (arg_long = func (i), env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_long"); - error_count++; - } - else - { - dmsg2 ("cube long: %d --> %d\n", arg_long, ret_long); - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - ACE_OS::printf ("** cube_long(%ld) ERROR (--> %ld)\n", - (CORBA_Long) func (i), ret_long); - error_count++; - } - } - - // - // Cube a "struct" ... - // - Cubit_Many arg_struct, *ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - ret_struct = aCubit->Cubit_cube_struct (arg_struct, env); - if (env.exception () != 0) - { - print_exception (env.exception (), "from cube_struct"); - error_count++; - } - else - { - dmsg ("cube struct ..."); - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o; - - if (arg_struct.l != ret_struct->l - || arg_struct.s != ret_struct->s - || arg_struct.o != ret_struct->o) - { - ACE_OS::printf ("** cube_struct ERROR\n"); - error_count++; - } - delete ret_struct; - } - - } - - after = ACE_OS::gettimeofday(); - - if (call_count > 0) - { - if (error_count == 0) - { - ACE_Time_Value diff = after - before; - unsigned long us = diff.sec() * 1000 * 1000 + diff.usec(); - - us /= call_count; - - if (us > 0) - ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count); - } - - // - // Simple test for DII: call "cube_struct". (It's not timed - // since the copious mallocation of DII would bias numbers against - // typical stub-based calls.) - // - do { - // - // Create the request ... - // - CORBA_Request_ptr req; - - req = objref->_request ((const CORBA_String) "cube_struct", env); - if (env.exception () != 0) { - print_exception (env.exception (), "DII request create"); - break; - } - - // - // ... initialise the argument list and result ... - // - Cubit_Many arg, *result; - - arg.o = 3; arg.l = 5; arg.s = -7; - - CORBA_Any tmp_arg (TC_Cubit_Many, &arg, CORBA_B_FALSE); - - req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env); - if (env.exception () != 0) { - print_exception (env.exception (), "DII request arg add"); - CORBA_release (req); - break; - } - - req->result ()->value () - ->replace (TC_Cubit_Many, 0, CORBA_B_TRUE, env); - if (env.exception () != 0) { - print_exception (env.exception (), "DII request result type"); - CORBA_release (req); - break; - } - - // - // Make the invocation, verify the result - // - req->invoke (); - if (req->env ()->exception () != 0) { - print_exception (req->env ()->exception (), "DII invoke"); - CORBA_release (req); - break; - } - - result = (Cubit_Many *) req->result ()->value ()->value (); - - if (result->o != 27 || result->l != 125 || result->s != -343) - ACE_OS::fprintf (stderr, "DII cube_struct -- bad results\n"); - else - dmsg ("DII cube_struct ... success!!"); - - CORBA_release (req); - - } while (0); - - // - // Two more tests, using the "cube_union" function - // - cube_union_dii(call_count, error_count, objref, env); - if (env.exception () != 0) - error_count++; - - cube_union_stub(i, call_count, error_count, objref, env); - if (env.exception () != 0) - error_count++; - - if (exit_later) { - aCubit->Cubit_please_exit (env); - dexc (env, "server, please ACE_OS::exit"); - } - - CORBA_release (objref); - - return (error_count == 0) ? 0 : 1; -} - - -static void -cube_union_stub(unsigned i, - unsigned &call_count, - unsigned &error_count, - CORBA_Object_ptr objref, - CORBA_Environment &env) -{ - Cubit_ptr aCubit = Cubit::_narrow(objref); - // - // Cube a "union" ... - // - Cubit_oneof u, *r; - - call_count++; - - u._disc = e_2nd; - u.l = 3; - - r = aCubit->Cubit_cube_union (u, env); - if (env.exception () != 0) { - print_exception (env.exception (), "from cube_union"); - error_count++; - } else { - dmsg ("cube union ..."); - u.l = u.l * u.l * u.l ; - - if (u.l != r->l) { - ACE_OS::printf ("** cube_union ERROR\n"); - error_count++; - } - - delete r; - } - - // - // Cube another "union" which uses the default arm ... - // - call_count++; - - u._disc = e_5th; - u.cm.l = func (i); - u.cm.s = func (i); - u.cm.o = func (i); - - u.cm.l = 7; - u.cm.s = 5; - u.cm.o = 3; - - r = aCubit->Cubit_cube_union (u, env); - if (env.exception () != 0) { - print_exception (env.exception (), "from cube_union"); - error_count++; - } else { - dmsg ("cube union ..."); - u.cm.l = u.cm.l * u.cm.l * u.cm.l; - u.cm.s = u.cm.s * u.cm.s * u.cm.s; - u.cm.o = u.cm.o * u.cm.o * u.cm.o; - - if (u.cm.l != r->cm.l - || u.cm.s != r->cm.s - || u.cm.o != r->cm.o) { - ACE_OS::printf ("** cube_union ERROR\n"); - error_count++; - } - - delete r; - } -} - - -static void -cube_union_dii (unsigned &call_count, - unsigned &error_count, - CORBA_Object_ptr objref, - CORBA_Environment &env) -{ - // - // Create the request ... - // - CORBA_Request_ptr req; - - call_count++; - - req = objref->_request ((const CORBA_String) "cube_union", env); - if (env.exception () != 0) { - error_count++; - - print_exception (env.exception (), "cube_union_dii request create"); - return; - } - - // - // ... initialise the argument list and result ... - // - Cubit_oneof u, *r; - - u._disc = e_3rd; - u.cm.l = 5; - u.cm.s = -7; - u.cm.o = 3; - - CORBA_Any tmp_arg (TC_Cubit_oneof, &u, CORBA_B_FALSE); - - req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env); - if (env.exception () != 0) { - error_count++; - print_exception (env.exception (), "cube_union_dii request arg add"); - CORBA_release (req); - return; - } - - req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA_B_TRUE, env); - if (env.exception () != 0) { - error_count++; - print_exception (env.exception (), "cube_union_dii result type"); - CORBA_release (req); - return; - } - - // - // Make the invocation, verify the result - // - req->invoke (); - if (req->env ()->exception () != 0) { - error_count++; - print_exception (req->env ()->exception (),"cube_union_dii invoke"); - CORBA_release (req); - return; - } - - r = (Cubit_oneof *) req->result ()->value ()->value (); - - if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) { - error_count++; - ACE_OS::fprintf (stderr, "cube_union_dii -- bad results\n"); - } - else - dmsg ("cube_union_dii ... success!!"); - - CORBA_release (req); -} diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.cpp b/TAO/IIOP/tests/Cubit/TAO/cubit.cpp deleted file mode 100644 index 38f23fac373..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubit.cpp +++ /dev/null @@ -1,578 +0,0 @@ -// $Id$ - -// @(#)cubit.cpp 1.2 95/09/29 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written C-style "Cubit" stubs and "skeletons" -// -// NOTE: these "skeletons" are really the methods, using DSI. No real -// ORB would be implemented in this particular way. Several things would -// be more typical of real (static) skeletons: -// -// * Most of the "in" (and much of the "out") parameter data would -// be preallocated on the stack, not heap allocated. (Static -// preallocation doesnt' really work in a multithreaded system, -// and moreover can waste a lot of space.) -// -// * The ORB core wouldn't be told about parameters using heap -// allocated data structures (e.g. NVList). -// -// * Skeletons would need to some kind of "marshal the response NOW" -// API so that stack-allocated "out" values wouldn't become invalid -// up until they were safely marshaled. -// -// * They'd handle exceptions rather than just generating debugging -// messages when they happen. -// -// * Method code would be called by the skeletons, not written as -// part of the "skeleton" itself! -// -// A key part of turning this code into a complete ORB would be to ensure -// that skeletons were always efficient and correct. They might not need -// to be sharable between different implementations of the same OMG-IDL -// object interface, but many ORBs choose to be structured that way. -// - -#include "cubit.h" // for stubs ... -#include <corba/boa.h> // ... and skeletons - -#include <corba/debug.h> // ... and debugging - - -// -// CUBE OCTET -// - -static const TAO_Param_Data Cubit_cube_octet_params [] = { - { _tc_CORBA_Octet, PARAM_RETURN, 0 }, - { _tc_CORBA_Octet, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_octet_calldata = { - "cube_octet", CORBA_B_TRUE, - 2, &Cubit_cube_octet_params [0], - 0, 0 -}; - - -CORBA_Octet -Cubit_cube_octet ( - Cubit_ptr target, - CORBA_Octet o, - CORBA_Environment &env -) -{ - CORBA_Octet retval = 0; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &Cubit_cube_octet_calldata, - &retval, &o); - data->Release (); - } - return retval; -} - -static void -_cube_octet_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_Octet); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_octet, add value"); - - req.params (nvlist, env); - dexc (env, "cube_octet, get params"); - - CORBA_Octet* value = new CORBA_Octet; - - *value = *(CORBA_Octet *)nv->value ()->value (); - // dmsg1 ("cube octet, parameter '%d'", *value); - *value = (CORBA_Octet) ((*value) * (*value) * (*value)); - // dmsg1 ("cube octet, result '%d'", *value); - - CORBA_Any* any = - new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_octet, result"); -} - - -// -// CUBE SHORT -// - -static const TAO_Param_Data Cubit_cube_short_params [] = { - { _tc_CORBA_Short, PARAM_RETURN, 0 }, - { _tc_CORBA_Short, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_short_calldata = { - "cube_short", CORBA_B_TRUE, - 2, &Cubit_cube_short_params [0], - 0, 0 -}; - - -CORBA_Short -Cubit_cube_short (Cubit_ptr target, - CORBA_Short s, - CORBA_Environment &env) -{ - CORBA_Short retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &Cubit_cube_short_calldata, - &retval, &s); - data->Release (); - } - return retval; -} - -static void -_cube_short_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_Short); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_short, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_short, get params"); - - CORBA_Short* value = new CORBA_Short; - - *value = *(CORBA_Short *)nv->value ()->value (); - // dmsg1 ("cube short, parameter '%d'", *value); - *value =(CORBA_Short) ((*value) * (*value) * (*value)); - // dmsg1 ("cube short, result '%d'", *value); - - CORBA_Any* any = - new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_short, result"); -} - - -// -// CUBE LONG -// - -static const TAO_Param_Data Cubit_cube_long_params [] = { - { _tc_CORBA_Long, PARAM_RETURN, 0 }, - { _tc_CORBA_Long, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_long_calldata = { - "cube_long", CORBA_B_TRUE, - 2, &Cubit_cube_long_params [0], - 0, 0 -}; - - -CORBA_Long -Cubit_cube_long (Cubit_ptr target, - CORBA_Long l, - CORBA_Environment &env) -{ - CORBA_Long retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else - { - data->do_call (env, &Cubit_cube_long_calldata, - &retval, &l); - data->Release (); - } - return retval; -} - - -static void -_cube_long_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_Long); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_long, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_long, get params"); - - CORBA_Long* value = new CORBA_Long; - - *value = *(CORBA_Long *)nv->value ()->value (); - // dmsg1 ("cube long, parameter '%d'", *value); - *value = (*value) * (*value) * (*value); - // dmsg1 ("cube long, result '%d'", *value); - - CORBA_Any* any = - new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_long, result"); -} - -// -// Encapsulated parameters for struct "Cubit_Many" typecode. -// None of these parameters is complicated, so this is just -// a linear sequence of element encodings -// -// NOTE: it's important that this be longword aligned!! -// -static const CORBA_Long _oc_Cubit_Many [] = { - 1, // byte order flag (TRICKY!) - - 1, 0, // empty string: repository/type ID - 1, 0, // empty string: struct name - - 3, // three struct elements - - // First structure element: name, typecode for Octet - 1, 0, // empty string: name "o" - tk_octet, - - // Second structure element: name, typecode for Long - 1, 0, // empty string: name "l" - tk_long, - - // Third structure element: name, typecode for Short - 1, 0, // empty string: name "s" - tk_short, -}; - -static CORBA_TypeCode _tc_Cubit_Many (tk_struct, - sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many; - - -// -// CUBE STRUCT -// - -static const TAO_Param_Data Cubit_cube_struct_params [] = { - { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) }, - { &_tc_Cubit_Many, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_struct_calldata = { - "cube_struct", CORBA_B_TRUE, - 2, &Cubit_cube_struct_params [0], - 0, 0 -}; - -Cubit_Many * -Cubit_cube_struct (Cubit_ptr target, - Cubit_Many &values, - CORBA_Environment &env) -{ - Cubit_Many *retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else - { - data->do_call (env, &Cubit_cube_struct_calldata, - &retval, &values); - data->Release (); - } - return retval; -} - - -static void -_cube_struct_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_Many); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_struct, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_struct, get params"); - - Cubit_Many *value; - Cubit_Many *retval = new Cubit_Many; - - value = (Cubit_Many *)nv->value ()->value (); - - retval->o = (CORBA_Octet) (value->o * value->o * value->o); - retval->s = (CORBA_Short) (value->s * value->s * value->s); - retval->l = value->l * value->l * value->l; - - // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o); - // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s); - // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l); - - CORBA_Any *any = - new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - -// -// CUBE UNION -// - -// -// NOTE: not all union typecodes can be encoded as an array -// of "long "values, but this one can. Ones with discriminants -// that are one or two bytes long can't easily be coded portably. -// -// The benefit of doing it as an array of "long" values is -// twofold: (a) easier to read; (b) on most systems it's then -// adequately aligned for the typecode interpreter to use, so -// no additional runtime copy needs to be made. -// -static const CORBA_Long _oc_Cubit_oneof [] = { - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "oneof" - - // - // discriminant typecode: - // - tk_enum, // tk_enum - 72, // encapsulation length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted enum name, "discrim" - 6, // 5 elements in the enum - - 1, 0, // omitted member name, "e_0th" - 1, 0, // omitted member name, "e_1st" - 1, 0, // omitted member name, "e_2nd" - 1, 0, // omitted member name, "e_3rd" - 1, 0, // omitted member name, "e_4th" - 1, 0, // omitted member name, "e_5th" - - 4, // default member index (zero based) - 5, // number of union members - - // the 1st union branch arm - e_0th, // member label value - 1, 0, // omitted member name, "o" - tk_octet, // member typecode - - // the 2nd union branch arm - e_1st, // member label value - 1, 0, // omitted member name, "s" - tk_short, // member typecode - - // the 3rd union branch arm - e_2nd, // member label value - 1, 0, // omitted member name, "l" - tk_long, // member typecode - - // the 4th union branch arm - e_3rd, // member label value - 1, 0, // omitted member name, "cm" - - // the 4th union member typecode - tk_struct, // tk_struct - 60, // encap length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "Many" - 3, // three struct members - - // First structure element - 1, 0, // omitted member name, "o" - tk_octet, // member type, tk_octet - - // Second structure element - 1, 0, // omitted member name, "l" - tk_long, // member type, tk_long - - // Third structure element - 1, 0, // omitted member name, "s" - tk_short, // member type, tk_short - - // the 5th union branch arm - 4, // the 5th member label value - 1, 0, // omitted member name, "cm" - ~0, // indirected typecode (~0) - -84 // offset to struct "Many" typecode -}; - -static CORBA_TypeCode _tc_Cubit_oneof (tk_union, - (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof; - -static const TAO_Param_Data Cubit_cube_union_params [] = { - { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) }, - { &_tc_Cubit_oneof, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_union_calldata = { - "cube_union", CORBA_B_TRUE, - 2, &Cubit_cube_union_params [0], - 0, 0 -}; - -Cubit_oneof * -Cubit_cube_union (Cubit_ptr target, - Cubit_oneof &values, - CORBA_Environment &env) -{ - Cubit_oneof *retval; - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else - { - data->do_call (env, &Cubit_cube_union_calldata, - &retval, &values); - data->Release (); - } - return retval; -} - - -static void -_cube_union_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_oneof); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_union_3rd, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_union_3rd, get params"); - - Cubit_oneof *v; - Cubit_oneof *r = new Cubit_oneof; - - v = (Cubit_oneof *)nv->value ()->value (); - r->_disc = v->_disc; - - switch (v->_disc) { - case e_0th: - r->o = (CORBA_Octet) (v->o * v->o * v->o); - break; - - case e_1st: - r->s = (CORBA_Short) (v->s * v->s * v->s); - break; - - case e_2nd: - r->l = v->l * v->l * v->l; - break; - - case e_3rd: - default: - r->cm.o = (CORBA_Octet) (v->cm.o * v->cm.o * v->cm.o); - r->cm.s = (CORBA_Short) (v->cm.s * v->cm.s * v->cm.s); - r->cm.l = v->cm.l * v->cm.l * v->cm.l; - break; - } - - CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - - -// -// PLEASE EXIT -// - -static const TAO_Call_Data Cubit_please_exit_calldata = { - "please_exit", CORBA_B_FALSE, - 0, 0, - 0, 0 -}; - -void -Cubit_please_exit ( - Cubit_ptr target, - CORBA_Environment &env -) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &Cubit_please_exit_calldata - ); - data->Release (); - } -} - -static void -_please_exit_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - dmsg ("I've been asked to shut down..."); - req.oa ()->please_shutdown (env); - dexc (env, "please_exit, please_shutdown"); -} - - -const CORBA_Char *Cubit__id = (CORBA_Char *) - "IDL:Eng.SUN.COM/Cubit:1.1"; - - -// -// table of all operations, used by operation dispatch to get to the -// right skeleton ... could be sorted by the IDL compiler so bsearch -// is effective, perhaps with help from opname hashes and a small cache -// (e.g. like Obj-C?). for now, just lsearch. -// -const TAO_Skel_Entry Cubit_operations [] = { - { &Cubit_cube_octet_calldata, _cube_octet_skel }, - { &Cubit_cube_short_calldata, _cube_short_skel }, - { &Cubit_cube_long_calldata, _cube_long_skel }, - { &Cubit_cube_struct_calldata, _cube_struct_skel }, - { &Cubit_cube_union_calldata, _cube_union_skel }, - { &Cubit_please_exit_calldata, _please_exit_skel }, - { 0, 0 } // last entry -}; diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.h b/TAO/IIOP/tests/Cubit/TAO/cubit.h deleted file mode 100644 index 78d6b604052..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubit.h +++ /dev/null @@ -1,108 +0,0 @@ -// $Id$ - -// @(#)cubit.hh 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Hand-crafted C language binding glue ... -// -// This doesn't use C++ since doing the obvious derivation -// (all parent interfaces are virtual public parents) makes -// object references have different "views". That is, a -// pointer to a Cubit (i.e. a Cubit_ptr) would not have -// the same binary value as a pointer to a CORBA_Object -// (i.e. a CORBA_Object_ptr, generic objref). That'd -// mean lots of narrowing/widening/RTTI infrastructure. -// - -#ifndef _CUBIT_HH -#define _CUBIT_HH - -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ - -#include <corba/orb.h> -#include <corba/stub.h> - - -// -// C style binding -// - -typedef CORBA_Object Cubit; -typedef Cubit *Cubit_ptr, *CubitRef; - -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; - -struct Cubit_Many { - CORBA_Octet o; - CORBA_Long l; - CORBA_Short s; -}; - -enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2, - e_3rd = 3, e_4th = 4, e_5th = 5}; - -struct Cubit_oneof { - Cubit_discrim _disc; - - union { - CORBA_Octet o; - CORBA_Short s; - CORBA_Long l; - Cubit_Many cm; - }; -}; - -CORBA_Octet -Cubit_cube_octet ( - Cubit_ptr target, - CORBA_Octet o, - CORBA_Environment &env -); - -CORBA_Short -Cubit_cube_short ( - Cubit_ptr target, - CORBA_Short s, - CORBA_Environment &env -); - -CORBA_Long -Cubit_cube_long ( - Cubit_ptr target, - CORBA_Long l, - CORBA_Environment &env -); - -Cubit_Many * -Cubit_cube_struct ( - Cubit_ptr target, - Cubit_Many &values, - CORBA_Environment &env -); - -Cubit_oneof * -Cubit_cube_union ( - Cubit_ptr target, - Cubit_oneof &values, - CORBA_Environment &env -); - -void -Cubit_please_exit ( - Cubit_ptr target, - CORBA_Environment &env -); - -extern const CORBA_Char *Cubit__id; // type ID - -extern const TAO_Skel_Entry Cubit_operations []; - -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ - -#endif // _CUBIT_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.idl b/TAO/IIOP/tests/Cubit/TAO/cubit.idl deleted file mode 100644 index d4f1610e2a8..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. - -#pragma prefix "Eng.SUN.COM" -#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp b/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp deleted file mode 100644 index 8bcb0b4f4d9..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp +++ /dev/null @@ -1,383 +0,0 @@ -// $Id$ - -// @(#)cubitC.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include "cubitC.h" // for stubs ... - -Cubit_ptr Cubit::_duplicate(Cubit_ptr obj) -{ - if (obj) - obj->AddRef(); - - return obj; -} - -Cubit_ptr Cubit::_narrow(CORBA_Object_ptr obj) -{ - CORBA_Environment env; - if (obj->_is_a("IDL:Cubit:1.0", env)) - { - STUB_Object *istub; - if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - return Cubit::_nil(); - } - Cubit_ptr new_obj = new Cubit(istub); - return Cubit::_duplicate(new_obj); - } - return Cubit::_nil(); -} - -Cubit_ptr Cubit::_nil() -{ - return (Cubit_ptr)NULL; -} - -// -// CUBE OCTET -// - -static const TAO_Param_Data Cubit_cube_octet_params [] = -{ - { _tc_CORBA_Octet, PARAM_RETURN, 0 }, - { _tc_CORBA_Octet, PARAM_IN, 0 } -}; - - -static const TAO_Call_Data Cubit_cube_octet_calldata = -{ - "cube_octet", CORBA_B_TRUE, - 2, &Cubit_cube_octet_params [0], - 0, 0 -}; - - -CORBA_Octet -Cubit::Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env) -{ - CORBA_Octet retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_octet_calldata, - &retval, &o); - istub->Release (); - - return retval; -} - - -// -// CUBE SHORT -// - -static const TAO_Param_Data Cubit_cube_short_params [] = -{ - { _tc_CORBA_Short, PARAM_RETURN, 0 }, - { _tc_CORBA_Short, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_short_calldata = -{ - "cube_short", CORBA_B_TRUE, - 2, &Cubit_cube_short_params [0], - 0, 0 -}; - - -CORBA_Short -Cubit::Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env) -{ - CORBA_Short retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call(env, &Cubit_cube_short_calldata, - &retval, &s); - - istub->Release (); - - return retval; -} - -// -// CUBE LONG -// - -static const TAO_Param_Data Cubit_cube_long_params [] = -{ - { _tc_CORBA_Long, PARAM_RETURN, 0 }, - { _tc_CORBA_Long, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_long_calldata = -{ - "cube_long", CORBA_B_TRUE, - 2, &Cubit_cube_long_params [0], - 0, 0 -}; - - -CORBA_Long -Cubit::Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env) -{ - CORBA_Long retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_long_calldata, - &retval, &l); - istub->Release (); - - return retval; -} - - -// -// Encapsulated parameters for struct "Cubit_Many" typecode. -// None of these parameters is complicated, so this is just -// a linear sequence of element encodings -// -// NOTE: it's important that this be longword aligned!! -// -static const CORBA_Long _oc_Cubit_Many [] = -{ - 1, // byte order flag (TRICKY!) - - 1, 0, // empty string: repository/type ID - 1, 0, // empty string: struct name - - 3, // three struct elements - - // First structure element: name, typecode for Octet - 1, 0, // empty string: name "o" - tk_octet, - - // Second structure element: name, typecode for Long - 1, 0, // empty string: name "l" - tk_long, - - // Third structure element: name, typecode for Short - 1, 0, // empty string: name "s" - tk_short, -}; - -static CORBA_TypeCode _tc_Cubit_Many (tk_struct, - sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many; - - -// -// CUBE STRUCT -// - -static const TAO_Param_Data Cubit_cube_struct_params [] = -{ - { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) }, - { &_tc_Cubit_Many, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_struct_calldata = -{ - "cube_struct", CORBA_B_TRUE, - 2, &Cubit_cube_struct_params [0], - 0, 0 -}; - -Cubit_Many* -Cubit::Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env) -{ - Cubit_Many *retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_struct_calldata, - &retval, &values); - istub->Release (); - - return retval; -} - - -// -// CUBE UNION -// - -// -// NOTE: not all union typecodes can be encoded as an array -// of "long "values, but this one can. Ones with discriminants -// that are one or two bytes long can't easily be coded portably. -// -// The benefit of doing it as an array of "long" values is -// twofold: (a) easier to read; (b) on most systems it's then -// adequately aligned for the typecode interpreter to use, so -// no additional runtime copy needs to be made. -// -static const CORBA_Long _oc_Cubit_oneof [] = -{ - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "oneof" - - // - // discriminant typecode: - // - tk_enum, // tk_enum - 72, // encapsulation length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted enum name, "discrim" - 6, // 5 elements in the enum - - 1, 0, // omitted member name, "e_0th" - 1, 0, // omitted member name, "e_1st" - 1, 0, // omitted member name, "e_2nd" - 1, 0, // omitted member name, "e_3rd" - 1, 0, // omitted member name, "e_4th" - 1, 0, // omitted member name, "e_5th" - - 4, // default member index (zero based) - 5, // number of union members - - // the 1st union branch arm - e_0th, // member label value - 1, 0, // omitted member name, "o" - tk_octet, // member typecode - - // the 2nd union branch arm - e_1st, // member label value - 1, 0, // omitted member name, "s" - tk_short, // member typecode - - // the 3rd union branch arm - e_2nd, // member label value - 1, 0, // omitted member name, "l" - tk_long, // member typecode - - // the 4th union branch arm - e_3rd, // member label value - 1, 0, // omitted member name, "cm" - - // the 4th union member typecode - tk_struct, // tk_struct - 60, // encap length - - 1, // byte order flag (TRICKY) - 1, 0, // omitted repository/type ID - 1, 0, // omitted struct name, "Many" - 3, // three struct members - - // First structure element - 1, 0, // omitted member name, "o" - tk_octet, // member type, tk_octet - - // Second structure element - 1, 0, // omitted member name, "l" - tk_long, // member type, tk_long - - // Third structure element - 1, 0, // omitted member name, "s" - tk_short, // member type, tk_short - - // the 5th union branch arm - 4, // the 5th member label value - 1, 0, // omitted member name, "cm" - ~0, // indirected typecode (~0) - -84 // offset to struct "Many" typecode -}; - -static CORBA_TypeCode _tc_Cubit_oneof (tk_union, - (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof, - CORBA_B_FALSE); -CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof; - -static const TAO_Param_Data Cubit_cube_union_params [] = -{ - { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) }, - { &_tc_Cubit_oneof, PARAM_IN, 0 } -}; - -static const TAO_Call_Data Cubit_cube_union_calldata = -{ - "cube_union", CORBA_B_TRUE, - 2, &Cubit_cube_union_params [0], - 0, 0 -}; - -Cubit_oneof* -Cubit::Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env) -{ - Cubit_oneof *retval; - - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return 0; - } - - istub->do_call (env, &Cubit_cube_union_calldata, - &retval, &values); - istub->Release (); - - return retval; -} - - - -// -// PLEASE EXIT -// - -static const TAO_Call_Data Cubit_please_exit_calldata = -{ - "please_exit", CORBA_B_FALSE, - 0, 0, - 0, 0 -}; - -void -Cubit::Cubit_please_exit (CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } - - istub->do_call (env, &Cubit_please_exit_calldata); - istub->Release (); -} diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.h b/TAO/IIOP/tests/Cubit/TAO/cubitC.h deleted file mode 100644 index 98610b55116..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubitC.h +++ /dev/null @@ -1,104 +0,0 @@ -// $Id$ - -// @(#)cubitC.h 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation -***************************************************************************/ - -#ifndef _CUBIT_HH -#define _CUBIT_HH - -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ - -#include "corba/orb.h" -#include "corba/stub.h" - -#include <iostream.h> - -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; - -struct Cubit_Many -{ - CORBA_Octet o; - CORBA_Long l; - CORBA_Short s; -}; - -enum Cubit_discrim - { e_0th = 0, e_1st = 1, e_2nd = 2, - e_3rd = 3, e_4th = 4, e_5th = 5 }; - -struct Cubit_oneof -{ - Cubit_discrim _disc; - - union - { - CORBA_Octet o; - CORBA_Short s; - CORBA_Long l; - Cubit_Many cm; - }; -}; - -class Cubit; -typedef Cubit *Cubit_ptr; -typedef Cubit_ptr Cubit_ref; - -class Cubit : public virtual CORBA_Object -{ -public: - - static Cubit_ptr _duplicate(Cubit_ptr obj); - static Cubit_ptr _narrow(CORBA_Object_ptr obj); - static Cubit_ptr _nil(); - - virtual - CORBA_Octet Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env); - - virtual - CORBA_Short Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env); - - virtual - CORBA_Long Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env); - - virtual - Cubit_Many* Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env); - - virtual - Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env); - - virtual - void Cubit_please_exit (CORBA_Environment &env); - -protected: - Cubit() { } - Cubit(STUB_Object *objref) - : CORBA_Object(objref) { } - virtual ~Cubit() { } - - -}; - -extern const CORBA_Char *Cubit__id; // type ID - -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ - -#endif // _CUBIT_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp b/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp deleted file mode 100644 index bf77e70abd6..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp +++ /dev/null @@ -1,234 +0,0 @@ -// $Id$ - -// @(#)cubitS.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written C-style "Cubit" stubs and "skeletons" -// - -#include "cubitS.h" -#include "cubitC.cpp" - -#include "connect.h" -#include "params.h" - -#include "corba/debug.h" // ... and debugging -#include "corba/optable.h" // TAO Dynamic Operation Table -#include "method_db.i" -#include "iiopobj.h" - -#if defined(CUBIT_USE_DYNAMIC_HASH) -TAO_Dynamic_Hash_OpTable tao_cubit_optable(7); // Dynamic Operation Table -#else -TAO_Linear_OpTable tao_cubit_optable(7); -#endif - -_skel_Cubit::_skel_Cubit(const char* obj_name) -{ - const char* mn = "_skel_Cubit::_skel_Cubit()"; - - // Initialize Method Database - initialize_method_db (&tao_cubit_optable); - - char *type_id = "IDL:Cubit:1.0"; - // CORBA_String type_id = "IDL:Cubit:1.0"; - IIOP_Object *data; - - CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); - if (oa == 0) - { - // We just have to assume that oa will be good, or we have to - // throw an exception. For now we "assume", but we'll - ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to locate a valid object adapter\n", mn)); - return; - } - - this->optable_ = &tao_cubit_optable; - data = new IIOP_Object(type_id); - - 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+1); - - this->set_parent(data); - this->sub_ = this; - - if (oa->bind(data->profile.object_key, this) == -1) - { - ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to bind object to key '%s': %p\n", mn, data->profile.object_key.buffer)); - return; - } -} - -void -_skel_Cubit::_cube_octet_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_Octet); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_octet, add value"); - - req.params (nvlist, env); - dexc (env, "cube_octet, get params"); - - // Call Implementation - CORBA_Octet *value = new CORBA_Octet; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - - *value = the_cubit->Cubit_cube_octet(*(CORBA_Octet *)nv->value()->value(), env); - - CORBA_Any *any = new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_octet, result"); -} - -void -_skel_Cubit::_cube_short_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_Short); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_short, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_short, get params"); - - // Call Implementation - CORBA_Short *value = new CORBA_Short; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - *value = the_cubit->Cubit_cube_short(*(CORBA_Short *)nv->value ()->value (), env); - - CORBA_Any *any = new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_short, result"); -} - -void -_skel_Cubit::_cube_long_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_Long); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_long, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_long, get params"); - - // Call Implementation - CORBA_Long *value = new CORBA_Long; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - *value = the_cubit->Cubit_cube_long(*(CORBA_Long *)nv->value ()->value (), env); - - CORBA_Any *any = - new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_long, result"); -} - -void -_skel_Cubit::_cube_struct_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_Many); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_struct, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_struct, get params"); - - // Call Implementation - Cubit_Many *value; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - value = the_cubit->Cubit_cube_struct(*(Cubit_Many*)nv->value()->value(), env); - - Cubit_Many *retval = new Cubit_Many; - retval->o = (CORBA_Octet)value->o; - retval->s = (CORBA_Short)value->s; - retval->l = value->l; - - // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o); - // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s); - // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l); - - CORBA_Any *any = new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - -void -_skel_Cubit::_cube_union_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (TC_Cubit_oneof); - - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env); - dexc (env, "cube_union_3rd, add_value"); - - req.params (nvlist, env); - dexc (env, "cube_union_3rd, get params"); - - // Call Implementation - Cubit_oneof *v; - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - v = the_cubit->Cubit_cube_union(*(Cubit_oneof *)nv->value ()->value (), env); - - Cubit_oneof *r = new Cubit_oneof; - r->_disc = v->_disc; - r->o = (CORBA_Octet) (v->o); - r->s = (CORBA_Short) (v->s); - r->l = v->l; - r->cm.o = (CORBA_Octet) (v->cm.o); - r->cm.s = (CORBA_Short) (v->cm.s); - r->cm.l = v->cm.l; - - CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "cube_struct, result"); -} - -void -_skel_Cubit::_please_exit_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - Cubit *the_cubit = (Cubit*)obj->get_subclass(); - the_cubit->Cubit_please_exit(env); -} diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.h b/TAO/IIOP/tests/Cubit/TAO/cubitS.h deleted file mode 100644 index a4b4b853901..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubitS.h +++ /dev/null @@ -1,84 +0,0 @@ -// $Id$ - -// @(#)cubitS.h 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation -***************************************************************************/ - -#ifndef _SKEL_CUBIT_HH -#define _SKEL_CUBIT_HH - -#include "cubitC.h" - -class _skel_Cubit; -typedef _skel_Cubit *_skel_Cubit_ptr; -typedef _skel_Cubit_ptr _skel_Cubit_ref; - -class _skel_Cubit : public Cubit -{ -public: - virtual - CORBA_Octet Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env) = 0; - static - void _cube_octet_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - CORBA_Short Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env) = 0; - - static - void _cube_short_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - CORBA_Long Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env) = 0; - - static - void _cube_long_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - Cubit_Many* Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env) = 0; - - static - void _cube_struct_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env) = 0; - - static - void _cube_union_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - - virtual - void Cubit_please_exit (CORBA_Environment &env) = 0; - - static - void _please_exit_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); -protected: - _skel_Cubit(const char* obj_name = 0); - virtual ~_skel_Cubit() { } - -}; - -#endif // _SKEL_CUBIT_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp b/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp deleted file mode 100644 index ec3d3717768..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp +++ /dev/null @@ -1,93 +0,0 @@ -// $Id$ - -// @(#)cubit_i.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written Cubit Implementation -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include "cubit_i.h" - -#include <corba/boa.h> // ... and skeletons -#include <corba/debug.h> // ... and debugging - -#include "connect.h" -#include "params.h" - -Cubit_i::Cubit_i(const char* obj_name) -: _skel_Cubit(obj_name) -{ -} - -Cubit_i::~Cubit_i() -{ -} - -CORBA_Octet -Cubit_i::Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env) -{ - - return (CORBA_Octet) (o * o * o); -} - -CORBA_Short -Cubit_i::Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env) -{ - return (CORBA_Short) (s * s * s); -} - - -CORBA_Long -Cubit_i::Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env) -{ - return (CORBA_Long) (l * l * l); -} - -Cubit_Many* -Cubit_i::Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env) -{ - values.o = values.o * values.o * values.o; - values.s = values.s * values.s * values.s; - values.l = values.l * values.l * values.l; - - return &values; -} - -Cubit_oneof* -Cubit_i::Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env) -{ - switch (values._disc) { - case e_0th: - values.o = (CORBA_Octet) (values.o * values.o * values.o); - break; - case e_1st: - values.s = (CORBA_Short) (values.s * values.s * values.s); - break; - case e_2nd: - values.l = values.l * values.l * values.l; - break; - case e_3rd: - default: - values.cm.o = (CORBA_Octet) (values.cm.o * values.cm.o * values.cm.o); - values.cm.s = (CORBA_Short) (values.cm.s * values.cm.s * values.cm.s); - values.cm.l = values.cm.l * values.cm.l * values.cm.l; - } - return &values; -} - -void Cubit_i::Cubit_please_exit (CORBA_Environment &env) -{ - TAO_OA_Parameters* params = TAO_OA_PARAMS::instance(); - - dmsg ("I've been asked to shut down..."); - params->oa()->please_shutdown(env); - dexc (env, "please_exit, please_shutdown"); -} diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h b/TAO/IIOP/tests/Cubit/TAO/cubit_i.h deleted file mode 100644 index 7ddf1947cd3..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -// @(#)cubit_i.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: hand-written Cubit Implementation -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation -***************************************************************************/ - -#ifndef _CUBIT_I_HH -#define _CUBIT_I_HH - -#include "cubitS.h" - -class Cubit_i; -typedef Cubit_i *Cubit_i_ptr; -typedef Cubit_i_ptr Cubit_i_ref; - -class Cubit_i : public _skel_Cubit -{ -public: - Cubit_i(const char* obj_name = 0); - ~Cubit_i(); - - virtual - CORBA_Octet Cubit_cube_octet (CORBA_Octet o, - CORBA_Environment &env); - - virtual - CORBA_Short Cubit_cube_short (CORBA_Short s, - CORBA_Environment &env); - - virtual - CORBA_Long Cubit_cube_long (CORBA_Long l, - CORBA_Environment &env); - - virtual - Cubit_Many* Cubit_cube_struct (Cubit_Many &values, - CORBA_Environment &env); - - virtual - Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, - CORBA_Environment &env); - - virtual - void Cubit_please_exit (CORBA_Environment &env); -}; - -#endif // _CUBIT_I_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/method_db.i b/TAO/IIOP/tests/Cubit/TAO/method_db.i deleted file mode 100644 index a95573043ac..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/method_db.i +++ /dev/null @@ -1,69 +0,0 @@ -// $Id$ - -// @(#)method_db.i 05/14/97 - -// This file provides a way of initializing the method database -// Written by: Brian Mendel - -#include "cubitS.h" - -static void -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); - - 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(); - - if (ACE_OS::strcmp ((char*)value, "IDL:Cubit:1.0") == 0 - || ACE_OS::strcmp ((char *)value, _tc_CORBA_Object->id (env)) == 0) - retval = new CORBA_Boolean (CORBA_B_TRUE); - else - retval = new CORBA_Boolean (CORBA_B_FALSE); - - CORBA_Any *any = new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "_is_a, result"); -} - - -struct method_db -{ - CORBA_String opname; - TAO_Skeleton skel_ptr; -}; - -static const method_db cubit_operations[] = { - { "_is_a", &is_a_skel }, - { "cube_octet", &_skel_Cubit::_cube_octet_skel }, - { "cube_short", &_skel_Cubit::_cube_short_skel }, - { "cube_long", &_skel_Cubit::_cube_long_skel }, - { "cube_struct", &_skel_Cubit::_cube_struct_skel }, - { "cube_union", &_skel_Cubit::_cube_union_skel }, - { "please_exit", &_skel_Cubit::_please_exit_skel }, - { 0, 0 } -}; - - -void initialize_method_db (TAO_Operation_Table *the_optable) -{ - for (int ndx = 0; ndx < 7; ndx++) - the_optable->bind(cubit_operations[ndx].opname, - cubit_operations[ndx].skel_ptr); - -} diff --git a/TAO/IIOP/tests/Cubit/TAO/svr.cpp b/TAO/IIOP/tests/Cubit/TAO/svr.cpp deleted file mode 100644 index f96a537dbb4..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/svr.cpp +++ /dev/null @@ -1,214 +0,0 @@ -// $Id$ - -// @(#)svr.cpp 05/14/97 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: simple IIOP server for "cubit.idl" interface. -// -// Starts up, builds an objref, prints its string in debug mode, -// listens for messages, responds to them. -// -// Modified version of Cubit Example written by Sun Microsystems Inc. -// Modified by: Brian Mendel - -#include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" - -#include "corba/orb.h" -#include "corba/debug.h" -#include "connect.h" - -#include "cubit_i.h" - -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - -// Global Variables -CORBA_String key = (CORBA_String)"key0"; -int num_of_objs = 1; - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - ACE_Get_Opt opts (argc, argv, "dk:n:"); - int c; - - while ((c = opts ()) != -1) - switch (c) { - - case 'd': // debug flag - TAO_debug_level++; - continue; - - case 'k': // key (str) - key = (CORBA_String) opts.optarg; - continue; - - case 'n': // idle seconds b4 exit - num_of_objs = ACE_OS::atoi(opts.optarg); - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-k {object_key}]" - "\n", argv [0] - ); - return 1; - } - - return 0; // Indicates successful parsing of command line -} - - -// -// Standard command line parsing utilities used. -// -int -main (int argc, char *argv[]) -{ - CORBA_Environment env; - CORBA_Object_ptr obj = 0; - CORBA_ORB_ptr orb_ptr; - CORBA_BOA_ptr oa_ptr; - char *orb_name = "internet"; - int idle = -1; - - orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env); - if (env.exception () != 0) { - print_exception (env.exception (), "ORB init"); - return 1; - } - - // Initialize the Basic Object Adapter - oa_ptr = orb_ptr->BOA_init(argc, argv, "ROA"); - if (oa_ptr == 0) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to initialize the BOA.\n"), 1); - - - // - // Parse remaining command line and verify parameters. - // - parse_args(argc, argv); - - // Create implementation object with user specified key - Cubit_i_ptr *my_cubit = new Cubit_i_ptr[num_of_objs]; - for (int ndx = 0; ndx < num_of_objs; ndx++) - { - CORBA_String obj_str = CORBA_string_alloc(ACE_OS::strlen ((char *)key)+2); - sprintf(obj_str, "%s%d", (char*)key, ndx); - my_cubit[ndx] = new Cubit_i(obj_str); - if (my_cubit[ndx] == 0) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object&d\n", ndx), 2); - - if (TAO_debug_level >= 1) - { - // Why are we getting the BOA_ptr from here when we've already - // got it above? - CORBA_OctetSeq obj_key; - obj_key.buffer = (CORBA_Octet *) obj_str; - obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str); - - if (oa_ptr->find(obj_key, obj) == -1) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3); - - // - // Stringify the objref we'll be implementing, and - // print it to stdout. Someone will take that string - // and give it to some client. Then release the object. - // - CORBA_String str; - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("Object Created at: '%ul'", obj); - dmsg1 ("listening as object '%s'", str); - - } - CORBA_string_free(obj_str); - } -// Cubit_i_ptr my_cubit = new Cubit_i(key); -// if (my_cubit1 == 0) -// ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object\n"), 2); - -/* if (TAO_debug_level >= 1) - { - // Why are we getting the BOA_ptr from here when we've already - // got it above? - CORBA_OctetSeq obj_key; - obj_key.buffer = (CORBA_Octet *) key; - obj_key.length = obj_key.maximum = ACE_OS::strlen ((char *)key); - - if (oa_ptr->find(obj_key, obj) == -1) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3); - - // - // Stringify the objref we'll be implementing, and - // print it to stdout. Someone will take that string - // and give it to some client. Then release the object. - // - CORBA_String str; - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("listening as object '%s'", str); - - obj_key.buffer = (CORBA_Octet *)"key1"; - obj_key.length = obj_key.maximum = 4; - if (oa_ptr->find(obj_key, obj) == -1) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3); - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("listening as object '%s'", str); - } -*/ - // Handle requests for this object until we're killed, or one of - // the methods asks us to exit. - // - int terminationStatus = 0; - - -#if !defined(USE_HOMEBREW_EVENT_LOOP) - ACE_Reactor::run_event_loop(); -#else - while (1) - { - int result = params->reactor()->handle_events (); - - if (result == -1) - { - terminationStatus = -1; - break; - } - } -#endif - - // - // Shut down the OA -- recycles all underlying resources (e.g. file - // descriptors, etc). - // - oa_ptr->clean_shutdown (env); - return 0; -} diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mak b/TAO/IIOP/tests/Cubit/TAO/test.mak deleted file mode 100644 index 58b77c28283..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/test.mak +++ /dev/null @@ -1,463 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-!IF "$(CFG)" == ""
-CFG=server - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to server - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\
- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "server - Win32 Debug"
-RSC=rc.exe
-CPP=cl.exe
-
-!IF "$(CFG)" == "client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "client\Release"
-# PROP BASE Intermediate_Dir "client\Release"
-# PROP BASE Target_Dir "client"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir "client"
-OUTDIR=.
-INTDIR=.\Release
-
-ALL : "$(OUTDIR)\client.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\clnt.obj"
- -@erase "$(INTDIR)\cubitC.obj"
- -@erase "$(OUTDIR)\client.exe"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\
- /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe"
-LINK32_OBJS= \
- "$(INTDIR)\clnt.obj" \
- "$(INTDIR)\cubitC.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "client\Debug"
-# PROP BASE Intermediate_Dir "client\Debug"
-# PROP BASE Target_Dir "client"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir "client"
-OUTDIR=.
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\client.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\clnt.obj"
- -@erase "$(INTDIR)\cubitC.obj"
- -@erase "$(INTDIR)\vc40.idb"
- -@erase "$(INTDIR)\vc40.pdb"
- -@erase "$(OUTDIR)\client.exe"
- -@erase "$(OUTDIR)\client.ilk"
- -@erase "$(OUTDIR)\client.pdb"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe"
-LINK32_OBJS= \
- "$(INTDIR)\clnt.obj" \
- "$(INTDIR)\cubitC.obj"
-
-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "server - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "server\Release"
-# PROP BASE Intermediate_Dir "server\Release"
-# PROP BASE Target_Dir "server"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir "server"
-OUTDIR=.
-INTDIR=.\Release
-
-ALL : "$(OUTDIR)\server.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\cubit_i.obj"
- -@erase "$(INTDIR)\cubitS.obj"
- -@erase "$(INTDIR)\svr.obj"
- -@erase "$(OUTDIR)\server.exe"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\
- /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe"
-LINK32_OBJS= \
- "$(INTDIR)\cubit_i.obj" \
- "$(INTDIR)\cubitS.obj" \
- "$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "server - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "server\Debug"
-# PROP BASE Intermediate_Dir "server\Debug"
-# PROP BASE Target_Dir "server"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir "server"
-OUTDIR=.
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\server.exe"
-
-CLEAN :
- -@erase "$(INTDIR)\cubit_i.obj"
- -@erase "$(INTDIR)\cubitS.obj"
- -@erase "$(INTDIR)\svr.obj"
- -@erase "$(INTDIR)\vc40.idb"
- -@erase "$(INTDIR)\vc40.pdb"
- -@erase "$(OUTDIR)\server.exe"
- -@erase "$(OUTDIR)\server.ilk"
- -@erase "$(OUTDIR)\server.pdb"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\
- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe"
-LINK32_OBJS= \
- "$(INTDIR)\cubit_i.obj" \
- "$(INTDIR)\cubitS.obj" \
- "$(INTDIR)\svr.obj"
-
-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-.c{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.cpp{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.cxx{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
-
-.c{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-.cpp{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-.cxx{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
-
-################################################################################
-# Begin Target
-
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
-
-!IF "$(CFG)" == "client - Win32 Release"
-
-!ELSEIF "$(CFG)" == "client - Win32 Debug"
-
-!ENDIF
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\clnt.cpp
-DEP_CPP_CLNT_=\
- "..\..\..\..\..\ace\config-win32.h"\
- ".\cubitC.h"\
- {$(INCLUDE)}"\ace\ACE.h"\
- {$(INCLUDE)}"\ace\ACE.i"\
- {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
- {$(INCLUDE)}"\ace\Auto_Ptr.h"\
- {$(INCLUDE)}"\ace\Auto_Ptr.i"\
- {$(INCLUDE)}"\ace\config-win32-common.h"\
- {$(INCLUDE)}"\ace\config.h"\
- {$(INCLUDE)}"\ace\Get_Opt.h"\
- {$(INCLUDE)}"\ace\Get_Opt.i"\
- {$(INCLUDE)}"\ace\Log_Msg.h"\
- {$(INCLUDE)}"\ace\Log_Priority.h"\
- {$(INCLUDE)}"\ace\Log_Record.h"\
- {$(INCLUDE)}"\ace\Log_Record.i"\
- {$(INCLUDE)}"\ace\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\SString.h"\
- {$(INCLUDE)}"\ace\SString.i"\
- {$(INCLUDE)}"\ace\stdcpp.h"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-NODEP_CPP_CLNT_=\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
-
-
-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cubitC.cpp
-DEP_CPP_CUBIT=\
- ".\cubitC.h"\
-
-NODEP_CPP_CUBIT=\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
-
-
-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"
-
-
-# End Source File
-# End Target
-################################################################################
-# Begin Target
-
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
-
-!IF "$(CFG)" == "server - Win32 Release"
-
-!ELSEIF "$(CFG)" == "server - Win32 Debug"
-
-!ENDIF
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\cubitS.cpp
-DEP_CPP_CUBITS=\
- ".\cubitC.cpp"\
- ".\cubitC.h"\
- ".\cubitS.h"\
- ".\method_db.i"\
-
-NODEP_CPP_CUBITS=\
- ".\connect.h"\
- ".\corba\debug.h"\
- ".\corba\optable.h"\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
- ".\iiopobj.h"\
- ".\params.h"\
-
-
-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cubit_i.cpp
-DEP_CPP_CUBIT_=\
- ".\cubit_i.h"\
- ".\cubitC.h"\
- ".\cubitS.h"\
-
-NODEP_CPP_CUBIT_=\
- ".\connect.h"\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
- ".\params.h"\
-
-
-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\svr.cpp
-DEP_CPP_SVR_C=\
- "..\..\..\..\..\ace\config-win32.h"\
- ".\cubit_i.h"\
- ".\cubitC.h"\
- ".\cubitS.h"\
- {$(INCLUDE)}"\ace\ACE.h"\
- {$(INCLUDE)}"\ace\ACE.i"\
- {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
- {$(INCLUDE)}"\ace\Auto_Ptr.h"\
- {$(INCLUDE)}"\ace\Auto_Ptr.i"\
- {$(INCLUDE)}"\ace\config-win32-common.h"\
- {$(INCLUDE)}"\ace\config.h"\
- {$(INCLUDE)}"\ace\Get_Opt.h"\
- {$(INCLUDE)}"\ace\Get_Opt.i"\
- {$(INCLUDE)}"\ace\Log_Msg.h"\
- {$(INCLUDE)}"\ace\Log_Priority.h"\
- {$(INCLUDE)}"\ace\Log_Record.h"\
- {$(INCLUDE)}"\ace\Log_Record.i"\
- {$(INCLUDE)}"\ace\Object_Manager.h"\
- {$(INCLUDE)}"\ace\Object_Manager.i"\
- {$(INCLUDE)}"\ace\OS.h"\
- {$(INCLUDE)}"\ace\OS.i"\
- {$(INCLUDE)}"\ace\SString.h"\
- {$(INCLUDE)}"\ace\SString.i"\
- {$(INCLUDE)}"\ace\stdcpp.h"\
- {$(INCLUDE)}"\ace\Trace.h"\
- {$(INCLUDE)}"\ace\ws2tcpip.h"\
-
-NODEP_CPP_SVR_C=\
- ".\connect.h"\
- ".\corba\debug.h"\
- ".\corba\orb.h"\
- ".\corba\stub.h"\
-
-
-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"
-
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mdp b/TAO/IIOP/tests/Cubit/TAO/test.mdp Binary files differdeleted file mode 100644 index eccc5e94b69..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/test.mdp +++ /dev/null diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.cpp b/TAO/IIOP/tests/Cubit/TAO/test1.cpp deleted file mode 100644 index 753a3784e43..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/test1.cpp +++ /dev/null @@ -1,392 +0,0 @@ -// $Id$ - -// @(#)test1.cpp 1.4 95/09/28 -// Copyright 1995 by Sun Microsystems, Inc. -// All Rights Reserved -// -// TEST stubs for "test1" -// - -#include <stdio.h> - -#include "test1.h" - - -// -// Define all the stubs ... it's a lot less error prone to do it with -// macros than by hand! -// -// NOTE: the "calldata" is exported for use by the skeletons. At some -// point skeletons will probably be fully abstracted; for now they aren't. -// -// Also, for some reason, name mangling is changed by the explicit -// declaration as "extern" -- if it's not done, linking fails. -// -#define DEFINE_TEST3(typename, truetype, truetypename) \ - static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \ - { _tc_CORBA_ ## truetypename, PARAM_RETURN, 0 }, \ - { _tc_CORBA_ ## truetypename, PARAM_IN, 0 }, \ - { _tc_CORBA_ ## truetypename, PARAM_OUT, 0 }, \ - { _tc_CORBA_ ## truetypename, PARAM_INOUT, 0 }, \ - }; \ - \ - extern const TAO_Call_Data test1_ ## typename ## _calldata; \ - \ - const TAO_Call_Data test1_ ## typename ## _calldata = { \ - "test_" #typename, CORBA_B_TRUE, \ - 4, &test1_ ## typename ## _paramdata [0], \ - 0, 0, \ - }; \ - \ - CORBA_ ## truetype \ - test1_test_ ## typename (test1_ptr target, \ - CORBA_ ## truetype in_a1, \ - CORBA_ ## truetype &out_a2, \ - CORBA_ ## truetype &inout_a3, \ - CORBA_Environment &env) { \ - CORBA_ ## truetype _retval; \ - STUB_Object *_obj; \ - if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \ - != NOERROR) \ - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); \ - else { \ - _obj->do_call (env, &test1_ ## typename ## _calldata, \ - &_retval, &in_a1, &out_a2, &inout_a3); \ - _obj->Release (); \ - } \ - return _retval; \ - } - -// changed extern const calldata test1_ ## typename ## _calldata; -// to const calldata test1_ ## typename ## _calldata; \ - -// changed CORBA_ ## truetype _retval = 0; to changed CORBA_ ## truetype _retval; - -#define DEFINE_TEST(typename, truetype) \ - DEFINE_TEST3(typename, truetype, truetype) - - -// -// Generate a system exception, passing an operation ID that's -// not allowed by IIOP (much less this interface) and verifying -// that the server returns some kind of system exception. -// -static const TAO_Call_Data illegal_calldata = { - "+_illegal", CORBA_B_TRUE, - 0, 0, - 0, 0 -}; - -void -test_illegal (test1_ptr target, CORBA_Environment &env) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &illegal_calldata - ); - data->Release (); - } -} - - -extern const TAO_Call_Data test1_void_calldata; -const TAO_Call_Data test1_void_calldata = { - "test_void", CORBA_B_TRUE, - 0, 0, - 0, 0 -}; - -void -test1_test_void (test1_ptr target, CORBA_Environment &env) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &test1_void_calldata - ); - data->Release (); - } -} - -DEFINE_TEST (short, Short); -DEFINE_TEST (long, Long); -DEFINE_TEST (ushort, UShort); -DEFINE_TEST (ulong, ULong); - -#if defined(MIPS) -// -// NOTE: C/C++ compilers as a rule pass a "float" in the space that -// a "double" takes up. Conversions are evidently optional; portability -// forces the following "explicit temporary" hack to work on at least -// one MIPS platform, which converts the parameter to "double" and -// hence changes the binary representation. (Even if that is a compiler -// bug, it's probably required by now for binary compatibility!) -// -// A "-k ansi" compiler flag may be needed to get correct behaviour; -// passing the "in" parameters by reference apparently works too. At -// this time, none of these solutions is used by default. -// -// This stub-level hackery seems like it could be replaced inside of the -// stub interpreter, which could just manually convert "float" parameters -// (all of them) as special cases. But of course, that would slow the -// interpreter down on _every_ call, not just the ones that require it -// (such as this one). Tradeoffs! -// -static const TAO_Param_Data test1_float_paramdata [4] = { - { _tc_CORBA_Float , PARAM_RETURN , 0 }, - { _tc_CORBA_Float , PARAM_IN , 0 }, - { _tc_CORBA_Float , PARAM_OUT , 0 }, - { _tc_CORBA_Float , PARAM_INOUT , 0 } -}; - -extern const TAO_Call_Data test1_float_calldata; - -const TAO_Call_Data test1_float_calldata = { - "test_float", CORBA_B_TRUE, - 4 , &test1_float_paramdata [0], - 0 , 0 -}; - -CORBA_Float -test1_test_float ( - test1_ptr target, - CORBA_Float in_a1, - CORBA_Float &out_a2, - CORBA_Float &inout_a3, - CORBA_Environment &env -) -{ - CORBA_Float _retval; - - // These three temporaries required due to MIPS compiler bug - CORBA_Float _in_a1 = in_a1; - CORBA_Float _out_a2 = out_a2; - CORBA_Float _inout_a3 = inout_a3; - - target -> data -> do_call (env, - &test1_float_calldata, - &_retval, - &_in_a1, - &_out_a2, - &_inout_a3); - return _retval; -} - -#else -DEFINE_TEST (float, Float); -#endif // MIPS - - -DEFINE_TEST (double, Double); -DEFINE_TEST (boolean, Boolean); -DEFINE_TEST (char, Char); -DEFINE_TEST (octet, Octet); - -/* -CORBA_Any * -test1_test_any (test1_ptr target, - const CORBA_Any &in_a1, - CORBA_Any *&out_a2, - CORBA_Any &inout_a3, - CORBA_Environment &env) -{ - // XXX implement this stub! ... annoying that C++ mapping - // calls for so much special casing -} -*/ - - -DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode); -DEFINE_TEST3 (Principal, Principal_ptr, Principal); -DEFINE_TEST3 (Object, Object_ptr, Object); - -// NOTE: C++ mapping has "in" strings as "const", which doesn't -// show up in this macro ... -DEFINE_TEST3 (string, Char *, String); - -DEFINE_TEST (longlong, LongLong); -DEFINE_TEST (ulonglong, ULongLong); -DEFINE_TEST (wchar, WChar); - -// NOTE: C++ mapping has "in" strings as "const", which doesn't -// show up in this macro ... -DEFINE_TEST3 (wstring, WChar *, WString); - -#if !defined(NONNATIVE_LONGDOUBLE) -DEFINE_TEST (longdouble, LongDouble); -#endif - -#undef DEFINE_TEST - - -// -// Utility macros used to construct octet codes that are aligned -// on longword boundaries, and with a known byte order. This -// happens to use big endian encoding since it was convenient. -// (Longword alignment is a happy accident of the specification -// of OMG-IDL ... it could have been much worse!) -// -// It'd be much simpler to lay out such data in assembler! -// - -#if defined (WORDS_BIGENDIAN) -# define MAKE_BIG_LONG(a,b,c,d) \ - ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \ - | (((c) & 0xff) << 8) | ((d) & 0xff)) -# define BIG_ENDIAN_LONG(x) (x) - -#else // LITTLE_ENDIAN -# define MAKE_BIG_LONG(a,b,c,d) \ - ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \ - | (((b) & 0xff) << 8) | ((a) & 0xff)) -# define BYTE_FROM(n,integer) (((integer)>>(8*(n)))&0xff) -# define BIG_ENDIAN_LONG(integer) \ - MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\ - BYTE_FROM(1,integer), BYTE_FROM(0,integer)) -#endif - - - -// -// "x1" exception typecode ... must be longword aligned -// -static CORBA_Long oc_x1 [] = { - 0, // big endian flag + padding - BIG_ENDIAN_LONG (29), // length of ID string + NUL - MAKE_BIG_LONG ('I', 'D', 'L', ':'), // bytes of ID string - MAKE_BIG_LONG ('E', 'n', 'g', '.'), - MAKE_BIG_LONG ('S', 'U', 'N', '.'), - MAKE_BIG_LONG ('C', 'O', 'M', '/'), - MAKE_BIG_LONG ('t', 'e', 's', 't'), - MAKE_BIG_LONG ('1', '/', 'x', '1'), - MAKE_BIG_LONG (':', '1', '.', '0'), - 0, - BIG_ENDIAN_LONG (1), // (empty) namelen + NUL - 0, - BIG_ENDIAN_LONG (1), // only one struct member - BIG_ENDIAN_LONG (1), // (empty) member name + NUL - 0, - BIG_ENDIAN_LONG (tk_long) -}; -static CORBA_TypeCode tc_x1 (tk_except, sizeof oc_x1, - (unsigned char *)&oc_x1, CORBA_B_FALSE); -CORBA_TypeCode_ptr _tc_test1_x1 = &tc_x1; - - - -// -// "x2" exception typecode ... must be longword aligned -// -static CORBA_Long oc_x2 [] = { - 0, // big endian flag + padding - BIG_ENDIAN_LONG (29), // length of ID string + NUL - MAKE_BIG_LONG ('I', 'D', 'L', ':'), // bytes of ID string - MAKE_BIG_LONG ('E', 'n', 'g', '.'), - MAKE_BIG_LONG ('S', 'U', 'N', '.'), - MAKE_BIG_LONG ('C', 'O', 'M', '/'), - MAKE_BIG_LONG ('t', 'e', 's', 't'), - MAKE_BIG_LONG ('1', '/', 'x', '2'), - MAKE_BIG_LONG (':', '1', '.', '0'), - 0, - BIG_ENDIAN_LONG (1), // (empty) namelen + NUL - 0, - BIG_ENDIAN_LONG (2), // two struct members - - BIG_ENDIAN_LONG (1), // (empty) member name + NUL - 0, - BIG_ENDIAN_LONG (tk_objref), - BIG_ENDIAN_LONG (29), // type ID + NUL - MAKE_BIG_LONG ('I', 'D', 'L', ':'), // bytes of ID string - MAKE_BIG_LONG ('o', 'm', 'g', '.'), - MAKE_BIG_LONG ('o', 'r', 'g', '/'), - MAKE_BIG_LONG ('C', 'O', 'R', 'B'), - MAKE_BIG_LONG ('A', '/', 'O', 'b'), - MAKE_BIG_LONG ('j', 'e', 'c', 't'), - MAKE_BIG_LONG (':', '1', '.', '0'), - 0, - - BIG_ENDIAN_LONG (1), // (empty) member name + NUL - 0, - BIG_ENDIAN_LONG (tk_long) -}; -static CORBA_TypeCode tc_x2 (tk_except, sizeof oc_x2, - (unsigned char *)&oc_x2, CORBA_B_FALSE); -CORBA_TypeCode_ptr _tc_test1_x2 = &tc_x2; - - -// -// parameter, exception, and call descriptions for "test_throw" -// -static const TAO_Param_Data test1_test_throw_paramdata [1] = { - { _tc_CORBA_Long, PARAM_IN, 0 } -}; - -static CORBA_TypeCode_ptr test1_test_throw_excepts [2] = { - &tc_x1, &tc_x2 -}; - -extern const TAO_Call_Data test1_test_throw_calldata; - -const TAO_Call_Data test1_test_throw_calldata = { - "test_throw", CORBA_B_TRUE, - 1, &test1_test_throw_paramdata [0], - 2, &test1_test_throw_excepts [0] -}; - -// -// "test_throw" stub -// -void -test1_test_throw ( - test1_ptr target, - CORBA_Long case_num, - CORBA_Environment &env // throw (x1, x2) -) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &test1_test_throw_calldata, - &case_num); - data->Release (); - } -} - -// -// PLEASE EXIT -// - -static const TAO_Call_Data test1_please_exit_calldata = { - "please_exit", CORBA_B_FALSE, - 0, 0, - 0, 0 -}; - -void -test1_please_exit ( - test1_ptr target, - CORBA_Environment &env -) -{ - STUB_Object *data; - - if (target->QueryInterface (IID_STUB_Object, (void **)&data) - != NOERROR) - env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); - else { - data->do_call (env, &test1_please_exit_calldata - ); - data->Release (); - } -} - diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.h b/TAO/IIOP/tests/Cubit/TAO/test1.h deleted file mode 100644 index 63e409d36c3..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/test1.h +++ /dev/null @@ -1,126 +0,0 @@ -// $Id$ - -// @(#)test1.hh 1.2 95/09/12 -// Copyright 1995 by Sun Microsystems, Inc. -// All Rights Reserved -// -// TEST interface for "test1" -// - -#ifndef _TEST1_HH -#define _TEST1_HH - -#include <corba/orb.h> -#include <corba/stub.h> - - -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ - -typedef CORBA_UShort test1_ushort; -typedef CORBA_ULong test1_ulong; - -typedef CORBA_LongLong test1_longlong; -typedef CORBA_ULongLong test1_ulonglong; -typedef CORBA_LongDouble test1_longdouble; - -typedef CORBA_Object test1; -typedef test1 *test1_ptr; - -#define DECL_TEST(typename, truetype) \ - truetype \ - test1_test_ ## typename ( \ - test1_ptr target, \ - truetype in_a1, \ - truetype &out_a2, \ - truetype &inout_a3, \ - CORBA_Environment &env \ - ) - -void test_illegal (test1_ptr target, CORBA_Environment &env); -void test1_test_void (test1_ptr target, CORBA_Environment &env); - -DECL_TEST (short, CORBA_Short); -DECL_TEST (long, CORBA_Long); -DECL_TEST (ushort, CORBA_UShort); -DECL_TEST (ulong, CORBA_ULong); -DECL_TEST (float, CORBA_Float); -DECL_TEST (double, CORBA_Double); -DECL_TEST (boolean, CORBA_Boolean); -DECL_TEST (char, CORBA_Char); -DECL_TEST (octet, CORBA_Octet); - -CORBA_Any * -test1_test_any ( - test1_ptr target, - const CORBA_Any &in_a1, - CORBA_Any *&out_a2, - CORBA_Any &inout_a3, - CORBA_Environment &env -); - -DECL_TEST (TypeCode, CORBA_TypeCode_ptr); -DECL_TEST (Principal, CORBA_Principal_ptr); -DECL_TEST (Object, CORBA_Object_ptr); - -// NOTE: CORBA C++ mapping says the "in" string is const -DECL_TEST (string, CORBA_String); - -DECL_TEST (longlong, CORBA_LongLong); -DECL_TEST (ulonglong, CORBA_ULongLong); -DECL_TEST (wchar, CORBA_WChar); - -// NOTE: CORBA C++ mapping says the "in" string is const -DECL_TEST (wstring, CORBA_WString); - -DECL_TEST (longdouble, CORBA_LongDouble); - -#undef DECL_TEST - -extern CORBA_TypeCode_ptr _tc_test1_x1; - -class test1_x1 : public CORBA_UserException { - public: - CORBA_Long case_num; - - test1_x1 (CORBA_Long n) - : CORBA_UserException (_tc_test1_x1), case_num (n) - { } -}; - -extern CORBA_TypeCode_ptr _tc_test1_x2; - -class test1_x2 : public CORBA_UserException { - public: - CORBA_Object_ptr obj; - CORBA_Long case_num; - - test1_x2 (CORBA_Object_ptr obj1, - CORBA_Long n) - : CORBA_UserException (_tc_test1_x2), - obj (obj1), case_num (n) { } - - ~test1_x2 () - { CORBA_release (obj); } -}; - -void -test1_test_throw ( - test1_ptr target, - CORBA_Long case_num, - CORBA_Environment &env // throw (x1, x2) -); - -void -test1_please_exit ( - test1_ptr target, - CORBA_Environment &env -); - -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ - -#endif // _TEST1_HH - diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.idl b/TAO/IIOP/tests/Cubit/TAO/test1.idl deleted file mode 100644 index d47ab676ef5..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/test1.idl +++ /dev/null @@ -1,80 +0,0 @@ -// $Id$ - -// @(#)test1.idl 1.1 95/09/11 -// Copyright 1994-1995 by Sun Microsystems, Inc. -// -// TEST basic marshaling tests for all IDL primitive types, modes -// -// This test omits constructed types (struct, union, enum, sequence, and -// array types), and only tests very simple user defined exceptions. -// -// Values returned are well defined functions of the input values: -// -// * For numeric types (octet, short, long, longlong, float, double, -// longdouble, and unsigned variants) the value is cubed. -// * For Boolean, it's the negation. -// * For Any, TypeCode, Principal, Object, char and wchar, -// string and wstring, it's the input value. -// -// The "return" and "out" parameter is the function of the "in" parameter; -// the "inout" parameter is the function of its original value. -// -// The "echo" test has all output values be the input values, with no -// changes to the bit patterns originally transmitted. While easier to -// use to identify some kinds of problem, it is not as complete a test. -// - -#define DECL_TEST(type) \ - type test_ ## type ( in type a1, out type a2, inout type a3) - -#pragma prefix "Eng.SUN.COM" // only for Sun-defined interfaces - -interface test1 { - void test_void (); - - typedef unsigned short ushort; - typedef unsigned long ulong; - - typedef long long longlong; - typedef unsigned long long ulonglong; - typedef long double longdouble; - - DECL_TEST (short); - DECL_TEST (long); - DECL_TEST (ushort); - DECL_TEST (ulong); - DECL_TEST (float); - DECL_TEST (double); - DECL_TEST (boolean); - DECL_TEST (char); - DECL_TEST (octet); - DECL_TEST (any); - DECL_TEST (TypeCode); - DECL_TEST (Principal); - DECL_TEST (Object); // CORBA::Object - DECL_TEST (string); // unbounded string - - DECL_TEST (longlong); - DECL_TEST (ulonglong); - DECL_TEST (wchar); - DECL_TEST (wstring); // unbounded wstring - DECL_TEST (longdouble); - - // - // All cases, "case_num" in the exception is the same as the 'in' param - // * negative or zero, throws x1 - // * positive even cases, throws x2 with obj = null objref - // * positive odd cases, throws x2 with obj = target objref - // - exception x1 { long case_num; }; - exception x2 { Object obj; long case_num; }; - - void test_throw (in long case_num) raises (x1, x2); - - // - // Aid for test cleanup in case server's not told to quit after - // being idle for some time period - // - oneway void please_exit (); -}; - diff --git a/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp b/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp deleted file mode 100644 index 85853f13c8f..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp +++ /dev/null @@ -1,680 +0,0 @@ -// $Id$ - -// @(#)test1_clnt.cpp 1.5 95/09/24 -// Copyright 1995 by Sun Microsystems, Inc. -// All Rights Reserved -// -// TEST client driver for "test1" -// - -#ifdef USE_IOSTREAM -#include <iostream.h> -#endif - -#include <stdio.h> -#include <string.h> -#include <ace/Get_Opt.h> - -#if unix -# include <unistd.h> - -#else // windows - -#endif // unix - -#include "test1.h" -#include <corba/debug.h> - - -#if !defined (_WIN32) -extern char *optarg; // missing on some platforms -#endif - -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - -// All tests are specified so that the return value and "out" (second) -// parameters are easily tested functions of the "in" (first) -// parameter, and the "inout" (third) parameter is the same function -// the its initial value. Caller is expected to specify two different -// "in" values. This helps make the marshaled bits vary, and turn up -// a class of potential problems that'd be hidden if parameter order -// had no effect on the test. -// -// PERFORM_TEST calls a test for a given type, reporting in cases -// where the ORB or operation failed. The COMPARE symbol can be -// redefined to achieve different functions -- e.g. cubing numbers, -// identity, negation, etc. It should return true iff the correct -// result was returned. -// -// BAD_COMPARE_VALUES is to produce diagnostics when a test fails, -// showing the actual and expected values of returned parameters. -// This helps diagnose specific porting problems. -// -// The RELEASE symbol may be defined to free memory, eliminating -// client side memory leaks in the test. -// -#define RELEASE(X) // NOP by default -#define PERFORM_TEST(name,type,value1,value2) \ - { \ - CORBA_ ## type v1, v2, v3; \ - \ - v1 = (CORBA_ ## type)(value1); \ - v2 = 0; \ - v3 = (CORBA_ ## type)(value2); \ - \ - test_count++; \ - v1 = test1_test_ ## name (target, v1, v2, v3, env); \ - if (env.exception () != 0) { \ - print_exception (env.exception (), "perform test_" #name); \ - error_count++; \ - } else if (!COMPARE (CORBA_ ## type, v1, value1) \ - || !COMPARE (CORBA_ ## type, v2, value1) \ - || !COMPARE (CORBA_ ## type, v3, value2) ) { \ - ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \ - BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \ - error_count++; \ - } \ - RELEASE (v1); RELEASE (v2); RELEASE (v3); \ - } - -// -// This messing about is because the ostream op << cannot always -// be used with all kinds of data ... e.g. LongDouble, TypeCode. -// -#ifdef USE_IOSTREAM -# define DO_IO(x) x -#else -# define DO_IO(x) -#endif -#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \ - DO_IO( cerr << " v1=" << v1; \ - cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \ - cerr << " v2=" << v2; \ - cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \ - cerr << " v3=" << v3; \ - cerr << " expecting " << EXPVAL(CORBA_ ## type, value2) << "\n"); -#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \ - BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) - -// test utility -- should be able to just use is_equivalent() directly -// but this implementation uses null pointers for nil, so this must -// check for nulls first. (May be noncompliant with C++ mapping!) - -static CORBA_Boolean -compare_objrefs (CORBA_Object_ptr v1, - CORBA_Object_ptr v2) -{ - CORBA_Boolean temp; - CORBA_Environment env; - - if (v1 == v2) - return CORBA_B_TRUE; - - if (CORBA_is_nil (v1)) - return CORBA_is_nil (v2); - - temp = v1->_is_equivalent (v2, env); - - if (env.exception () != 0) - { - print_exception (env.exception (), "compare objref"); - return CORBA_B_FALSE; - } - return temp; -} - - -// -// Helper routine to help sure math (especially for floating point) -// gets done correctly. -// -template <class Type> -Type cube (Type arg) -{ - Type temp = arg; - - temp = temp * arg; - temp = temp * arg; - return temp; -} - -static int skip_longdouble = 0; - -// This just performs the tests ... - -void -do_tests (test1_ptr target, - unsigned loop_count, - unsigned &test_count, - unsigned &error_count) -{ - int count; - - for (count = 0; count < loop_count; count++) - { - CORBA_Environment env; - CORBA_Environment env2; // XXX - - // - // test_void - // - test_count++; - test1_test_void (target, env); - if (env.exception () != 0) - { - print_exception (env.exception (), "perform test_void"); - error_count++; - } - - // - // Numeric tests ... try some variety in computation, no real - // rationale in the choice of initial parameter values except - // not to use the same values all the time. - // -#define EXPVAL(type,original_value) ((type) cube((type)(original_value))) -#define COMPARE(type,retval,original_value) \ - ((retval) == EXPVAL(type, original_value)) - - PERFORM_TEST (octet, Octet, count + 29, count - 22); - - PERFORM_TEST (short, Short, count - 23, count + 19); - PERFORM_TEST (ushort, UShort, count + 23, count - 19); - - PERFORM_TEST (long, Long, count - 17, count + 20); - PERFORM_TEST (ulong, ULong, count + 17, count - 20); - -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... - PERFORM_TEST (longlong, LongLong, count - 177, count + 3); - PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3); -#endif // !NONNATIVE_LONGLONG - -#if !defined (i386) - // - // XXX not sure what's wrong with the COMPARE macro with respect to - // floating point on x86, since fprintf shows the values basically - // look correct ... but these float/double tests fail. - // - PERFORM_TEST (float, Float, count - 0.29, count + 3.14159); - PERFORM_TEST (double, Double, count * 1.77, count * 2.71); -#endif // !defined (i386) - - -#ifndef NONNATIVE_LONGDOUBLE -#undef BAD_COMPARE_VALUES -#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP - - // - // don't try this between two platforms that don't provide - // arithmetic support for LongDouble values ... - // - if (!skip_longdouble) - PERFORM_TEST (longdouble, LongDouble, - count - 2.33, count * 3.14159); - -# undef BAD_COMPARE_VALUES -# define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \ - BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) -#endif // !NONNATIVE_LONGDOUBLE - -#undef COMPARE -#undef EXPVAL - - - // - // Boolean -- negation - // -#define EXPVAL(type,original_value) (!(type)(original_value)) -#define COMPARE(type,retval,original_value) \ - (((type)(retval)) == EXPVAL(type,original_value)) - - PERFORM_TEST (boolean, Boolean, - (count & 0x01) != 0, (count & 0x01) == 0); -#undef COMPARE -#undef EXPVAL - - // - // Char, WChar -- identity - // -#define EXPVAL(type,original_value) ((type)(original_value)) -#define COMPARE(type,retval,original_value) \ - (((type)(retval)) == EXPVAL(type,original_value)) - - PERFORM_TEST (char, Char, count + 26, count - 5); - PERFORM_TEST (wchar, WChar, count, count + 25); -#undef COMPARE -#undef EXPVAL - - // - // Object_ptr -- identity (special comparision) - // -#define EXPVAL(type,original_value) ((type)(original_value)) -#define COMPARE(type,retval,original_value) \ - (compare_objrefs (retval, original_value) == CORBA_B_TRUE) -#undef RELEASE -#define RELEASE(obj) \ - { CORBA_release (obj); } - - PERFORM_TEST (Object, Object_ptr, target, CORBA_Object::_nil ()); -#undef COMPARE -#undef EXPVAL - - // - // TypeCode_ptr -- identity (special comparision), and verifies - // that most of the built-in typecode constants exist. - // - // XXX should try this on all standard and system exceptions! - // - // XXX this currently tests only marshaling/unmarshaling of - // "no parameter" TypeCodes ... complex ones (objref, struct, - // union, enum, sequence, array, alias, exception) are _NOT_ - // currently attempted. - // - // XXX for the simple typecodes (string, wstring), the single - // "bound" parameter isn't exercised/verified as it should be. - // -#define EXPVAL(type,original_value) ((type)(original_value)) -#define COMPARE(type,retval,original) \ - (((retval) == (original)) || \ - ((retval)->_kind == (original)->_kind)) - -#undef RELEASE -#define RELEASE(tc) \ - { CORBA_release (tc); } - -#undef BAD_COMPARE_VALUES -#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP - - { - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Null, _tc_CORBA_Void); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Short, _tc_CORBA_UShort); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Long, _tc_CORBA_ULong); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_LongLong, _tc_CORBA_ULongLong); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Float, _tc_CORBA_Double); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Boolean, _tc_CORBA_Octet); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Any, _tc_CORBA_TypeCode); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_LongDouble, _tc_CORBA_Principal); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_Char, _tc_CORBA_String); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_WChar, _tc_CORBA_WString); - - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_LongDouble, _tc_CORBA_Octet); - - // - // Try all of the standard exception typecodes. - // - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_UNKNOWN, _tc_CORBA_BAD_PARAM); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_NO_MEMORY, _tc_CORBA_IMP_LIMIT); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_COMM_FAILURE, _tc_CORBA_INV_OBJREF); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_OBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INTERNAL, _tc_CORBA_MARSHAL); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INITIALIZE, _tc_CORBA_NO_IMPLEMENT); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_BAD_TYPECODE, _tc_CORBA_BAD_OPERATION); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_NO_RESOURCES, _tc_CORBA_NO_RESPONSE); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_PERSIST_STORE, _tc_CORBA_BAD_INV_ORDER); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_TRANSIENT, _tc_CORBA_FREE_MEM); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INV_IDENT, _tc_CORBA_INV_FLAG); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_INTF_REPOS, _tc_CORBA_BAD_CONTEXT); - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_OBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION); - - // - // All the built-in "user defined" system exceptions. - // - PERFORM_TEST (TypeCode, TypeCode_ptr, - _tc_CORBA_BadKind, _tc_CORBA_Bounds); - } -#undef COMPARE -#undef RELEASE - - // - // string (unbounded)-- identity (special comparision) - // -#define COMPARE(type,retval,original_value) \ - (strcmp ((char *)(retval), (char*)(original_value)) == 0) -#undef RELEASE -#define RELEASE(obj) CORBA_string_free(obj) - static const CORBA_Char str1 [] = "small"; - static const CORBA_Char str2 [] = - "relatively long string, constructed" - " with the aid of C++ implicit string" - " catenation, which simplifies much stuff"; - PERFORM_TEST (string, String, str1, str2); -#undef COMPARE -#undef RELEASE - - - // XXX any, principal, wstring ... output _is_ input - - - // - // Three test cases involve throwing user-defined exceptions. - // - { - CORBA_Exception *xp; - - // - // Case one: with parameter <= zero, must throw - // an "x1" exception whose "case_num" is that parameter - // - test_count++; - - test1_test_throw (target, -5, env); - if (env.exception () != 0) { - xp = env.exception (); - - if (strcmp ((char *)xp->id (), - (char *) _tc_test1_x1->id (env2)) != 0) - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 1, " - "wrong exception thrown (id = '%s')\n", - xp->id ()); - } - else - { - test1_x1 *xp2 = (test1_x1 *) xp; - - if (xp2->case_num != -5) - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 1, " - "wrong value (case_num = '%ld')\n", - xp2->case_num); - } - - // else, right exception was thrown - } - } - else - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 1, " - "no exception thrown !!\n"); - } - - - // - // Case two: with positive odd parameter, must throw - // an "x2" exception whose obj is null, and whose case_num - // is that parameter - // - test_count++; - - test1_test_throw (target, 101, env); - if (env.exception () != 0) - { - xp = env.exception (); - - if (strcmp ((char *)xp->id (), - (char *) _tc_test1_x2->id (env2)) != 0) - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "wrong exception thrown (id = '%s')\n", - xp->id ()); - } - else - { - test1_x2 *xp2 = (test1_x2 *) xp; - - if (xp2->case_num != 101) - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "wrong value (case_num = '%ld')\n", - xp2->case_num); - } - - if (!CORBA_is_nil (xp2->obj)) - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "non-null objref thrown\n"); - } - - // else, right exception was thrown - } - } - else - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 2, " - "no exception thrown !!\n"); - } - - -#if 0 - // 18-sept-95: commented this out. Work remains to be done in - // this area: (a) ServerRequest::target operation unimplemented, - // so for the servers of current interest this test is no help; - // (b) probable pointer leak in exceptions holding data. - - // - // Case three: with positive even parameter, must throw - // an "x2" exception whose obj is the target, and whose - // case_num is that parameter - // - test_count++; - - test1_test_throw (target, 42, env); - if (env.exception () != 0) - { - xp = env.exception (); - - if (strcmp ((char *)xp->id (), - (char *) _tc_test1_x2->id (env2)) != 0) - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "wrong exception thrown (id = '%s')\n", - xp->id ()); - } - else - { - test1_x2 *xp2 = (test1_x2 *) xp; - - if (xp2->case_num != 42) { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "wrong value (case_num = '%ld')\n", - xp2->case_num); - } - - CORBA_Boolean status; - - status = target->_is_equivalent (xp2->obj, env); - - if (env.exception () != 0) - { - error_count++; - print_exception (env.exception (), - "test_throw/3 call to is_equivalent"); - } - else if (status != CORBA_B_TRUE) - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "non-equivalent objref thrown\n"); - } - - // else, right exception was thrown - } - } - else - { - error_count++; - ACE_OS::fprintf (stderr, "test_throw case 3, " - "no exception thrown !!\n"); - } - - env.clear (); -#endif // 0 - - } - - // - // test_illegal -- generate a BAD_OPERATION system exception - // from the remote process - // - test_count++; - test_illegal (target, env); - if (env.exception () == 0 - || ACE_OS::strcmp ((char *) env.exception()->id(), - (char *) _tc_CORBA_BAD_OPERATION->id (env2)) != 0) - { - ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n"); - error_count++; - } - } -} - -int -main (int argc, char *argv[]) -{ - CORBA_ORB_ptr orb_ptr; - CORBA_Environment env; - CORBA_Object_ptr objref = CORBA_Object::_nil(); - unsigned loop_count = 1; - unsigned tests = 0, errors = 0; - int exit_later = 0; - - orb_ptr = CORBA_ORB_init (argc, argv, "internet", env); - - if (env.exception () != 0) - { - dexc (env, "ORB initialisation"); - return 1; - } - - // - // Parse and verify parameters. - // - ACE_Get_Opt get_opt (argc, argv, "dln:O:x"); - int c; - - while ((c = get_opt ()) != -1) - switch (c) - { - case 'd': // debug flag - TAO_debug_level++; - continue; - - case 'l': // skip "long double" test - skip_longdouble++; - continue; - - case 'n': // loop count - loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg); - continue; - - case 'O': // stringified objref - { - objref = orb_ptr->string_to_object ( - (CORBA_String)get_opt.optarg, env); - if (env.exception () != 0) - { - dexc (env, "string2object"); - return 1; - } - } - continue; - - case 'x': - exit_later++; - continue; - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-l]" - " [-n loopcount]" - " [-O objref]" - " [-x]" - "\n", argv [0] - ); - return 1; - } - - if (CORBA_is_nil (objref) == CORBA_B_TRUE) { - ACE_OS::fprintf (stderr, "%s: must identify non-null target objref\n", - argv [0]); - return 1; - } - - - do_tests (objref, loop_count, tests, errors); - - char *progname = ACE_OS::strrchr (argv [0], '/'); - - if (progname != 0) - progname += 1; - else - progname = argv [0]; - - ACE_OS::fprintf (stderr, "%s: %d loops, %d tests (%d errors)\n", - progname, loop_count, tests, errors); - - if (exit_later) - { - test1_please_exit (objref, env); - if (env.exception () != 0) - print_exception (env.exception (), "test1_please_exit"); - } - - CORBA_release (objref); - - return errors != 0; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template CORBA_Octet cube(CORBA_Octet); -template CORBA_Short cube(CORBA_Short); -template CORBA_UShort cube(CORBA_UShort); -template CORBA_Long cube(CORBA_Long); -template CORBA_ULong cube(CORBA_ULong); -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... -template CORBA_LongLong cube(CORBA_LongLong); -template CORBA_ULongLong cube(CORBA_ULongLong); -#endif // !NONNATIVE_LONGLONG -template CORBA_Float cube(CORBA_Float); -template CORBA_Double cube(CORBA_Double); -#if !defined (NONNATIVE_LONGDOUBLE) - // don't try this on platforms that don't support - // math on long doubles ... -template CORBA_LongDouble cube(CORBA_LongDouble); -#endif // !NONNATIVE_LONGDOUBLE -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp b/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp deleted file mode 100644 index 8ea34d15fc1..00000000000 --- a/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp +++ /dev/null @@ -1,693 +0,0 @@ -// $Id$ - -// @(#)test1_svr.cpp 1.7 95/09/25 -// Copyright 1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// TEST: simple IIOP server for "test1.idl" interface. -// -// Starts up, builds an objref, prints its string, listens for -// messages, responds to them. -// - -#include <stdio.h> -#include <string.h> -#include <ace/Get_Opt.h> - -#if unix -# include <unistd.h> // for getopt on some systems - -#else // windows - -#endif - -#include "test1.h" -#include <corba/boa.h> -#include <roa.h> - -#include <corba/debug.h> - - - -#if !defined (_WIN32) -extern char *optarg; // missing on some platforms -#endif - -// -// Skeleton code ... just a macro for a bunch of DSI-based method -// code, in lieu of having an IDL compmiler generate static skeletons. -// Static skeletons would be more efficient; most mallocation could go -// away. -// -// Use by: defining OPERATION macro, call DEFINE_SKEL3 as needed, then -// undef OPERATION. -// -// NOTE: "v1_copy" below is needed to work around a bug with the -// HP9000 G++ 2.6.3 compiler, with "LongLong". -// -// XXX this could probably be a template ... or could even be merged -// directly into the Dynamic Implementation Routine below. -// -// XXX we must currently use IN_COPY_VALUE since the memory consumed -// by the parameters must be deallocated by the ORB. When we get an -// updated version of DSI which provides "send it now" semantics, -// these should preallocate the values and not use IN_COPY_VALUE. A -// net decrease in malloc overhead can be had that way. (NVList -// should also get a public constructor, and a way to provide the -// buffer.) -// -#define DEFINE_SKEL3(name,truetype,truetypename) \ - static void \ - _test1_test_ ## name ( \ - CORBA_ServerRequest &req, \ - CORBA_Object_ptr obj, \ - CORBA_Environment &env \ - ) \ - { \ - CORBA_NVList_ptr nvlist; \ - CORBA_ ## truetype scratch = 0; \ - CORBA_Any temp_value (_tc_CORBA_ ## truetypename, \ - &scratch, CORBA_B_FALSE); \ - \ - req.orb ()->create_list (3, nvlist); \ - (void) nvlist->add_value (0, temp_value, \ - CORBA_IN_COPY_VALUE|CORBA_ARG_IN, env); \ - (void) nvlist->add_value (0, temp_value, \ - CORBA_IN_COPY_VALUE|CORBA_ARG_OUT, env); \ - (void) nvlist->add_value (0, temp_value, \ - CORBA_IN_COPY_VALUE|CORBA_ARG_INOUT, env); \ - \ - req.params (nvlist, env); \ - if (env.exception () != 0) { \ - dexc (env, "test1_test_" # name "skeleton, req.params"); \ - return; \ - } \ - \ - CORBA_ ## truetype *v1, *v2, *retval; \ - \ - v1 = (CORBA_ ## truetype *) nvlist->item (0)->value ()->value (); \ - v2 = new CORBA_ ## truetype; \ - *v2 = (CORBA_ ## truetype) OPERATION (*v1); \ - retval = new CORBA_ ## truetype; \ - *retval = (CORBA_ ## truetype) OPERATION (*v1); \ - \ - CORBA_Any_ptr any_val; \ - \ - any_val = nvlist->item (1)->value (); \ - any_val->replace (any_val->type (), v2, CORBA_B_TRUE, env); \ - if (env.exception () != 0) { \ - dexc (env, "test1_test_" # name "skeleton, val2 replace"); \ - return; \ - } \ - \ - v1 = (CORBA_ ## truetype *) nvlist->item (2)->value ()->value (); \ - CORBA_ ## truetype v1copy = *v1; \ - *v1 = (CORBA_ ## truetype) OPERATION (v1copy); \ - \ - any_val = new CORBA_Any (_tc_CORBA_ ## truetypename, \ - retval, CORBA_B_TRUE); \ - req.result (any_val, env); \ - if (env.exception () != 0) { \ - dexc (env, "test1_test_" # name "skeleton, result"); \ - return; \ - } \ - } \ - extern TAO_Call_Data test1_ ## name ## _calldata; - - -extern const TAO_Call_Data test1_void_calldata; - -static void -_test1_test_void (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - - req.orb ()->create_list (0, nvlist); - req.params (nvlist, env); - - if (env.exception () != 0) - dexc (env, "test_throw, get params"); -} - - -// -// Dynamic Skeleton methods for numeric types ... these all just -// cube their parameters in various permutations -// -template <class Type> -Type cube (Type arg) -{ - Type temp = arg; - - temp = temp * arg; - temp = temp * arg; - return temp; -} - -#define OPERATION(n) cube(n) - -DEFINE_SKEL3 (octet, Octet, Octet) - -DEFINE_SKEL3 (short, Short, Short) -DEFINE_SKEL3 (ushort, UShort, UShort) - -DEFINE_SKEL3 (long, Long, Long) -DEFINE_SKEL3 (ulong, ULong, ULong) - -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... -DEFINE_SKEL3 (longlong, LongLong, LongLong) -DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong) -#endif // !NONNATIVE_LONGLONG - -DEFINE_SKEL3 (float, Float, Float) -DEFINE_SKEL3 (double, Double, Double) - -#if !defined (NONNATIVE_LONGDOUBLE) - // don't try this on platforms that don't support - // math on long doubles ... -DEFINE_SKEL3 (longdouble, LongDouble, LongDouble) -#endif // !NONNATIVE_LONGDOUBLE - -#undef OPERATION - -// -// Dynamic Skeleton methods for Boolean type ... just negates its -// parameters -// -#define OPERATION(x) (!(x)) -DEFINE_SKEL3 (boolean, Boolean, Boolean) -#undef OPERATION - -// -// For character types, output is same as input, no magic needed. -// -#define OPERATION(x) (x) -DEFINE_SKEL3 (char, Char, Char) -DEFINE_SKEL3 (wchar, WChar, WChar) -#undef OPERATION - -// -// For objref, typecode, output is same as input but duplication -// is needed -// -#define OPERATION(x) ((x) ? (x)->AddRef() : 0, x) -DEFINE_SKEL3 (Object, Object_ptr, Object) -DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode) -#undef OPERATION - -// -// For string, output is copy of input -// -#define OPERATION(x) (CORBA_string_copy(x)) -DEFINE_SKEL3 (string, String, String) -#undef OPERATION - -// -// For wstring, output is copy of input -// -#define OPERATION(x) (CORBA_wstring_copy(x)) -DEFINE_SKEL3 (wstring, WString, WString) -#undef OPERATION - -// -// XXX IMPLEMENT THE REST OF THE DATA TYPES -// -// any, principal -- out is in -// - - -// -// All cases, "case_num" in the exception is the same as the 'in' param -// * negative or zero, throws x1 -// * positive even cases, throws x2 with obj = null objref -// * positive odd cases, throws x2 with obj = target objref -// -// exception x1 { long case_num; }; -// exception x2 { Object obj; long case_num; }; -// -// void test_throw (in long case_num) raises (x1, x2); -// - -extern const TAO_Call_Data test1_test_throw_calldata; - -static void -_test1_test_throw (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value (_tc_CORBA_Long); - CORBA_Long value; - - 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, "test_throw, get params"); - return; - } - - value = *(CORBA_Long *)nv->value ()->value (); - if (env.exception () != 0) - { - dexc (env, "test_throw, param value"); - return; - } - - CORBA_Any_ptr any; - - if (value <= 0) - { - test1_x1 *x; - - x = new test1_x1 (value); - any = new CORBA_Any (_tc_test1_x1, x, CORBA_B_TRUE); - - } - else if (value & 0x01) - { - test1_x2 *x; - - x = new test1_x2 (CORBA_Object::_nil (), value); - any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE); - - } - else - { -#if 0 - test1_x2 *x; - - x = new test1_x2 (req.oa()->target (), value); - any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE); -#else - // - // XXX right now, we don't have a target() operation on the - // BOA ... needs to be added. Verify the client side memory - // leak of pointers embedded in user exceptions is fixed, too. - // - env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO)); - return; -#endif - } - - req.exception (USER_EXCEPTION, any, env); -} - - -// -// This table is used to associate operation names with the Dynamic -// Skeleton method ... someday it could return static skeletons. -// -#define DECL_SKEL(name) \ - { & test1_ ## name ## _calldata, _test1_test_ ## name } - -static const TAO_Skel_Entry test1_operations [] = { - DECL_SKEL (void), - - DECL_SKEL (octet), - DECL_SKEL (char), - - DECL_SKEL (wchar), - - DECL_SKEL (short), - DECL_SKEL (ushort), - DECL_SKEL (long), - DECL_SKEL (ulong), - -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... - DECL_SKEL (longlong), - DECL_SKEL (ulonglong), -#endif - - DECL_SKEL (float), - DECL_SKEL (double), - -#if !defined (NONNATIVE_LONGDOUBLE) - // don't try this on platforms that don't support - // math on long doubles ... - DECL_SKEL (longdouble), -#endif // !NONNATIVE_LONGDOUBLE - - DECL_SKEL (boolean), - - DECL_SKEL (Object), - DECL_SKEL (TypeCode), - - DECL_SKEL (string), - DECL_SKEL (wstring), - - { & test1_test_throw_calldata, _test1_test_throw }, - - { 0, 0 } -}; - - -// -// Dispatch to method code ... -// -// Knows how to interpret "context" to get target objref, and where to -// get second level skeletons for that target. Both of those operations -// will generally be abstracted (into library and stub code) so the main -// body of this routine would be invisible to most applications. -// -// However, there are applications that need to do this stuff themselves -// (like bridging between environments, e.g. different ORBs, languages, or -// other object systems). Everything needed to work without using an IDL -// compiler is a public, supported API. -// -static void -level1_skeleton (CORBA_OctetSeq &key, - CORBA_ServerRequest &req, - void *context, - CORBA_Environment &env) -{ - // - // Verify that the target object and "this" object have the - // same key. Normally, this would be used to figure out - // which object was the target, and hence which operations - // vector to dispatch the request. - // - CORBA_OctetSeq *obj_key; - - obj_key = (CORBA_OctetSeq *) context; - if (obj_key->length != key.length - || ACE_OS::memcmp (obj_key->buffer, key.buffer, - obj_key->length) != 0) - { - env.exception (new CORBA_OBJECT_NOT_EXIST (COMPLETED_NO)); -#ifdef DEBUG - if (TAO_debug_level) - dmsg_opaque ("request to nonexistent object, key = ", - key.buffer, key.length); -#endif - return; - } - - // - // Find a "level 2 skeleton" for this operation, then - // call it with the right per-object state. - // - const TAO_Skel_Entry *entry; - CORBA_String opname; - - opname = req.op_name (); - for (entry = &test1_operations [0]; entry->op_descriptor; entry++) - { - if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0) - { - // We pass a bogus object because this version of the cubit example is - // so tightly coupled that it doesn't use it. Future modifications will, - // hopefully! - CORBA_Object_ptr bogus_object = 0; - entry->impl_skeleton (req, bogus_object, env); - return; - } - } - - // - // XXX True top-level skeleton code would also have to understand - // the built-in operations: - // - // * _is_a (for narrowing tests) ... can be derived by searching an - // appropriately structured graph of level2 skeletons. - // - // * _non_existent ... if the level1 skeleton consults a module - // which understands object lifespans, this should be simple. - // - // * _get_interface ... could either (a) fail; (b) return the ref - // from some IFR; or most interestingly (c) return a ref to some - // code in this process that can answer all IFR queries from the - // skeleton data structures. - // - // * _get_implementation ... return some administrative hook to - // the object implementation: - // - // No other legal operations start with a character that's not an - // ASCII alphanumeric, for what it's worth. - // - // The skeleton might want to use data in the object key to find - // the objref's type; if it's integrated with object creation, and - // an per-process implementation repository, this should be easy. - // - - // - // bypass level 2 skeletons for this one ... - // - if (strcmp ((char *) opname, "please_exit") == 0) - { - dmsg ("I've been asked to shut down..."); - req.oa ()->please_shutdown (env); - dexc (env, "please_exit, please_shutdown"); - return; - } - - // - // No match. Operation not implemented; say so. - // - dmsg1 ("unknown operation, %s", opname); - env.exception (new CORBA_BAD_OPERATION (COMPLETED_NO)); -} - - -// -// Create and print the objref, listen for calls on it until done. -// -extern void -print_exception (const CORBA_Exception *, const char *, FILE *f=stdout); - -int -OA_listen (CORBA_ORB_ptr orb_ptr, - CORBA_BOA_ptr oa_ptr, - CORBA_String key, - int idle) -{ - // - // Create the object we'll be implementing. - // - CORBA_OctetSeq obj_key; - CORBA_Object_ptr obj; - CORBA_Environment env; - - obj_key.buffer = (CORBA_Octet *) key; - obj_key.length = obj_key.maximum = ACE_OS::strlen (key); - - obj = oa_ptr->create (obj_key, (CORBA_String) "", env); - if (env.exception () != 0) - { - print_exception (env.exception (), "BOA::create"); - return 1; - } - - // - // Stringify the objref we'll be implementing, and - // print it to stdout. Someone will take that string - // and give it to some client. - // - CORBA_String str; - - str = orb_ptr->object_to_string (obj, env); - if (env.exception () != 0) - { - print_exception (env.exception (), "object2string"); - return 1; - } - ACE_OS::puts ((char *)str); - ACE_OS::fflush (stdout); - dmsg1 ("listening as object '%s'", str); - - // - // Clean up -- "key" is sufficient to dispatch all requests. - // - CORBA_release (obj); - CORBA_string_free (str); - env.clear (); - - // - // Handle requests for this object until we're killed, or one of - // the methods makes us exit. - // - // NOTE: apart from registering the top level skeleton, the rest - // of this loop is exactly what BOA::run() does. It's here to - // show there's no magic. - // -#if 0 - oa_ptr->register_dir (level1_skeleton, &obj_key, env); -#else - oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env); -#endif - if (env.exception () != 0) - { - print_exception (env.exception (), "register_dir"); - return 1; - } - - for (;;) { - if (idle == -1) - oa_ptr->get_request (CORBA_B_FALSE, 0, env); - else - { - timeval tv; - - tv.tv_sec = idle; - tv.tv_usec = 0; - oa_ptr->get_request (CORBA_B_FALSE, &tv, env); - } - - CORBA_Exception_ptr xp; - - if ((xp = env.exception ()) != 0) - { - CORBA_Environment env2; // XXX - char *id; - - id = env.exception ()->id (); - - // - // We get BAD_INV_ORDER if we call get_request() after - // shutdown was initiated. Simpler to rely on that - // than to arrange any handshaking in this simple app. - // - if (strcmp (id, _tc_CORBA_BAD_INV_ORDER->id (env2)) == 0) - { - break; - - // - // Other exceptions are errors. - // - } - else - { - print_exception (env.exception (), "BOA::get_request"); - return 1; - } - } - env.clear (); - } - - // - // Shut down the OA -- recycles all underlying resources (e.g. file - // descriptors, etc). - // - // XXX shutdown is not quite the same as release, unless we want mem - // leaks to cause some rude failure modes. BOA just hasn't been - // updated yet to have any handshake about this though. - // - oa_ptr->Release (); - return 0; -} - - -// -// Standard command line parsing utilities used. -// -int -main (int argc, char *argv[]) -{ - CORBA_Environment env; - CORBA_ORB_ptr orb_ptr; - CORBA_BOA_ptr oa_ptr; - CORBA_String key = (CORBA_String) "elvis"; - char *oa_name = 0; - char *orb_name = "internet"; - int idle = -1; - - // - // Parse the command line, get options - // - ACE_Get_Opt get_opt (argc, argv, "di:ln:O:x"); - int c; - - while ((c = get_opt ()) != -1) - switch (c) - { - case 'd': // more debug noise - TAO_debug_level++; - continue; - - case 'i': // idle seconds b4 exit - idle = ACE_OS::atoi (get_opt.optarg); - continue; - - case 'k': // key (str) - key = (CORBA_String) get_opt.optarg; - continue; - - case 'o': // orb name - orb_name = get_opt.optarg; - continue; - - case 'p': // portnum - oa_name = get_opt.optarg; - continue; - - // XXX set debug filters ... - - // - // XXX ignore OMG-specified options ... hope nobody ever tries - // to use that "-ORB* param" and "-OA* param" syntax, it flies - // in the face of standard command parsing algorithms which - // require single-character option specifiers. - // - - - case '?': - default: - ACE_OS::fprintf (stderr, "usage: %s" - " [-d]" - " [-i idle_seconds]" - " [-k object_key=elvis]" - " [-o orbname=internet]" - " [-p oa_name]" - "\n", argv [0] - ); - return 1; - } - - orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env); - if (env.exception () != 0) { - print_exception (env.exception (), "ORB init"); - return 1; - } - - // - // The BOA may or may not actually be named ... - // - oa_ptr = CORBA_BOA::get_named_boa (orb_ptr, oa_name, env); - if (env.exception () != 0) - { - print_exception (env.exception (), "OA init"); - return 1; - } - - return OA_listen (orb_ptr, oa_ptr, key, idle); -} - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template CORBA_Octet cube(CORBA_Octet); -template CORBA_Short cube(CORBA_Short); -template CORBA_UShort cube(CORBA_UShort); -template CORBA_Long cube(CORBA_Long); -template CORBA_ULong cube(CORBA_ULong); -#if !defined (NONNATIVE_LONGLONG) - // don't try this on platforms that don't support - // math on longlongs ... -template CORBA_LongLong cube(CORBA_LongLong); -template CORBA_ULongLong cube(CORBA_ULongLong); -#endif // !NONNATIVE_LONGLONG -template CORBA_Float cube(CORBA_Float); -template CORBA_Double cube(CORBA_Double); -#if !defined (NONNATIVE_LONGDOUBLE) - // don't try this on platforms that don't support - // math on long doubles ... -template CORBA_LongDouble cube(CORBA_LongDouble); -#endif // !NONNATIVE_LONGDOUBLE -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile deleted file mode 100644 index 9fdad280ffc..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -include stdmk - -EXE = server - -all: $(EXE) - -clean: - -rm -f core *.o cubitC.* cubitS.* $(EXE) - -rm -rf Templates.DB - -cubitS.cpp: cubit.idl - $(ORBCC) cubit.idl - -cubitC.cpp: cubit.idl - $(ORBCC) cubit.idl - -server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o - $(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \ - $(LIBPATH) $(LIBORB) $(STDCC_LIBS) diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp deleted file mode 100644 index d20d988f48b..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// $Id$ - -#include "Profile_Timer.h" - -/* Initialize interval timer. */ - -Profile_Timer::Profile_Timer (void) -{ - char buf[20]; - ::sprintf(buf, "/proc/%d", ::getpid ()); - - ::memset (&this->end_usage_, 0, sizeof this->end_usage_); - ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_); - ::memset (&this->last_usage_, 0, sizeof this->last_usage_); - if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1) - ::perror (buf); -} - -/* Terminate the interval timer. */ -Profile_Timer::~Profile_Timer (void) -{ - if (::close (this->proc_fd_) == -1) - ::perror ("Profile_Timer::~Profile_Timer"); -} - -/* Return the resource utilization. */ - -void -Profile_Timer::get_rusage (prusage_t &rusage) -{ - rusage = this->end_usage_; -} - -/* Compute the amount of resource utilization since the start time. */ - -void -Profile_Timer::elapsed_rusage (prusage_t &rusage) -{ - rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid; - rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count; - rusage.pr_minf = this->end_usage_.pr_minf - this->last_usage_.pr_minf; - rusage.pr_majf = this->end_usage_.pr_majf - this->last_usage_.pr_majf; - rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk; - rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk; - rusage.pr_msnd = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd; - rusage.pr_mrcv = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv; - rusage.pr_sigs = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs; - this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime); - this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime); - this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime); - rusage.pr_vctx = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx; - rusage.pr_ictx = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx; - rusage.pr_sysc = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc; - rusage.pr_ioch = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch; -} - -/* Compute the elapsed time. */ - -void -Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) -{ - timespec_t td; - - this->subtract (td, end.pr_tstamp, begin.pr_tstamp); - et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_utime, begin.pr_utime); - et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_stime, begin.pr_stime); - et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); -} - -/* Compute the amount of time that has elapsed between start and stop. */ - -int -Profile_Timer::elapsed_time (Elapsed_Time &et) -{ - this->compute_times (et, this->end_usage_, this->begin_usage_); - return 0; -} - -/* Determine the difference between T1 and T2. */ - -void -Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) -{ - tdiff.tv_sec = t1.tv_sec - t0.tv_sec; - tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; - - /* Normalize the time. */ - - while (tdiff.tv_nsec < 0) - { - tdiff.tv_sec--; - tdiff.tv_nsec += (1000 * 1000 * 1000); - } -} - -#if defined (DEBUG) -#include <stdlib.h> -extern "C" int gettimeofday (timeval *tp); - -const int DEFAULT_ITERATIONS = 1000000; - -int -main (int argc, char *argv[]) -{ - Profile_Timer timer; - int iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS; - timeval tv; - - timer.start (); - - for (int i = 0; i < iterations; i++) - gettimeofday (&tv); - - timer.stop (); - - Profile_Timer::Elapsed_Time et; - - timer.elapsed_time (et); - - printf ("iterations = %d\n", iterations); - printf ("real time = %f secs, user time = %f secs, system time = %f secs\n", - et.real_time, et.user_time, et.system_time); - - printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000); - return 0; -} -#endif /* DEBUG */ diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h deleted file mode 100644 index 4198fba9a10..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* An interval timer class using C++. */ - -#if !defined (ACE_PROFILE_TIMER_H) -#define ACE_PROFILE_TIMER_H - -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/procfs.h> -#include <stdio.h> -#include <memory.h> - -class Profile_Timer -{ -public: - struct Elapsed_Time - { - double real_time; - double user_time; - double system_time; - }; - - Profile_Timer (void); - ~Profile_Timer (void); - int start (void); - int stop (void); - int elapsed_time (Elapsed_Time &et); - void elapsed_rusage (prusage_t &rusage); - void get_rusage (prusage_t &rusage); - -private: - void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); - void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); - - prusage_t begin_usage_; - prusage_t end_usage_; - prusage_t last_usage_; - int proc_fd_; -}; - -/* Start timing */ - -inline int -Profile_Timer::start (void) -{ - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); -} - -/* Stop timing */ - -inline int -Profile_Timer::stop (void) -{ - this->last_usage_ = this->end_usage_; - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); -} - -#endif /* ACE_PROFILE_TIMER_H */ - diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl deleted file mode 100644 index 7eedbe786ab..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. -// -//#pragma prefix "Eng.SUN.COM" -//#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp deleted file mode 100644 index c4313a1fccb..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "cubit_impl.h" - -CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) { - return (CORBA::Octet) (o * o * o); -} - -CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) { - return (CORBA::Short) (s * s * s); -} - -CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) { - return (CORBA::Long) (l * l * l); -} - -Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) { - Cubit::Many out_values; - out_values.o = values.o * values.o * values.o; - out_values.s = values.s * values.s * values.s; - out_values.l = values.l * values.l * values.l; - return out_values; -} - -Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) { - Cubit::oneof out_values; - switch (values._d ()) { - case Cubit::e_0th: - out_values.o (values.o () * values.o () * values.o ()); - break; - case Cubit::e_1st: - out_values.s (values.s () * values.s () * values.s ()); - break; - case Cubit::e_2nd: - out_values.l (values.l () * values.l () * values.l ()); - break; - case Cubit::e_3rd: - default: - out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ; - out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ; - out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ; - break; - } - return out_values; -} - -void Cubit_Impl:: please_exit () - {} diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h deleted file mode 100644 index f1f5e3fa3ea..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ - - -#ifndef cubit_ih -#define cubit_ih - -#include "cubitS.h" - - -#ifdef Cubit_USE_BOA -class Cubit_Impl : public virtual _sk_Cubit { -#else -class Cubit_Impl { -#endif /* Cubit_USE_BOA */ - -public: - -#ifdef Cubit_USE_BOA - Cubit_Impl (const char *obj_name = NULL) : - _sk_Cubit(obj_name) - {} -#else - Cubit_Impl (const char *obj_name = NULL) - {} -#endif /* Cubit_USE_BOA */ - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - virtual CORBA::Short cube_short(CORBA::Short s); - virtual CORBA::Long cube_long(CORBA::Long l); - virtual Cubit::Many cube_struct(const Cubit::Many& values); - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - virtual void please_exit(); -}; - -#endif diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp deleted file mode 100644 index 99c65c6718e..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : tpr_server.cpp -// DESCRIPTION: -// -// Server mainline -// -//**************************************************************************** -#include "cubit_impl.h" // server header file - -int -main (int argc, char** argv) -{ - - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - CORBA::BOA_var boa = orb->BOA_init(argc, argv); - -#ifdef Cubit_USE_BOA - Cubit_Impl cb("Cubit"); - cout << "Using BOA approach" << endl; -#else - Cubit_Impl tied("Cubit"); - _tie_Cubit<Cubit_Impl> cb(tied, "Cubit"); - - cout << "Using TIE approach" << endl; -#endif /* Cubit_USE_BOA */ - - // - // Go get some work to do.... - // - try { - - boa->obj_is_ready(&cb); - - boa->impl_is_ready(); - - } catch (const CORBA::Exception &excep) { - cerr << "Server error: " << excep << endl; - return -1; - } catch (...) { - cerr << "Unknown exception" << endl; - return -1; - } - - cout << "Cubit server is exiting." << endl; - - - return 0; -} diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk deleted file mode 100644 index df4125a38d8..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk +++ /dev/null @@ -1,36 +0,0 @@ -CC = CC -DEBUG = - -ORBELINEDIR = /project/waltz/Orbeline2.0 - -ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h - -CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR) - -CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA - -LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace - -STDCC_LIBS = -lsocket -lnsl -ldl -mt - -LIBORB = -lorb - -LIBACE = -lACE - -.SUFFIXES: .C .o .h .hh .cc .cpp - -.C.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.cc.o: - $(CC) $(CCFLAGS) -c -o $@ $< -.cpp.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.C.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - -.cc.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - - diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile b/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile deleted file mode 100644 index d9c26fe56f0..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -include stdmk - -EXE = client - -all: $(EXE) - -clean: - -rm -f core *.o cubitC.* cubitS.* $(EXE) - -rm -rf Templates.DB - -cubitS.cpp: cubit.idl - $(ORBCC) cubit.idl - -cubitC.cpp: cubit.idl - $(ORBCC) cubit.idl - -client: cubitC.o Profile_Timer.o client.o - $(CC) -o client cubitC.o Profile_Timer.o client.o \ - $(LIBPATH) $(LIBORB) $(STDCC_LIBS) diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp deleted file mode 100644 index d20d988f48b..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// $Id$ - -#include "Profile_Timer.h" - -/* Initialize interval timer. */ - -Profile_Timer::Profile_Timer (void) -{ - char buf[20]; - ::sprintf(buf, "/proc/%d", ::getpid ()); - - ::memset (&this->end_usage_, 0, sizeof this->end_usage_); - ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_); - ::memset (&this->last_usage_, 0, sizeof this->last_usage_); - if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1) - ::perror (buf); -} - -/* Terminate the interval timer. */ -Profile_Timer::~Profile_Timer (void) -{ - if (::close (this->proc_fd_) == -1) - ::perror ("Profile_Timer::~Profile_Timer"); -} - -/* Return the resource utilization. */ - -void -Profile_Timer::get_rusage (prusage_t &rusage) -{ - rusage = this->end_usage_; -} - -/* Compute the amount of resource utilization since the start time. */ - -void -Profile_Timer::elapsed_rusage (prusage_t &rusage) -{ - rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid; - rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count; - rusage.pr_minf = this->end_usage_.pr_minf - this->last_usage_.pr_minf; - rusage.pr_majf = this->end_usage_.pr_majf - this->last_usage_.pr_majf; - rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk; - rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk; - rusage.pr_msnd = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd; - rusage.pr_mrcv = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv; - rusage.pr_sigs = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs; - this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime); - this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime); - this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime); - rusage.pr_vctx = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx; - rusage.pr_ictx = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx; - rusage.pr_sysc = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc; - rusage.pr_ioch = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch; -} - -/* Compute the elapsed time. */ - -void -Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) -{ - timespec_t td; - - this->subtract (td, end.pr_tstamp, begin.pr_tstamp); - et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_utime, begin.pr_utime); - et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); - this->subtract (td, end.pr_stime, begin.pr_stime); - et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); -} - -/* Compute the amount of time that has elapsed between start and stop. */ - -int -Profile_Timer::elapsed_time (Elapsed_Time &et) -{ - this->compute_times (et, this->end_usage_, this->begin_usage_); - return 0; -} - -/* Determine the difference between T1 and T2. */ - -void -Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) -{ - tdiff.tv_sec = t1.tv_sec - t0.tv_sec; - tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; - - /* Normalize the time. */ - - while (tdiff.tv_nsec < 0) - { - tdiff.tv_sec--; - tdiff.tv_nsec += (1000 * 1000 * 1000); - } -} - -#if defined (DEBUG) -#include <stdlib.h> -extern "C" int gettimeofday (timeval *tp); - -const int DEFAULT_ITERATIONS = 1000000; - -int -main (int argc, char *argv[]) -{ - Profile_Timer timer; - int iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS; - timeval tv; - - timer.start (); - - for (int i = 0; i < iterations; i++) - gettimeofday (&tv); - - timer.stop (); - - Profile_Timer::Elapsed_Time et; - - timer.elapsed_time (et); - - printf ("iterations = %d\n", iterations); - printf ("real time = %f secs, user time = %f secs, system time = %f secs\n", - et.real_time, et.user_time, et.system_time); - - printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000); - return 0; -} -#endif /* DEBUG */ diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h deleted file mode 100644 index 4198fba9a10..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -/* An interval timer class using C++. */ - -#if !defined (ACE_PROFILE_TIMER_H) -#define ACE_PROFILE_TIMER_H - -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/procfs.h> -#include <stdio.h> -#include <memory.h> - -class Profile_Timer -{ -public: - struct Elapsed_Time - { - double real_time; - double user_time; - double system_time; - }; - - Profile_Timer (void); - ~Profile_Timer (void); - int start (void); - int stop (void); - int elapsed_time (Elapsed_Time &et); - void elapsed_rusage (prusage_t &rusage); - void get_rusage (prusage_t &rusage); - -private: - void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); - void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); - - prusage_t begin_usage_; - prusage_t end_usage_; - prusage_t last_usage_; - int proc_fd_; -}; - -/* Start timing */ - -inline int -Profile_Timer::start (void) -{ - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); -} - -/* Stop timing */ - -inline int -Profile_Timer::stop (void) -{ - this->last_usage_ = this->end_usage_; - return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); -} - -#endif /* ACE_PROFILE_TIMER_H */ - diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp deleted file mode 100644 index d9eb91526d7..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp +++ /dev/null @@ -1,232 +0,0 @@ -// $Id$ - -//************************************************************************** -// -// NAME : client.C -// DESCRIPTION: -// -// Client for the Cubit example -// -//**************************************************************************** - -#include <iostream.h> -#include <stdio.h> -#include <string.h> -#include <time.h> -#include <stdlib.h> -#include "cubitC.h" -#include "Profile_Timer.h" - -int LOOP_COUNT; -char SERVER_HOST [1024]; - -inline int func (unsigned i) { return i - 117; } -void run_tests (Cubit_var, int); - -// = TITLE -// Parses the command line arguments and returns an error status -// -// = DESCRIPTION -// This method parses the command line arguments -int parse_args(int argc, char *argv[]) -{ - if (argc != 3) { - cerr << "Format: client <machine name> <loop count>" << endl; - return -1; - } - - strcpy(SERVER_HOST, argv[1]); - - LOOP_COUNT = atoi(argv[2]); - - return 0; // Indicates successful parsing of command line -} - - -// -// Mainline -// -int -main (int argc, char *argv[]) -{ - if (parse_args (argc, argv) != 0) - return -1; - - Cubit_var cb; - // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ; - - // - // Initialise client's binding to an - // arbitrary cubit server (at some host) - // - try { - cb = Cubit::_bind ("Cubit", SERVER_HOST); - - } catch (const CORBA::Exception & sysEx) { - cerr << "Binding failed: " << endl; - cerr << sysEx; - } catch (...) { - cerr << "Unexpected exception" << endl; - } - - run_tests (cb, LOOP_COUNT); - return 0; -} - - -void -run_tests (Cubit_var cb, int loop_count) -{ - // - // Make the calls in a loop. - // - unsigned i; - unsigned call_count, error_count; - - call_count = 0; - error_count = 0; - - Profile_Timer pt; - - pt.start(); - // - // Cube an octet. - // - - for (i = 0; i < loop_count; i++) - { - - call_count++; - - CORBA::Octet arg_octet = func (i), ret_octet; - - try { - ret_octet = cb->cube_octet (arg_octet); - - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - arg_octet = arg_octet * arg_octet * arg_octet; - if (arg_octet != ret_octet) { - printf ("** cube_octet(%d) (--> %d)\n", arg_octet , ret_octet); - error_count++; - } - - - // - // Cube a short. - // - call_count++; - - CORBA::Short arg_short = func (i), ret_short; - - try { - ret_short = cb->cube_short (arg_short); - - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - arg_short = arg_short * arg_short * arg_short; - if (arg_short != ret_short) { - printf ("** cube_short(%d) (--> %d)\n", arg_short , ret_short); - error_count++; - } - - // - // Cube a long. - // - - call_count++; - - CORBA::Long arg_long = func (i), ret_long; - - try { - ret_long = cb->cube_long (arg_long); - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - arg_long = arg_long * arg_long * arg_long; - if (arg_long != ret_long) { - printf ("** cube_long(%d) (--> %d)\n", arg_long , ret_long); - error_count++; - } - - - // - // Cube a "struct" ... - // - Cubit::Many arg_struct, ret_struct; - - call_count++; - - arg_struct.l = func (i); - arg_struct.s = func (i); - arg_struct.o = func (i); - - try { - ret_struct = cb->cube_struct (arg_struct); - - } catch (const CORBA::Exception &sysEx) { - cerr << "Call failed: " << endl; - cerr << sysEx; - error_count++; - } catch (...) { - cerr << "Unexpected exception" << endl; - error_count++; - } - - - arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l ; - arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s ; - arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o ; - - if (arg_struct.l != ret_struct.l - || arg_struct.s != ret_struct.s - || arg_struct.o != ret_struct.o ) - { - cerr << "** cube_struct ERROR\n"; - error_count++; - } - } - - pt.stop(); - - Elapsed_Time et; - pt.elapsed_time(et); - - if (call_count > 0) - { - if (error_count == 0) - { - unsigned long us = et.real_time * 1000 * 1000; - - us /= call_count; - - if (us > 0) - printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t" - "%ld calls/second\n", - us / 1000, us % 1000, - 1000000L / us); - } - - printf ("%d calls, %d errors\n", call_count, error_count); - } -} diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl b/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl deleted file mode 100644 index 7eedbe786ab..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -// @(#)cubit.idl 1.1 95/09/10 -// Copyright 1994-1995 by Sun Microsystems, Inc. -// -//#pragma prefix "Eng.SUN.COM" -//#pragma version Cubit 1.1 - -interface Cubit { - octet cube_octet (in octet o); - short cube_short (in short s); - long cube_long (in long l); - - struct Many { - octet o; // + 3 bytes padding (normally) ... - long l; - short s; // + 2 bytes padding (normally) ... - }; - - Many cube_struct (in Many values); - - enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th}; - - union oneof - switch (discrim) { - // this is an easy union to interpret; no padding - // is needed between discriminant and value. - case e_0th: - octet o; - case e_1st: - short s; - case e_2nd: - long l; - case e_3rd: - default: - Many cm; - }; - - oneof cube_union (in oneof values); - - oneway void please_exit (); -}; diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk b/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk deleted file mode 100644 index df4125a38d8..00000000000 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk +++ /dev/null @@ -1,36 +0,0 @@ -CC = CC -DEBUG = - -ORBELINEDIR = /project/waltz/Orbeline2.0 - -ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h - -CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR) - -CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA - -LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace - -STDCC_LIBS = -lsocket -lnsl -ldl -mt - -LIBORB = -lorb - -LIBACE = -lACE - -.SUFFIXES: .C .o .h .hh .cc .cpp - -.C.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.cc.o: - $(CC) $(CCFLAGS) -c -o $@ $< -.cpp.o: - $(CC) $(CCFLAGS) -c -o $@ $< - -.C.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - -.cc.cpp: - $(CC) -E $(CCFLAGS) $< > $@ - - diff --git a/TAO/IIOP/tests/Cubit/results/Orbix b/TAO/IIOP/tests/Cubit/results/Orbix deleted file mode 100644 index c3abce78d3f..00000000000 --- a/TAO/IIOP/tests/Cubit/results/Orbix +++ /dev/null @@ -1,133 +0,0 @@ -Cubit results over Ethernet with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 1.876 533 - 2 2.202 454 - 3 2.740 364 - -MT-Orbix Thread-Per-Request 1 1.886 530 - 2 3.1 322 - 3 5.0 200 - -MT-Orbix Thread-Pool (25) 1 1.875 533 - 2 3.1 322 - 3 5.1 196 - -MT-Orbix Thread-Per-Session 1 2.002 499 - 2 3.306 302 - 3 5.15 194 - - -Cubit results over ATM with 20,000 calls ----------------------------------------- - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 1.818 550 - 2 1.968 508 - 3 2.803 356 - - -MT-Orbix Thread-Per-Request 1 1.846 541 - 2 3.1 322 - 3 4.98 200 - -MT-Orbix Thread-Pool (25) 1 1.913 522 - 2 3.18 314 - 3 5.1 196 - -MT-Orbix Thread-Per-Session 1 1.959 510 - 2 3.29 303 - 3 5.15 194 - - -Prime_Factor results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 7.918 126 - 2 14.300 70 - 3 21.000 47 - - -MT-Orbix Thread-Per-Request 1 8.302 120 - 2 10.128 98 - 3 13.722 72 - -MT-Orbix Thread-Pool (25) 1 8.442 118 - 2 15.764 63 - 3 22.595 44 - -MT-Orbix Thread-Per-Session 1 8.956 111 - 2 9.581 104 - 3 16.702 59 - -IO-intensive results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -MT-Orbix without filters 1 6.667 149 - 2 12.165 82 - 3 18.634 54 - - -MT-Orbix Thread-Per-Request 1 6.812 146 - 2 6.937 144 - 3 7.706 128 - -MT-Orbix Thread-Pool (25) 1 6.813 146 - 2 6.954 144 - 3 7.776 128 - -MT-Orbix Thread-Per-Session 1 6.85 145 - 2 7.253 137 - 3 7.645 130 - - TNF client-side profile for MT-Orbix without filters for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -cond_wait 6.23 4250.242 1824 2.330 106.171 1.205 0.091 -mutex_lock 0.23 159.830 56662 0.003 1.215 0.002 0.000 -mutex_unlock 0.22 146.756 56663 0.003 0.326 0.002 0.000 -cond_signal 0.09 61.030 1825 0.033 0.475 0.009 0.000 -rw_rdlock 0.01 7.179 1826 0.004 0.014 0.003 0.000 -rw_unlock 0.01 6.548 1827 0.004 0.014 0.003 0.000 -rw_wrlock 0.00 0.004 1 0.004 0.004 0.004 0.000 - - TNF server-side profile for MT-Orbix without filters for 20000 calls - - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -cond_timedwait 1.25 923.527 797 1.159 20.219 0.324 0.028 -mutex_lock 0.21 153.839 56435 0.003 4.342 0.002 0.000 -mutex_unlock 0.20 149.208 56433 0.003 3.559 0.002 0.000 -cond_signal 0.03 21.506 809 0.027 1.826 0.003 0.002 -rw_unlock 0.02 16.058 3224 0.005 2.915 0.003 0.001 -rw_rdlock 0.02 11.924 3221 0.004 0.087 0.003 0.000 -rw_wrlock 0.00 0.010 2 0.005 0.005 0.004 0.000 - - TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls - - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.55 797.890 57618 0.014 4.624 0.002 0.000 -cond_timedwait 0.52 748.560 478 1.566 3.918 0.222 0.019 -mutex_unlock 0.36 514.627 57616 0.009 3.975 0.002 0.000 -cond_signal 0.02 24.216 1151 0.021 1.161 0.002 0.001 -rw_rdlock 0.01 13.120 2301 0.006 1.180 0.003 0.001 -rw_unlock 0.01 10.575 2307 0.005 0.316 0.003 0.000 -thr_sigsetmask 0.00 1.949 30 0.065 1.064 0.013 0.035 -rw_wrlock 0.00 0.033 6 0.006 0.008 0.004 0.001 - - - diff --git a/TAO/IIOP/tests/Cubit/results/TAO b/TAO/IIOP/tests/Cubit/results/TAO deleted file mode 100644 index de4a7bf23ae..00000000000 --- a/TAO/IIOP/tests/Cubit/results/TAO +++ /dev/null @@ -1,92 +0,0 @@ -Cubit results over Ethernet with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 1.172 853 - 2 1.342 745 - 3 1.902 525 - -TAO threaded version 1 1.174 851 - 2 1.219 820 - 3 1.600 625 - - -Cubit results over ATM with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 1.161 861 - 2 1.302 768 - 3 1.732 577 - -TAO threaded version 1 1.170 854 - 2 1.3 769 - 3 1.600 625 - - -Cubit results over ATM after optimizations with 20,000 calls ------------------------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 1.127 887 - 2 1.238 807 - 3 1.501 666 - -TAO threaded version 1 1.057 946 - 2 1.225 816 - 3 1.471 679 - -Prime_Factor results over ATM with 20,000 calls -------------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 7.407 135 - 2 13.7 73 - 3 19.7 51 - -TAO threaded version 1 7.389 135 - 2 8.080 124 - 3 10.726 93 - -IO-bound results over ATM with 20,000 calls --------------------------------------------- - - Clients Latency (ms) Calls/Sec - -TAO reactive 1 6.404 156 - 2 11.909 83 - 3 17.324 57 - -TAO threaded version 1 6.378 156 - 2 6.449 155 - 3 6.500 153 - - - - - Sample client-side profile for TAO for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -rw_rdlock 0.40 146.579 20006 0.007 1.200 0.005 0.000 -rw_unlock 0.25 91.386 20009 0.005 0.058 0.004 0.000 -mutex_lock 0.06 21.087 5265 0.004 0.178 0.002 0.000 -mutex_unlock 0.04 14.372 5271 0.003 0.075 0.002 0.000 -rw_wrlock 0.00 0.045 3 0.015 0.034 0.005 0.008 - - - Sample server-side profile for TAO for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 1.12 154.491 54507 0.003 0.140 0.002 0.000 -mutex_unlock 1.06 145.638 54508 0.003 0.310 0.002 0.000 -rw_rdlock 0.27 37.265 6813 0.005 0.037 0.004 0.000 -rw_unlock 0.20 27.792 6813 0.004 0.045 0.004 0.000 - diff --git a/TAO/IIOP/tests/Cubit/results/Visibroker b/TAO/IIOP/tests/Cubit/results/Visibroker deleted file mode 100644 index 8d6bb2457c7..00000000000 --- a/TAO/IIOP/tests/Cubit/results/Visibroker +++ /dev/null @@ -1,79 +0,0 @@ -Cubit results over Ethernet with 20,000 calls ---------------------------------------------- - - Clients Latency (ms) Calls/Sec - - -Visibroker reactive 1 1.167 856 - 2 1.39 718 - 3 1.664 600 - -Visibroker thr-per-connection 1 1.077 928 - 2 1.228 814 - 3 1.789 558 - - - -Cubit results over ATM with 20,000 calls ----------------------------------------- - - Clients Latency (ms) Calls/Sec - -Visibroker reactive 1 1.195 836 - 2 1.241 805 - 3 1.56 641 - -Visibroker thr-per-connection 1 1.060 943 - 2 1.327 753 - 3 2.108 474 - - -Prime_Factor results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -Visibroker reactive 1 7.43 134 - 2 13.652 73 - 3 17.738 56 - -Visibroker thr-per-connection 1 7.371 135 - 2 8.561 116 - 3 11.376 87 - -IO-intensive results over ATM with 20,000 calls ------------------------------------------------ - - Clients Latency (ms) Calls/Sec - -Visibroker reactive 1 6.424 155 - 2 11.895 84 - 3 17.468 57 - -Visibroker thr-per-connection 1 6.41 156 - 2 6.496 154 - 3 6.524 153 - - - - - TNF client-side profile for Visibroker for 20000 calls - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_unlock 1.31 188.930 61797 0.003 1.027 0.002 0.000 -mutex_lock 1.21 175.465 61790 0.003 0.330 0.002 0.000 - - - TNF server-side profile for Visibroker for 20000 calls - - Profile - -Function name % self+desc. mean max min std. - time ms calls ms/call ms/call ms/call err -________________________________________________________________________________ -mutex_lock 0.18 165.141 60432 0.003 0.501 0.002 0.000 -mutex_unlock 0.16 153.891 60432 0.003 0.373 0.002 0.000 - - diff --git a/TAO/IIOP/tests/Cubit/results/orbs.xls b/TAO/IIOP/tests/Cubit/results/orbs.xls Binary files differdeleted file mode 100644 index 149078dd383..00000000000 --- a/TAO/IIOP/tests/Cubit/results/orbs.xls +++ /dev/null diff --git a/TAO/IIOP/tests/Thruput_test/Makefile b/TAO/IIOP/tests/Thruput_test/Makefile deleted file mode 100644 index f6b0e338f8b..00000000000 --- a/TAO/IIOP/tests/Thruput_test/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Top-level Makefile for the TAO_TTCP benchmark -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lcorba - -PROG_SRCS = client.cpp ttcpC.cpp ttcpS.cpp ttcp_i.cpp server.cpp utils.cpp - -LSRC = $(PROG_SRCS) - -TTCP_CLIENT_OBJS = client.o ttcpC.o utils.o - -TTCP_SERVER_OBJS = server.o ttcpC.o ttcpS.o ttcp_i.o utils.o - -BIN = client server - -BUILD = $(BIN) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local modifications to variables imported by includes above. -#---------------------------------------------------------------------------- - -LDFLAGS += -L../../proto/lib -CPPFLAGS += -I../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG #-DONEWAY - -server: $(addprefix $(VDIR),$(TTCP_SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - -client: $(addprefix $(VDIR),$(TTCP_CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - - - diff --git a/TAO/IIOP/tests/Thruput_test/README b/TAO/IIOP/tests/Thruput_test/README deleted file mode 100644 index 628ef0c50a4..00000000000 --- a/TAO/IIOP/tests/Thruput_test/README +++ /dev/null @@ -1,50 +0,0 @@ - TAO_TTCP Benchmark README file - -This directory contains a modified version of the TTCP benchmark that -uses the TAO ORB. TAO_TTCP is used to measure the throughput of TAO -for sending different data types. This code tests sequences of short, -long, octet, char, double, and richly-typed data such as a struct. -This benchmark uses an interpretive form of marshaling the data by -using the dynamic invocation interfaces provided by the TAO ORB. - -Organization ------------- - -client.cpp Client main program -server.cpp Server main program -ttcpC.cpp Client side stubs -ttcpS.cpp Server side skeletons -ttcpC.h Header file for stubs -ttcpS.h Header file for the skeletons -ttcp_i.cpp Implementaion of the interface -ttcp_i.h Header for the implementation -utils.cpp Utilities to calculate throughput -ttcp_decls.h Common declarations - -Results -------- -Throughput results are stored under the results directory. If testing -for REMOTE transfers, use the ./results/REMOTE directory. - -Running the tests ------------------ -Three scripts are provided - -(1) run_server : runs the server. Be sure to change the host name -(2) run_client : runs tests for various data types -(3) run_test : called by run_client - -Compiling ---------- - -Type make - -To provide for 2way tests (no data is sent in the reverse -direction. Sender blocks for a minimal ACK), comment out the -DONEWAY -flag from the CPPFLAGS - -TO-DO ------ - - --Aniruddha Gokhale
\ No newline at end of file diff --git a/TAO/IIOP/tests/Thruput_test/client.cpp b/TAO/IIOP/tests/Thruput_test/client.cpp deleted file mode 100644 index cdf3004892d..00000000000 --- a/TAO/IIOP/tests/Thruput_test/client.cpp +++ /dev/null @@ -1,338 +0,0 @@ -// $Id$ - -#include "ttcp_decl.h" -#include "debug.h" - -#include <iostream.h> -#include <fstream.h> - -void print_exception (const CORBA_Exception *x, - const char *info, - FILE *stream - ); - -char Usage[] = "\ -Usage: client [-options] [ORBeline options] host \n\ -Common options:\n\ --l ## length of bufs read from or written to network (default 8192)\n\ --A align the start of buffers to this modulus (default 16384)\n\ --o start buffers at this offset from the modulus (default 0)\n\ --v verbose: print more statistics\n\ --d set SO_DEBUG socket option\n\ --b ## set socket buffer size (if supported)\n\ --f X format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\ --n ## number of source bufs written to network (default 2048)\n\ --x Use new lines after each entry in output file\n\ --h ## Remote host to send data to\n\ --D don't buffer TCP writes (sets TCP_NODELAY socket option)\n\ --L ## Output file name for the data type used\n\ --S <Total Data Size>\n\ --q <type> Send Sequence: Enumeration for various data types:\n\ -s = short, l = long, d = double, c = char\n\ -o = octet, S = struct, C = composite\n\ -"; - -#if !defined (__cplusplus) -typedef void (*SIG_TYP)(); -#endif - -#ifdef SVR4 -void -sigpipe (int foo) -#else - void -sigpipe () -#endif -{ -} - -int fromlen; -int domain = PF_INET; /* Default is to use Internet domain sockets. */ -char *domainname; /* Rendezvous address for UNIX domain sockets. */ -int fd; /* fd of network socket */ -int buflen = 8 * 1024; /* length of buffer */ -char *buf; /* ptr to dynamic buffer */ -int nbuf = 2 * 1024; /* number of buffers to send in sinkmode */ - -int bufoffset = 0; /* align buffer to this */ -int bufalign = 16 * 1024; /* modulo this */ - -int udp = 0; /* 0 = tcp, !0 = udp */ -int options = 0; /* socket options */ -int one = 1; /* for 4.3 BSD style setsockopt() */ -short port = 5001; /* TCP port number */ -char *host; /* ptr to name of host */ -int trans =1; /* 0=receive, !0=transmit mode */ -int sinkmode = 1; /* 0=normal I/O, !0=sink/source mode */ -int verbose = 0; /* 0=print basic info, 1=print cpu rate, proc -* resource usage. */ -int nodelay = 0; /* set TCP_NODELAY socket option */ -int b_flag = 0; /* use mread() */ -int sockbufsize = 0; /* socket buffer size to use */ -int new_line=0; /* This is a special flag */ -int write_to_file=1; /* indecates writing to file (default)*/ -char fmt = 'K'; /* output format:k=kilobits,K=kilobytes, -* m = megabits, M = megabytes, -* g = gigabits, G = gigabytes */ -int touchdata = 0; /* access data after reading */ - -struct hostent *addr; -char *title = 0; - -char stats[128]; -unsigned long srcDataSize; /* Total amount of source data */ -unsigned long nbytes; /* bytes on net */ -unsigned long numCalls; /* # of I/O system calls */ -double cput, realt; /* user, real time (seconds) */ -unsigned long dt; - -/* declare struct variables for various message types */ -ttcp_sequence::ShortSeq *sseq; -ttcp_sequence::LongSeq *lseq; -ttcp_sequence::OctetSeq *oseq; -ttcp_sequence::DoubleSeq *dseq; -ttcp_sequence::CharSeq *cseq; -ttcp_sequence::StructSeq *Sseq; - -static const char ior_prefix [] = "IOR:"; -static const char iiop_prefix [] = "iiop:"; - -int -main (int argc, char *argv[]) -{ - - unsigned long addr_tmp; - unsigned short done = 0; - int c; - - CORBA_ORB_ptr orb_ptr; - CORBA_Environment env; - CORBA_Object_ptr objref = CORBA_Object::_nil(); - ttcp_sequence_ptr ttcp_seq; - unsigned loop_count = 1; - int exit_later = 0; - CORBA_String str; - fstream iorfile; - - if (argc < 2) - goto usage; - - TAO_debug_level = 0; - while (!done && ((c = getopt (argc, argv, "d:vDb:h:f:l:n:A:o:L:xS:q:")) != -1)) - { - switch (c) - { - case 'h': - host = optarg; - break; - case 'x': - new_line = 1; - break; - case 'L': - title = optarg; - break; - case 'd': - TAO_debug_level = atoi(optarg); - if (TAO_debug_level > 10) - TAO_debug_level = 10; - break; - case 'D': -#ifdef TCP_NODELAY - nodelay = 1; -#else - fprintf (stderr, - "ttcp: -D option ignored: TCP_NODELAY socket option not supported\n"); -#endif - break; - case 'n': - nbuf = atoi (optarg); - break; - case 'l': - buflen = atoi (optarg); - break; - case 'v': - verbose = 1; - break; - case 'A': - bufalign = atoi (optarg); - break; - case 'o': - bufoffset = atoi (optarg); - break; - case 'b': -#if defined(SO_SNDBUF) || defined(SO_RCVBUF) - sockbufsize = atoi (optarg); -#else - fprintf (stderr, - "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n"); -#endif - break; - case 'f': - fmt = *optarg; - break; - case 'S': /* total source data to send. */ - /* modify nbuf accordingly */ - srcDataSize = atoi(optarg); - break; - case 'q': /* Send sequence of desired data type */ - switch(*optarg){ - case 's': - dt = SEND_SHORT; - break; - case 'l': - dt = SEND_LONG; - break; - case 'd': - dt = SEND_DOUBLE; - break; - case 'c': - dt = SEND_CHAR; - break; - case 'o': - dt = SEND_OCTET; - break; - case 'S': - dt = SEND_STRUCT; - break; - case 'C': - dt = SEND_COMPOSITE; - break; - } - break; - case '?': - done = 1; - break; - default: - goto usage; - } - } - - // - // Transmitter - // - orb_ptr = CORBA_ORB_init(argc, argv, "internet", env); - if (env.exception () != 0) { - print_exception (env.exception (), "ORB initialization", stdout); - 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; - - objref = orb_ptr->string_to_object(str, env); - if (env.exception() != 0){ - print_exception(env.exception(), "string2object", stdout); - return 1; - } - CORBA_string_free(str); - - - if (!CORBA_is_nil(objref)){ - ttcp_seq = ttcp_sequence::_narrow(objref); - - if (!CORBA_is_nil(ttcp_seq)){ - - /* modify nbuf according to Total data size */ - nbuf = srcDataSize/buflen; - fprintf(stderr, "data size = %d, buflen = %d, nbuf = %d\n",srcDataSize, buflen, nbuf); - - // - // Prepare the Message to be sent - // - - errno = 0; - if ((buf = (char *) malloc (buflen + bufalign)) == (char *) NULL) - err ("malloc"); - if (bufalign != 0) - buf += (bufalign - ((int) buf % bufalign) + bufoffset) % bufalign; - - - cout << "Sizeof PerfStruct = " << sizeof(PerfStruct) << endl; - // fill the appropriate buffers - FillPattern (buf, buflen, dt); - // - // Start the timers on the client and server sides - // - - prep_timer (); - ttcp_seq->start_timer (env); - if (env.exception () != 0) { - print_exception (env.exception (), "start_timer operation", stdout); - return 1; - } -#if defined (USE_QUANTIFY) - /* start recording quantify data from here */ - quantify_clear_data(); - quantify_start_recording_data(); -#endif - while (nbuf--) - { - switch(dt){ - case SEND_SHORT: - ttcp_seq->sendShortSeq(*sseq, env); - nbytes += sseq->length()*sizeof(CORBA_Short); - break; - case SEND_LONG: - ttcp_seq->sendLongSeq(*lseq, env); - nbytes += lseq->length()*sizeof(CORBA_Long); - break; - case SEND_OCTET: - ttcp_seq->sendOctetSeq(*oseq, env); - nbytes += oseq->length()*sizeof(CORBA_Octet); - break; - case SEND_DOUBLE: - ttcp_seq->sendDoubleSeq(*dseq, env); - nbytes += dseq->length()*sizeof(CORBA_Double); - break; - case SEND_CHAR: - ttcp_seq->sendCharSeq(*cseq, env); - nbytes += cseq->length()*sizeof(CORBA_Char); - break; - case SEND_STRUCT: - ttcp_seq->sendStructSeq(*Sseq, env); - nbytes += Sseq->length()*sizeof(PerfStruct); - break; - } - numCalls++; - if (env.exception () != 0) { - print_exception (env.exception (), "send operation", stdout); - return 1; - } - } -#if defined(USE_QUANTIFY) - quantify_stop_recording_data(); -#endif - // - // Stop the timer - // - ttcp_seq->stop_timer(env); - if (env.exception () != 0) { - print_exception (env.exception (), "stop_timer operation", stdout); - return 1; - } - (void) read_timer (stats, sizeof (stats)); - - // print results - PrintStats(); - - } - } - - CORBA_release(ttcp_seq); - return(0); -usage: - fprintf (stderr, Usage); - return 1; -} - - - - - - diff --git a/TAO/IIOP/tests/Thruput_test/run b/TAO/IIOP/tests/Thruput_test/run deleted file mode 100755 index b746a09536d..00000000000 --- a/TAO/IIOP/tests/Thruput_test/run +++ /dev/null @@ -1 +0,0 @@ -client -S 67108864 -f m -D -l $1 -L temp -q $2 -b 65536 -d $3 diff --git a/TAO/IIOP/tests/Thruput_test/run_client b/TAO/IIOP/tests/Thruput_test/run_client deleted file mode 100755 index 41f9fd5bc51..00000000000 --- a/TAO/IIOP/tests/Thruput_test/run_client +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/csh -f -# All ATM tests: 64k socket Queue Size -# -# shorts -run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 s -sleep 5 -# longs -run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 l -sleep 5 -# octets -run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 o -sleep 5 -# doubles -run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 d -sleep 5 -# chars -#run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 c -#sleep 5 -# structures -run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 S -sleep 5 -# Composite Structs -#run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 C -#sleep 5 -# diff --git a/TAO/IIOP/tests/Thruput_test/run_server b/TAO/IIOP/tests/Thruput_test/run_server deleted file mode 100755 index 9ce44a510b1..00000000000 --- a/TAO/IIOP/tests/Thruput_test/run_server +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/csh -# -# Usage: server <switches> -# -u : use IOR -# -f m : output results in Mbps -# -b <sock Q size> ** not implemented ** -# -OAhost <host name> ************* must provide this for this version -# -OAthread : use threaded version as opposed to reactive -# -server -u -f m -b 65536 -OAhost mambo-cip #-OAthread diff --git a/TAO/IIOP/tests/Thruput_test/run_test b/TAO/IIOP/tests/Thruput_test/run_test deleted file mode 100755 index e36938f42b6..00000000000 --- a/TAO/IIOP/tests/Thruput_test/run_test +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/csh -f -if ($#argv < 3) then - echo "Usage: sclt <Total Data Size> <Max msg size> <destination> <TitleOfThisTest> <seq type>" - exit 1 -endif -# -@ msize=1024 -@ limit= ($argv[2] * 1024) -#echo $limit -#echo $msize -echo "Iteration#" 1 ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536 -client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536 -set flag=0 -while ($msize <= $limit) - if ($flag == 0) goto label - echo "Iteration#" 1 ": client -S" $1 "-D -f m -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536 - client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536 - label: - set flag=1 - sleep 5 - foreach i (2) - echo "Iteration#" $i ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L " $4 "-q" $5 -b 65536 - client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536 - end - echo "---------------------------" - @ msize = ($msize * 2) - sleep 5 -end - -echo " " -echo "Done at:" -date diff --git a/TAO/IIOP/tests/Thruput_test/server.cpp b/TAO/IIOP/tests/Thruput_test/server.cpp deleted file mode 100644 index b2a10d91510..00000000000 --- a/TAO/IIOP/tests/Thruput_test/server.cpp +++ /dev/null @@ -1,226 +0,0 @@ -// $Id$ - -#include "ttcp_i.h" - -#include <iostream.h> -#include <fstream.h> - -void print_exception (const CORBA_Exception *x, - const char *info, - FILE *stream - ); - -char Usage[] = "\ -Usage: server [options] \n\ -Common options:\n\ --l ## length of bufs read from or written to network (default 8192)\n\ --A align the start of buffers to this modulus (default 16384)\n\ --O start buffers at this offset from the modulus (default 0)\n\ --v verbose: print more statistics\n\ --d set SO_DEBUG socket option\n\ --b ## set socket buffer size (if supported)\n\ --f X format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\ --L ## Output file name for the data type used\n\ -Options specific to -r:\n\ --B for -s, only output full blocks as specified by -l (for TAR)\n\ --T \"touch\": access each byte as it's read\n\ -"; - -#if !defined (__cplusplus) -typedef void (*SIG_TYP)(); -#endif - -#ifdef SVR4 -void -sigpipe (int foo) -#else - void -sigpipe () -#endif -{ -} - -int fromlen; -int domain = PF_INET; /* Default is to use Internet domain sockets. */ -char *domainname; /* Rendezvous address for UNIX domain sockets. */ -int fd; /* fd of network socket */ -int buflen = 8 * 1024; /* length of buffer */ -char *buf; /* ptr to dynamic buffer */ -int nbuf = 2 * 1024; /* number of buffers to send in sinkmode */ - -int bufoffset = 0; /* align buffer to this */ -int bufalign = 16 * 1024; /* modulo this */ - -int udp = 0; /* 0 = tcp, !0 = udp */ -int options = 0; /* socket options */ -int one = 1; /* for 4.3 BSD style setsockopt() */ -short port = 5001; /* TCP port number */ -char *host; /* ptr to name of host */ -int trans; /* 0=receive, !0=transmit mode */ -int sinkmode = 0; /* 0=normal I/O, !0=sink/source mode */ -int verbose = 0; /* 0=print basic info, 1=print cpu rate, proc - * resource usage. */ -int nodelay = 0; /* set TCP_NODELAY socket option */ -int b_flag = 0; /* use mread() */ -int sockbufsize = 0; /* socket buffer size to use */ -int new_line=0; /* This is a special flag */ -int write_to_file=1; /* indecates writing to file (default)*/ -char fmt = 'K'; /* output format:k=kilobits,K=kilobytes, - * m = megabits, M = megabytes, - * g = gigabits, G = gigabytes */ -int touchdata = 0; /* access data after reading */ - -struct hostent *addr; -char *title = 0; - -char stats[128]; -unsigned long srcDataSize; /* Total amount of source data */ -unsigned long nbytes; /* bytes on net */ -unsigned long numCalls; /* # of I/O system calls */ -double cput, realt; /* user, real time (seconds) */ -unsigned long dt; - -/* declare struct variables for various message types */ -ttcp_sequence::ShortSeq *sseq; -ttcp_sequence::LongSeq *lseq; -ttcp_sequence::OctetSeq *oseq; -ttcp_sequence::DoubleSeq *dseq; -ttcp_sequence::CharSeq *cseq; -ttcp_sequence::StructSeq *Sseq; - -unsigned short isDone = 0; -ttcp_sequence_i *my_ttcp; - -// -// forwarding support -// -static CORBA_Object_ptr fwd_ref; - -int -main (int argc, char *const *argv) -{ - - unsigned long addr_tmp; - int c; - unsigned short done = 0; - CORBA_Environment env; - CORBA_ORB_ptr orb_ptr; - CORBA_BOA_ptr oa_ptr; - CORBA_Boolean do_fork = CORBA_B_FALSE; - CORBA_Boolean do_threads = CORBA_B_FALSE; - CORBA_String key = (CORBA_String) "key0"; - char *oa_name = "ROA"; - char *orb_name = "internet"; - int idle = -1; - int use_ior = 0; - fstream iorfile; - CORBA_String str; - - - if (argc < 2) - goto usage; - - orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env); - if (env.exception () != 0) { - print_exception (env.exception (), "ORB init", stdout); - return 1; - } - - oa_ptr = orb_ptr->BOA_init(argc, argv, oa_name); - if (env.exception () != 0) { - print_exception (env.exception (), "OA init", stdout); - return 1; - } - - TAO_debug_level = 0; - // Now process the options other than Orbix specific options - while (!done && ((c = getopt (argc, argv, "ui:d:vb:f:l:L:")) != -1)) - { - switch (c) - { - case 'u': - use_ior = 1; - orb_name = ""; - break; - case 'L': - title = optarg; - break; - case 'd': - TAO_debug_level = atoi(optarg); - if (TAO_debug_level > 10) - TAO_debug_level = 10; - break; - case 'l': - buflen = atoi (optarg); - break; - case 'i': - idle = atoi (optarg); - break; - case 'v': - verbose = 1; - break; - case 'b': -#if defined(SO_SNDBUF) || defined(SO_RCVBUF) - sockbufsize = atoi (optarg); -#else - fprintf (stderr, - "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n"); -#endif - break; - case 'f': - fmt = *optarg; - break; - case 'O': - case '?': - done = 1; - break; - default: - goto usage; - } - } - - // - // Receiver - // - - iorfile.open("ior.txt", ios::out); - my_ttcp = new ttcp_sequence_i("TTCP_IIOP_test"); - str = orb_ptr->object_to_string(my_ttcp, env); - if (env.exception() != 0) - { - print_exception (env.exception(), "object_to_string", stdout); - return 1; - } - iorfile << ((char *)str) << endl; - -#if defined (USE_QUANTIFY) - quantify_clear_data(); - quantify_start_recording_data(); -#endif - - ACE_Reactor::run_event_loop(); - -#if 0 - while (1) - { - int result = params->reactor()->handle_events (); - - if (result == -1) - { - terminationStatus = -1; - break; - } - } -#endif - return 0; -usage: - fprintf (stderr, Usage); - return(1); -} - - - - - - - diff --git a/TAO/IIOP/tests/Thruput_test/ttcp.idl b/TAO/IIOP/tests/Thruput_test/ttcp.idl deleted file mode 100644 index ff13a4b664b..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcp.idl +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -struct PerfStruct{ - short s; - char c; - long l; - octet o; - double d; - octet pad[8]; // to make it 32 bytes -}; - -// Richly typed data -interface ttcp_sequence -{ - typedef sequence<short> ShortSeq; - typedef sequence<long> LongSeq; - typedef sequence<double> DoubleSeq; - typedef sequence<char> CharSeq; - typedef sequence<octet> OctetSeq; - typedef sequence<PerfStruct> StructSeq; - - - // Routines to send sequences of various data types - oneway void sendShortSeq (in ShortSeq ttcp_seq); - oneway void sendLongSeq (in LongSeq ttcp_seq); - oneway void sendDoubleSeq (in DoubleSeq ttcp_seq); - oneway void sendCharSeq (in CharSeq ttcp_seq); - oneway void sendOctetSeq (in OctetSeq ttcp_seq); - oneway void sendStructSeq (in StructSeq ttcp_seq); - - oneway void start_timer (); - oneway void stop_timer (); -}; diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.cpp b/TAO/IIOP/tests/Thruput_test/ttcpC.cpp deleted file mode 100644 index 6f96d387c25..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcpC.cpp +++ /dev/null @@ -1,1007 +0,0 @@ -// $Id$ - -#include <stdio.h> -#include "ttcpC.h" - -// constructor -ttcp_sequence::ttcp_sequence(STUB_Object *refdata) - : CORBA_Object(refdata) -{ -} - -// static duplicate method -ttcp_sequence_ptr ttcp_sequence::_duplicate(ttcp_sequence_ptr obj) -{ - void *dupl; - - if (obj) - { - obj->AddRef(); - } - return obj; -} - -// static _narrow method -ttcp_sequence_ptr ttcp_sequence::_narrow(CORBA_Object_ptr obj) -{ - CORBA_Environment env; - if (obj->_is_a("IDL:ttcp_sequence:1.0", env)){ - STUB_Object *istub; - if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR){ - return ttcp_sequence::_nil(); - } - ttcp_sequence_ptr new_obj = new ttcp_sequence(istub); - return ttcp_sequence::_duplicate(new_obj); - } - return ttcp_sequence::_nil(); -} - -ttcp_sequence_ptr ttcp_sequence::_nil() -{ - return (ttcp_sequence_ptr)NULL; -} - -ttcp_sequence::ShortSeq::ShortSeq() - : _maximum(0), - _length(0), - _buffer(0), - _release(CORBA_B_FALSE) -{ -} - -ttcp_sequence::ShortSeq::ShortSeq(CORBA_ULong max) - : _maximum(max), - _length(0), - _release(CORBA_B_FALSE) -{ - if (this->_maximum > 0){ - this->_buffer = new CORBA_Short[this->_maximum]; - } else { - this->_buffer = 0; - } -} - -ttcp_sequence::ShortSeq::ShortSeq(CORBA_ULong max, CORBA_ULong length, - CORBA_Short *value, CORBA_Boolean release) - : _maximum(max), - _length(length), - _buffer(value), - _release(release) -{ -} - -ttcp_sequence::ShortSeq::~ShortSeq() -{ - this->_maximum = this->_length = 0; - if (this->_release != CORBA_B_FALSE) - delete this->_buffer; -} - -void ttcp_sequence::ShortSeq::length(CORBA_ULong newlen) -{ - if (newlen > this->_maximum) { - CORBA_Short *temp = new CORBA_Short[newlen]; - ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Short))); - if (this->_release) - delete this->_buffer; - else - this->_release = 1; - - this->_maximum = newlen; - this->_buffer = temp; - } - if (newlen > this->_length) - memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) * - sizeof(CORBA_Short)); - this->_length = newlen; -} - -CORBA_ULong ttcp_sequence::ShortSeq::length() const -{ - return this->_length; -} - -CORBA_Short& ttcp_sequence::ShortSeq::operator[](CORBA_ULong index) -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -const CORBA_Short& ttcp_sequence::ShortSeq::operator[](CORBA_ULong index) const -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -// LongSeq -ttcp_sequence::LongSeq::LongSeq() - : _maximum(0), - _length(0), - _buffer(0), - _release(CORBA_B_FALSE) -{ -} - -ttcp_sequence::LongSeq::LongSeq(CORBA_ULong max) - : _maximum(max), - _length(0), - _release(CORBA_B_FALSE) -{ - if (this->_maximum > 0){ - this->_buffer = new CORBA_Long[this->_maximum]; - } else { - this->_buffer = 0; - } -} - -ttcp_sequence::LongSeq::LongSeq(CORBA_ULong max, CORBA_ULong length, - CORBA_Long *value, CORBA_Boolean release) - : _maximum(max), - _length(length), - _buffer(value), - _release(release) -{ -} - -ttcp_sequence::LongSeq::~LongSeq() -{ - this->_maximum = this->_length = 0; - if (this->_release != CORBA_B_FALSE) - delete this->_buffer; -} - -void ttcp_sequence::LongSeq::length(CORBA_ULong newlen) -{ - if (newlen > this->_maximum) { - CORBA_Long *temp = new CORBA_Long[newlen]; - ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Long))); - if (this->_release) - delete this->_buffer; - else - this->_release = 1; - - this->_maximum = newlen; - this->_buffer = temp; - } - if (newlen > this->_length) - memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) * - sizeof(CORBA_Long)); - this->_length = newlen; -} - -CORBA_ULong ttcp_sequence::LongSeq::length() const -{ - return this->_length; -} - -CORBA_Long& ttcp_sequence::LongSeq::operator[](CORBA_ULong index) -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -const CORBA_Long& ttcp_sequence::LongSeq::operator[](CORBA_ULong index) const -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -// DoubleSeq -ttcp_sequence::DoubleSeq::DoubleSeq() - : _maximum(0), - _length(0), - _buffer(0), - _release(CORBA_B_FALSE) -{ -} - -ttcp_sequence::DoubleSeq::DoubleSeq(CORBA_ULong max) - : _maximum(max), - _length(0), - _release(CORBA_B_FALSE) -{ - if (this->_maximum > 0){ - this->_buffer = new CORBA_Double[this->_maximum]; - } else { - this->_buffer = 0; - } -} - -ttcp_sequence::DoubleSeq::DoubleSeq(CORBA_ULong max, CORBA_ULong length, - CORBA_Double *value, CORBA_Boolean release) - : _maximum(max), - _length(length), - _buffer(value), - _release(release) -{ -} - -ttcp_sequence::DoubleSeq::~DoubleSeq() -{ - this->_maximum = this->_length = 0; - if (this->_release != CORBA_B_FALSE) - delete this->_buffer; -} - -void ttcp_sequence::DoubleSeq::length(CORBA_ULong newlen) -{ - if (newlen > this->_maximum) { - CORBA_Double *temp = new CORBA_Double[newlen]; - ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Double))); - if (this->_release) - delete this->_buffer; - else - this->_release = 1; - - this->_maximum = newlen; - this->_buffer = temp; - } - if (newlen > this->_length) - memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) * - sizeof(CORBA_Double)); - this->_length = newlen; -} - -CORBA_ULong ttcp_sequence::DoubleSeq::length() const -{ - return this->_length; -} - -CORBA_Double& ttcp_sequence::DoubleSeq::operator[](CORBA_ULong index) -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -const CORBA_Double& ttcp_sequence::DoubleSeq::operator[](CORBA_ULong index) const -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -// Char seq -ttcp_sequence::CharSeq::CharSeq() - : _maximum(0), - _length(0), - _buffer(0), - _release(CORBA_B_FALSE) -{ -} - -ttcp_sequence::CharSeq::CharSeq(CORBA_ULong max) - : _maximum(max), - _length(0), - _release(CORBA_B_FALSE) -{ - if (this->_maximum > 0){ - this->_buffer = new CORBA_Char[this->_maximum]; - } else { - this->_buffer = 0; - } -} - -ttcp_sequence::CharSeq::CharSeq(CORBA_ULong max, CORBA_ULong length, - CORBA_Char *value, CORBA_Boolean release) - : _maximum(max), - _length(length), - _buffer(value), - _release(release) -{ -} - -ttcp_sequence::CharSeq::~CharSeq() -{ - this->_maximum = this->_length = 0; - if (this->_release != CORBA_B_FALSE) - delete this->_buffer; -} - -void ttcp_sequence::CharSeq::length(CORBA_ULong newlen) -{ - if (newlen > this->_maximum) { - CORBA_Char *temp = new CORBA_Char[newlen]; - ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Char))); - if (this->_release) - delete this->_buffer; - else - this->_release = 1; - - this->_maximum = newlen; - this->_buffer = temp; - } - if (newlen > this->_length) - memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) * - sizeof(CORBA_Char)); - this->_length = newlen; -} - -CORBA_ULong ttcp_sequence::CharSeq::length() const -{ - return this->_length; -} - -CORBA_Char& ttcp_sequence::CharSeq::operator[](CORBA_ULong index) -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -const CORBA_Char& ttcp_sequence::CharSeq::operator[](CORBA_ULong index) const -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -//Octet Seq -ttcp_sequence::OctetSeq::OctetSeq() - : _maximum(0), - _length(0), - _buffer(0), - _release(CORBA_B_FALSE) -{ -} - -ttcp_sequence::OctetSeq::OctetSeq(CORBA_ULong max) - : _maximum(max), - _length(0), - _release(CORBA_B_FALSE) -{ - if (this->_maximum > 0){ - this->_buffer = new CORBA_Octet[this->_maximum]; - } else { - this->_buffer = 0; - } -} - -ttcp_sequence::OctetSeq::OctetSeq(CORBA_ULong max, CORBA_ULong length, - CORBA_Octet *value, CORBA_Boolean release) - : _maximum(max), - _length(length), - _buffer(value), - _release(release) -{ -} - -ttcp_sequence::OctetSeq::~OctetSeq() -{ - this->_maximum = this->_length = 0; - if (this->_release != CORBA_B_FALSE) - delete this->_buffer; -} - -void ttcp_sequence::OctetSeq::length(CORBA_ULong newlen) -{ - if (newlen > this->_maximum) { - CORBA_Octet *temp = new CORBA_Octet[newlen]; - ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Octet))); - if (this->_release) - delete this->_buffer; - else - this->_release = 1; - - this->_maximum = newlen; - this->_buffer = temp; - } - if (newlen > this->_length) - memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) * - sizeof(CORBA_Octet)); - this->_length = newlen; -} - -CORBA_ULong ttcp_sequence::OctetSeq::length() const -{ - return this->_length; -} - -CORBA_Octet& ttcp_sequence::OctetSeq::operator[](CORBA_ULong index) -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -const CORBA_Octet& ttcp_sequence::OctetSeq::operator[](CORBA_ULong index) const -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - - -//struct seq -ttcp_sequence::StructSeq::StructSeq() - : _maximum(0), - _length(0), - _buffer(0), - _release(CORBA_B_FALSE) -{ -} - -ttcp_sequence::StructSeq::StructSeq(CORBA_ULong max) - : _maximum(max), - _length(0), - _release(CORBA_B_FALSE) -{ - if (this->_maximum > 0){ - this->_buffer = new PerfStruct[this->_maximum]; - } else { - this->_buffer = 0; - } -} - -ttcp_sequence::StructSeq::StructSeq(CORBA_ULong max, CORBA_ULong length, - PerfStruct *value, CORBA_Boolean release) - : _maximum(max), - _length(length), - _buffer(value), - _release(release) -{ -} - -ttcp_sequence::StructSeq::~StructSeq() -{ - this->_maximum = this->_length = 0; - if (this->_release != CORBA_B_FALSE) - delete this->_buffer; -} - -void ttcp_sequence::StructSeq::length(CORBA_ULong newlen) -{ - if (newlen > this->_maximum) { - PerfStruct *temp = new PerfStruct[newlen]; - ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(PerfStruct))); - if (this->_release) - delete this->_buffer; - else - this->_release = 1; - - this->_maximum = newlen; - this->_buffer = temp; - } - if (newlen > this->_length) - memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) * - sizeof(PerfStruct)); - this->_length = newlen; -} - -CORBA_ULong ttcp_sequence::StructSeq::length() const -{ - return this->_length; -} - -PerfStruct& ttcp_sequence::StructSeq::operator[](CORBA_ULong index) -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - -const PerfStruct& ttcp_sequence::StructSeq::operator[](CORBA_ULong index) const -{ - if (index >= this->_length) - exit(1); - return this->_buffer[index]; -} - - -/***************** TypeCodes **************/ - -// encapsulated parameters for struct PerfStruct typecode -static const CORBA_Long _oc_PerfStruct [] = { - // strings are encoded as length followed by the string. A length of 1 stands - // for the NULL character - MY_BYTE_SEX, // byte order - 1, 0, // empty string, repoID - 1, 0, // empty string, struct name - 6, // 6 struct elements - - // short - 1, 0, // empty string - tk_short, - - // char - 1, 0, - tk_char, - - // long - 1, 0, - tk_long, - - // octet - 1, 0, - tk_octet, - - // double - 1, 0, - tk_double, - - // padding - 1, 0, - tk_array, - 12, // encapsulation length - MY_BYTE_SEX, - tk_octet, - 8 -}; - - -static CORBA_TypeCode _tc__tc_PerfStruct(tk_struct, - sizeof _oc_PerfStruct, - (unsigned char *) &_oc_PerfStruct, - CORBA_B_FALSE); -CORBA_TypeCode_ptr _tc_PerfStruct = &_tc__tc_PerfStruct; - -// Typecodes for all the sequences - -// StructSeq -static const CORBA_Long _oc_ttcp_sequence_StructSeq [] = { - MY_BYTE_SEX, // byte order - tk_struct, // sequence of struct - 112, // encapsulaton length - MY_BYTE_SEX, // byte order - 1, 0, // empty string, repoID - 1, 0, // empty string, struct name - 6, // 6 struct elements - - // short - 1, 0, // empty string - tk_short, - - // char - 1, 0, - tk_char, - - // long - 1, 0, - tk_long, - - // octet - 1, 0, - tk_octet, - - // double - 1, 0, - tk_double, - - // padding - 1, 0, - tk_array, // array - 12, //encapsulation length - MY_BYTE_SEX, - tk_octet, - 8, - 0, // a length of 0 => unbounded sequence -}; -static CORBA_TypeCode _tc__tc_ttcp_sequence_StructSeq(tk_sequence, - sizeof - _oc_ttcp_sequence_StructSeq, - (unsigned char *) - &_oc_ttcp_sequence_StructSeq, - CORBA_B_FALSE); -CORBA_TypeCode_ptr ttcp_sequence::_tc_StructSeq = &_tc__tc_ttcp_sequence_StructSeq; - -// ShortSeq -static const CORBA_Long _oc_ttcp_sequence_ShortSeq [] = { - MY_BYTE_SEX, // byte order - tk_short, // sequence of short - 0, // a length of 0 => unbounded sequence -}; -static CORBA_TypeCode _tc__tc_ttcp_sequence_ShortSeq(tk_sequence, - sizeof - _oc_ttcp_sequence_ShortSeq, - (unsigned char *) - &_oc_ttcp_sequence_ShortSeq, - CORBA_B_FALSE); -CORBA_TypeCode_ptr ttcp_sequence::_tc_ShortSeq = &_tc__tc_ttcp_sequence_ShortSeq; - -// LongSeq -static const CORBA_Long _oc_ttcp_sequence_LongSeq [] = { - MY_BYTE_SEX, // byte order - tk_long, // sequence of long - 0, // a length of 0 => unbounded sequence -}; -static CORBA_TypeCode _tc__tc_ttcp_sequence_LongSeq(tk_sequence, - sizeof - _oc_ttcp_sequence_LongSeq, - (unsigned char *) - &_oc_ttcp_sequence_LongSeq, - CORBA_B_FALSE); -CORBA_TypeCode_ptr ttcp_sequence::_tc_LongSeq = &_tc__tc_ttcp_sequence_LongSeq; - -// DoubleSeq -static const CORBA_Long _oc_ttcp_sequence_DoubleSeq [] = { - MY_BYTE_SEX, // byte order - tk_double, // sequence of doubles - 0, // a length of 0 => unbounded sequence -}; -static CORBA_TypeCode _tc__tc_ttcp_sequence_DoubleSeq(tk_sequence, - sizeof - _oc_ttcp_sequence_DoubleSeq, - (unsigned char *) - &_oc_ttcp_sequence_DoubleSeq, - CORBA_B_FALSE); -CORBA_TypeCode_ptr ttcp_sequence::_tc_DoubleSeq = &_tc__tc_ttcp_sequence_DoubleSeq; - -// CharSeq -static const CORBA_Long _oc_ttcp_sequence_CharSeq [] = { - MY_BYTE_SEX, // byte order - tk_char, // sequence of chars - 0, // a length of 0 => unbounded sequence -}; -static CORBA_TypeCode _tc__tc_ttcp_sequence_CharSeq(tk_sequence, - sizeof - _oc_ttcp_sequence_CharSeq, - (unsigned char *) - &_oc_ttcp_sequence_CharSeq, - CORBA_B_FALSE); -CORBA_TypeCode_ptr ttcp_sequence::_tc_CharSeq = &_tc__tc_ttcp_sequence_CharSeq; - -//OctetSeq -static const CORBA_Long _oc_ttcp_sequence_OctetSeq [] = { - MY_BYTE_SEX, // byte order - tk_octet, // sequence of octets - 0, // a length of 0 => unbounded sequence -}; -static CORBA_TypeCode _tc__tc_ttcp_sequence_OctetSeq(tk_sequence, - sizeof - _oc_ttcp_sequence_OctetSeq, - (unsigned char *) - &_oc_ttcp_sequence_OctetSeq, - CORBA_B_FALSE); -CORBA_TypeCode_ptr ttcp_sequence::_tc_OctetSeq = &_tc__tc_ttcp_sequence_OctetSeq; - - - -/***************** All the methods ********************/ - -//sendShortSeq -static const TAO_Param_Data ttcp_sequence_sendShortSeq_params [] = { -#ifndef ONEWAY - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - }, -#endif - { ttcp_sequence::_tc_ShortSeq, - PARAM_IN, - 0 - } -}; - -static const TAO_Call_Data ttcp_sequence_sendShortSeq_TAO_Call_Data = { - "sendShortSeq", // opname -#ifndef ONEWAY - CORBA_B_TRUE, // twoway - 2, // param count -#else - CORBA_B_FALSE, // oneway - 1, -#endif - &ttcp_sequence_sendShortSeq_params [0], - 0, 0 -}; - -// stub -void ttcp_sequence::sendShortSeq(const ttcp_sequence::ShortSeq &ttcp_seq, - CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_sendShortSeq_TAO_Call_Data, 0, &ttcp_seq); -#else - istub->do_call(env, &ttcp_sequence_sendShortSeq_TAO_Call_Data, &ttcp_seq); -#endif -} - -//sendLongSeq -static const TAO_Param_Data ttcp_sequence_sendLongSeq_params [] = { -#ifndef ONEWAY - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - }, -#endif - { ttcp_sequence::_tc_LongSeq, - PARAM_IN, - 0 - } -}; - -static const TAO_Call_Data ttcp_sequence_sendLongSeq_TAO_Call_Data = { - "sendLongSeq", // opname -#ifndef ONEWAY - CORBA_B_TRUE, // twoway - 2, // param count -#else - CORBA_B_FALSE, // oneway - 1, -#endif - &ttcp_sequence_sendLongSeq_params [0], - 0, 0 -}; - -// stub -void ttcp_sequence::sendLongSeq(const ttcp_sequence::LongSeq &ttcp_seq, - CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_sendLongSeq_TAO_Call_Data, 0, &ttcp_seq); -#else - istub->do_call(env, &ttcp_sequence_sendLongSeq_TAO_Call_Data, &ttcp_seq); -#endif -} - -//sendDoubleSeq -static const TAO_Param_Data ttcp_sequence_sendDoubleSeq_params [] = { -#ifndef ONEWAY - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - }, -#endif - { ttcp_sequence::_tc_DoubleSeq, - PARAM_IN, - 0 - } -}; - -static const TAO_Call_Data ttcp_sequence_sendDoubleSeq_TAO_Call_Data = { - "sendDoubleSeq", // opname -#ifndef ONEWAY - CORBA_B_TRUE, // twoway - 2, // param count -#else - CORBA_B_FALSE, // oneway - 1, -#endif - &ttcp_sequence_sendDoubleSeq_params [0], - 0, 0 -}; - -// stub -void ttcp_sequence::sendDoubleSeq(const ttcp_sequence::DoubleSeq &ttcp_seq, - CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_sendDoubleSeq_TAO_Call_Data, 0, &ttcp_seq); -#else - istub->do_call(env, &ttcp_sequence_sendDoubleSeq_TAO_Call_Data, &ttcp_seq); -#endif -} - -//sendCharSeq -static const TAO_Param_Data ttcp_sequence_sendCharSeq_params [] = { -#ifndef ONEWAY - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - }, -#endif - { ttcp_sequence::_tc_CharSeq, - PARAM_IN, - 0 - } -}; - -static const TAO_Call_Data ttcp_sequence_sendCharSeq_TAO_Call_Data = { - "sendCharSeq", // opname -#ifndef ONEWAY - CORBA_B_TRUE, // twoway - 2, // param count -#else - CORBA_B_FALSE, // oneway - 1, -#endif - &ttcp_sequence_sendCharSeq_params [0], - 0, 0 -}; - -// stub -void ttcp_sequence::sendCharSeq(const ttcp_sequence::CharSeq &ttcp_seq, - CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_sendCharSeq_TAO_Call_Data, 0, &ttcp_seq); -#else - istub->do_call(env, &ttcp_sequence_sendCharSeq_TAO_Call_Data, &ttcp_seq); -#endif -} - -//sendOctetSeq -static const TAO_Param_Data ttcp_sequence_sendOctetSeq_params [] = { -#ifndef ONEWAY - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - }, -#endif - { ttcp_sequence::_tc_OctetSeq, - PARAM_IN, - 0 - } -}; - -static const TAO_Call_Data ttcp_sequence_sendOctetSeq_TAO_Call_Data = { - "sendOctetSeq", // opname -#ifndef ONEWAY - CORBA_B_TRUE, // twoway - 2, // param count -#else - CORBA_B_FALSE, // oneway - 1, -#endif - &ttcp_sequence_sendOctetSeq_params [0], - 0, 0 -}; - -// stub -void ttcp_sequence::sendOctetSeq(const ttcp_sequence::OctetSeq &ttcp_seq, - CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_sendOctetSeq_TAO_Call_Data, 0, &ttcp_seq); -#else - istub->do_call(env, &ttcp_sequence_sendOctetSeq_TAO_Call_Data, &ttcp_seq); -#endif -} - -//sendStructSeq -static const TAO_Param_Data ttcp_sequence_sendStructSeq_params [] = { -#ifndef ONEWAY - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - }, -#endif - { ttcp_sequence::_tc_StructSeq, - PARAM_IN, - 0 - } -}; - -static const TAO_Call_Data ttcp_sequence_sendStructSeq_TAO_Call_Data = { - "sendStructSeq", // opname -#ifndef ONEWAY - CORBA_B_TRUE, // twoway - 2, // param count -#else - CORBA_B_FALSE, // oneway - 1, -#endif - &ttcp_sequence_sendStructSeq_params [0], - 0, 0 -}; - -// stub -void ttcp_sequence::sendStructSeq(const ttcp_sequence::StructSeq &ttcp_seq, - CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_sendStructSeq_TAO_Call_Data, 0, &ttcp_seq); -#else - istub->do_call(env, &ttcp_sequence_sendStructSeq_TAO_Call_Data, &ttcp_seq); -#endif -} - -// start timer -#ifndef ONEWAY -static const TAO_Param_Data ttcp_sequence_start_timer_params [] = { - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - } -}; -#endif - -static const TAO_Call_Data ttcp_sequence_start_timer_TAO_Call_Data = { - "start_timer", -#ifndef ONEWAY - CORBA_B_TRUE, // twoway - 1, - &ttcp_sequence_start_timer_params [0], -#else - CORBA_B_FALSE, // oneway - 0, - 0, -#endif - 0, 0 -}; - -//stub -void ttcp_sequence::start_timer(CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_start_timer_TAO_Call_Data); -#else - istub->do_call(env, &ttcp_sequence_start_timer_TAO_Call_Data); -#endif -} - -// stop timer -#ifndef ONEWAY -static const TAO_Param_Data ttcp_sequence_stop_timer_params [] = { - { _tc_CORBA_Void, - PARAM_RETURN, - 0 - } -}; -#endif - -static const TAO_Call_Data ttcp_sequence_stop_timer_TAO_Call_Data = { - "stop_timer", -#ifndef ONEWAY - CORBA_B_TRUE, - 1, - &ttcp_sequence_stop_timer_params[0], -#else - CORBA_B_FALSE, // oneway - 0, - 0, -#endif - 0, 0 -}; - -//stub -void ttcp_sequence::stop_timer(CORBA_Environment &env) -{ - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){ - env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO)); - return; - } -#ifndef ONEWAY - // twoway - istub->do_call(env, &ttcp_sequence_stop_timer_TAO_Call_Data); -#else - istub->do_call(env, &ttcp_sequence_stop_timer_TAO_Call_Data); -#endif -} diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.h b/TAO/IIOP/tests/Thruput_test/ttcpC.h deleted file mode 100644 index faeee26c94d..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcpC.h +++ /dev/null @@ -1,229 +0,0 @@ -// $Id$ - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of TAO -***************************************************************************/ - -#ifndef TTCP_SEQUENCE_C_H -#define TTCP_SEQUENCE_C_H - -#include <stdlib.h> -#include <string.h> - -#include "corba/orb.h" -#include "corba/stub.h" -#include "debug.h" - -// mapping for PerfStruct -struct PerfStruct{ - CORBA_Short s; - CORBA_Char c; - CORBA_Long l; - CORBA_Octet o; - CORBA_Double d; - CORBA_Octet pad[8]; - - - typedef CORBA_Octet pad_slice; - typedef pad_slice *pad_slice_ptr; - - static inline pad_slice *pad_alloc() { - return new CORBA_Octet[8]; - } - - static inline void pad_free(pad_slice *data) { - if (data) delete[] data; - } - -}; -extern CORBA_TypeCode_ptr _tc_PerfStruct; - -class ttcp_sequence; -typedef ttcp_sequence *ttcp_sequence_ptr; -typedef ttcp_sequence_ptr ttcp_sequenceRef; - -class ttcp_sequence: public virtual CORBA_Object -{ -public: - static ttcp_sequence_ptr _duplicate(ttcp_sequence_ptr obj); - static ttcp_sequence_ptr _narrow(CORBA_Object_ptr obj); - static ttcp_sequence_ptr _nil(); - - - class ShortSeq - { - public: - ShortSeq(); - ShortSeq(CORBA_ULong max); - ShortSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Short *value, - CORBA_Boolean release = CORBA_B_FALSE - ); - // ShortSeq(const ShortSeq&); - ~ShortSeq(); - CORBA_ULong maximum() const; - void length(CORBA_ULong); - CORBA_ULong length() const; - CORBA_Short &operator[](CORBA_ULong index); - const CORBA_Short &operator[](CORBA_ULong index) const; - private: - CORBA_ULong _maximum; - CORBA_ULong _length; - CORBA_Short *_buffer; - CORBA_Boolean _release; - }; - static CORBA_TypeCode_ptr _tc_ShortSeq; - - class LongSeq - { - public: - LongSeq(); - LongSeq(CORBA_ULong max); - LongSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Long *value, - CORBA_Boolean release = CORBA_B_FALSE - ); - // LongSeq(const LongSeq&); - ~LongSeq(); - CORBA_ULong maximum() const; - void length(CORBA_ULong); - CORBA_ULong length() const; - CORBA_Long &operator[](CORBA_ULong index); - const CORBA_Long &operator[](CORBA_ULong index) const; - private: - CORBA_ULong _maximum; - CORBA_ULong _length; - CORBA_Long *_buffer; - CORBA_Boolean _release; - }; - static CORBA_TypeCode_ptr _tc_LongSeq; - - class DoubleSeq - { - public: - DoubleSeq(); - DoubleSeq(CORBA_ULong max); - DoubleSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Double *value, - CORBA_Boolean release = CORBA_B_FALSE - ); - // DoubleSeq(const DoubleSeq&); - ~DoubleSeq(); - CORBA_ULong maximum() const; - void length(CORBA_ULong); - CORBA_ULong length() const; - CORBA_Double &operator[](CORBA_ULong index); - const CORBA_Double &operator[](CORBA_ULong index) const; - private: - CORBA_ULong _maximum; - CORBA_ULong _length; - CORBA_Double *_buffer; - CORBA_Boolean _release; - }; - static CORBA_TypeCode_ptr _tc_DoubleSeq; - - class CharSeq - { - public: - CharSeq(); - CharSeq(CORBA_ULong max); - CharSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Char *value, - CORBA_Boolean release = CORBA_B_FALSE - ); - // CharSeq(const CharSeq&); - ~CharSeq(); - CORBA_ULong maximum() const; - void length(CORBA_ULong); - CORBA_ULong length() const; - CORBA_Char &operator[](CORBA_ULong index); - const CORBA_Char &operator[](CORBA_ULong index) const; - private: - CORBA_ULong _maximum; - CORBA_ULong _length; - CORBA_Char *_buffer; - CORBA_Boolean _release; - }; - static CORBA_TypeCode_ptr _tc_CharSeq; - - class OctetSeq - { - public: - OctetSeq(); - OctetSeq(CORBA_ULong max); - OctetSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Octet *value, - CORBA_Boolean release = CORBA_B_FALSE - ); - // OctetSeq(const OctetSeq&); - ~OctetSeq(); - CORBA_ULong maximum() const; - void length(CORBA_ULong); - CORBA_ULong length() const; - CORBA_Octet &operator[](CORBA_ULong index); - const CORBA_Octet &operator[](CORBA_ULong index) const; - private: - CORBA_ULong _maximum; - CORBA_ULong _length; - CORBA_Octet *_buffer; - CORBA_Boolean _release; - }; - static CORBA_TypeCode_ptr _tc_OctetSeq; - - class StructSeq - { - public: - StructSeq(); - StructSeq(CORBA_ULong max); - StructSeq(CORBA_ULong max, - CORBA_ULong length, - PerfStruct *value, - CORBA_Boolean release = CORBA_B_FALSE - ); - // StructSeq(const StructSeq&); - ~StructSeq(); - CORBA_ULong maximum() const; - void length(CORBA_ULong); - CORBA_ULong length() const; - PerfStruct &operator[](CORBA_ULong index); - const PerfStruct &operator[](CORBA_ULong index) const; - private: - CORBA_ULong _maximum; - CORBA_ULong _length; - PerfStruct *_buffer; - CORBA_Boolean _release; - }; - static CORBA_TypeCode_ptr _tc_StructSeq; - - - // now the methods - virtual void sendShortSeq(const ShortSeq& ttcp_seq, CORBA_Environment &); - virtual void sendLongSeq(const LongSeq& ttcp_seq, CORBA_Environment &); - virtual void sendDoubleSeq(const DoubleSeq& ttcp_seq, CORBA_Environment &); - virtual void sendOctetSeq(const OctetSeq& ttcp_seq, CORBA_Environment &); - virtual void sendCharSeq(const CharSeq& ttcp_seq, CORBA_Environment &); - virtual void sendStructSeq(const StructSeq& ttcp_seq, CORBA_Environment &); - - virtual void start_timer(CORBA_Environment &); - virtual void stop_timer(CORBA_Environment &); - -protected: - ttcp_sequence() {} - ttcp_sequence(STUB_Object *refdata); - virtual ~ttcp_sequence() {} - -private: - ttcp_sequence(const ttcp_sequence &) {} - void operator=(const ttcp_sequence &) {} -}; - -#endif - - - - diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.cpp b/TAO/IIOP/tests/Thruput_test/ttcpS.cpp deleted file mode 100644 index 33fb95c8bcd..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcpS.cpp +++ /dev/null @@ -1,323 +0,0 @@ -// $Id$ - -#include <iostream.h> -#include "ttcpS.h" -#include "corba/orb.h" -#include "params.h" -#include "iiopobj.h" -#include "corba/optable.h" // for registering our methods -#include "corba/corbacom.h" - -TAO_Dynamic_Hash_OpTable tao_ttcp_sequence_optable(9); // 8 + 1 operations on our - // interface -// operation database -struct method_db -{ - CORBA_String opname; - TAO_Skeleton skel_ptr; -}; - -static const method_db ttcp_sequence_operations[] = { - {"_is_a", &_skel_ttcp_sequence::_ttcp_sequence_is_a_skel}, - { "sendShortSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendShortSeq_skel}, - { "sendLongSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendLongSeq_skel}, - { "sendDoubleSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendDoubleSeq_skel}, - { "sendOctetSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendOctetSeq_skel}, - { "sendCharSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendCharSeq_skel}, - { "sendStructSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendStructSeq_skel}, - { "start_timer", &_skel_ttcp_sequence::_ttcp_sequence_start_timer_skel}, - { "stop_timer", &_skel_ttcp_sequence::_ttcp_sequence_stop_timer_skel}, - { 0, 0 } -}; - -// constructor -_skel_ttcp_sequence::_skel_ttcp_sequence(const char *obj_name) -{ - CORBA_String_var type_id = "IDL:ttcp_sequence:1.0"; // repository ID - IIOP_Object *data; // IIOP object - CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA - this->optable_ = &tao_ttcp_sequence_optable; // operation database - CORBA_Long i; - - // insert operation names into the operation table - for (i=0; i < 9; i++) - { - this->optable_->bind(ttcp_sequence_operations[i].opname, - ttcp_sequence_operations[i].skel_ptr); - } - - // setup an IIOP object - data = new IIOP_Object(type_id); - 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 -} - -// skeleton sendShortSeq -void _skel_ttcp_sequence::_ttcp_sequence_sendShortSeq_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value(ttcp_sequence::_tc_ShortSeq); - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - ttcp_sequence::ShortSeq *value = (ttcp_sequence::ShortSeq *)nv->value()->value(); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->sendShortSeq(*value, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -// skeleton sendLongSeq -void _skel_ttcp_sequence::_ttcp_sequence_sendLongSeq_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value(ttcp_sequence::_tc_LongSeq); - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - ttcp_sequence::LongSeq *value = (ttcp_sequence::LongSeq *)nv->value()->value(); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->sendLongSeq(*value, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -// skeleton sendDoubleSeq -void _skel_ttcp_sequence::_ttcp_sequence_sendDoubleSeq_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value(ttcp_sequence::_tc_DoubleSeq); - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - ttcp_sequence::DoubleSeq *value = (ttcp_sequence::DoubleSeq *)nv->value()->value(); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->sendDoubleSeq(*value, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -// skeleton sendOctetSeq -void _skel_ttcp_sequence::_ttcp_sequence_sendOctetSeq_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value(ttcp_sequence::_tc_OctetSeq); - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - ttcp_sequence::OctetSeq *value = (ttcp_sequence::OctetSeq *)nv->value()->value(); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->sendOctetSeq(*value, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -// skeleton sendCharSeq -void _skel_ttcp_sequence::_ttcp_sequence_sendCharSeq_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value(ttcp_sequence::_tc_CharSeq); - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - ttcp_sequence::CharSeq *value = (ttcp_sequence::CharSeq *)nv->value()->value(); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->sendCharSeq(*value, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -// skeleton sendStructSeq -void _skel_ttcp_sequence::_ttcp_sequence_sendStructSeq_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - CORBA_NamedValue_ptr nv; - CORBA_Any temp_value(ttcp_sequence::_tc_StructSeq); - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - ttcp_sequence::StructSeq *value = (ttcp_sequence::StructSeq *)nv->value()->value(); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->sendStructSeq(*value, env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -// skeleton start_timer -void _skel_ttcp_sequence::_ttcp_sequence_start_timer_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->start_timer(env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -// skeleton stop_timer -void _skel_ttcp_sequence::_ttcp_sequence_stop_timer_skel(CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env) -{ - CORBA_NVList_ptr nvlist; - ttcp_sequence_ptr impl; - - // now create a request and populate it with the typecodes - req.orb()->create_list (0, nvlist); - - // retrieve params - call the interpreter to interpret the parameters for us. - req.params(nvlist, env); - - // now invoke the implementation - impl = (ttcp_sequence_ptr)(obj->get_subclass()); - // now the magic of dynamic binding - impl->stop_timer(env); - - // result - NO result - CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE); - req.result(any, env); -} - -void _skel_ttcp_sequence::_ttcp_sequence_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:ttcp_sequence: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 (CORBA_B_TRUE); - else - retval = new CORBA_Boolean (CORBA_B_FALSE); - - CORBA_Any *any = - new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE); - - req.result (any, env); - dexc (env, "_is_a, result"); -} - diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.h b/TAO/IIOP/tests/Thruput_test/ttcpS.h deleted file mode 100644 index 14ff95379e3..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcpS.h +++ /dev/null @@ -1,70 +0,0 @@ -// $Id$ - -/************************************************************************** -This file has been hand-crafted to work with the ORB API of TAO -***************************************************************************/ - -#ifndef TTCP_SEQUENCE_S_H -#define TTCP_SEQUENCE_S_H - -#include <stdlib.h> -#include <string.h> - -#include "ttcpC.h" - - -class _skel_ttcp_sequence; -typedef _skel_ttcp_sequence *_skel_ttcp_sequence_ptr; -typedef _skel_ttcp_sequence *_skel_ttcp_sequence_ref; - -class _skel_ttcp_sequence: public ttcp_sequence -{ -public: - // pure virtual functions implemented by the implementation class - virtual void sendShortSeq(const ShortSeq& ttcp_seq, CORBA_Environment &) = 0; - virtual void sendLongSeq(const LongSeq& ttcp_seq, CORBA_Environment &) = 0; - virtual void sendDoubleSeq(const DoubleSeq& ttcp_seq, CORBA_Environment &) = 0; - virtual void sendOctetSeq(const OctetSeq& ttcp_seq, CORBA_Environment &) = 0; - virtual void sendCharSeq(const CharSeq& ttcp_seq, CORBA_Environment &) = 0; - virtual void sendStructSeq(const StructSeq& ttcp_seq, CORBA_Environment &) = 0; - virtual void start_timer(CORBA_Environment &) = 0; - virtual void stop_timer(CORBA_Environment &) = 0; - - // skeletons that do the upcall - static void _ttcp_sequence_is_a_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_sendShortSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_sendLongSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_sendDoubleSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_sendOctetSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_sendCharSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_sendStructSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_start_timer_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); - static void _ttcp_sequence_stop_timer_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); -protected: - _skel_ttcp_sequence(const char *obj_name = 0); - virtual ~_skel_ttcp_sequence() {} -}; - -#endif - - - - diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_decl.h b/TAO/IIOP/tests/Thruput_test/ttcp_decl.h deleted file mode 100644 index 769e4bd2915..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcp_decl.h +++ /dev/null @@ -1,153 +0,0 @@ -// $Id$ - - -/* - * T T C P Header File - * - */ - -/* This file includes all the declarations and prototypes */ - -#ifndef _TTCP_DECL_H_ -#define _TTCP_DECL_H_ - -#include "ttcpC.h" - -/* #define BSD43 */ -/* #define BSD42 */ -/* #define BSD41a */ - - -#include <stdio.h> -#include <signal.h> -#include <ctype.h> -#include <errno.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <malloc.h> -#include <string.h> -#include <stdlib.h> -#include <memory.h> -#include <netinet/tcp.h> -#include <arpa/inet.h> -#include <netdb.h> -#include <sys/time.h> /* struct itimerval */ -#include <limits.h> -#include <sys/un.h> -#include <unistd.h> -#include <iostream.h> -#include <sys/resource.h> - -/* File to be included if Quantify is to be used */ -#if defined (USE_QUANTIFY) -#include <quantify.h> -#endif - - -#if defined(SYSV) -#define bcopy(b1,b2,n) memcpy(b2,b1,n) -#define bzero(b1,n) memset(b1,0,n) -#include <sys/times.h> -#include <sys/param.h> -#endif - -#if defined(SUNOS54) -struct rusage - { - struct timeval ru_utime, ru_stime; - }; -#define RUSAGE_SELF 0 -#else -#include <sys/resource.h> -#endif - -/* define the data types to be sent */ -#define SEND_SHORT ((unsigned long)(1)) -#define SEND_LONG ((unsigned long)(2)) -#define SEND_CHAR ((unsigned long)(3)) -#define SEND_OCTET ((unsigned long)(4)) -#define SEND_DOUBLE ((unsigned long)(5)) -#define SEND_STRUCT ((unsigned long)(6)) -#define SEND_COMPOSITE ((unsigned long)(7)) - -/************** -// Prototypes -***************/ -void err (char *s); -void mes (char *s); -char *outfmt (double b); -//static void getrusage (int ignored, register struct rusage *ru); -static void gettimeofday (struct timeval *tp, struct timezone *zp); -void prep_timer (void); -double read_timer (char *str, int len); -static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp); -static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1); -static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0); -static void psecs (long l, register char *cp); -void delay (int us); -int mread (int fd, register char *bufp, unsigned n); -int Nread (int fd, void *buf, int count); -int Nwrite (int fd, void *buf, int count); -void FillPattern(register char *cp, register int bufLen, unsigned long dt); -void PrintStats(); -int SetSocketBufferSize(int size, unsigned short isTrans); -int SetNoDelay(); -void ProcessArguments(int argc, char **argv, unsigned short isTrans); - -/* Global variables defined here as extern */ -extern int fromlen; -extern int domain; /* Default is to use Internet domain sockets. */ -extern char *domainname; /* Rendezvous address for UNIX domain sockets. */ -extern int fd; /* fd of network socket */ - -extern int buflen; /* length of buffer */ -extern char *buf; /* ptr to dynamic buffer */ -extern int nbuf; /* number of buffers to send in sinkmode */ - -extern int bufoffset; /* align buffer to this */ -extern int bufalign; /* modulo this */ - -extern int udp; /* 0 = tcp, !0 = udp */ -extern int options; /* socket options */ -extern int one; /* for 4.3 BSD style setsockopt() */ -extern short port; /* TCP port number */ -extern char *host; /* ptr to name of host */ -extern int trans; /* 0=receive, !0=transmit mode */ -extern int sinkmode; /* 0=normal I/O, !0=sink/source mode */ -extern int verbose; /* 0=print basic info, 1=print cpu rate, proc - * resource usage. */ -extern int nodelay; /* set TCP_NODELAY socket option */ -extern int b_flag; /* use mread() */ -extern int sockbufsize; /* socket buffer size to use */ -extern int new_line; /* This is a special flag */ -extern int write_to_file; /* indecates writing to file (default)*/ -extern char fmt; /* output format:k=kilobits,K=kilobytes, - * m = megabits, M = megabytes, - * g = gigabits, G = gigabytes */ -extern int touchdata; /* access data after reading */ - -extern struct hostent *addr; -extern int errno; -extern int optind; -extern char *optarg; -extern char *title; - -extern char stats[128]; -extern unsigned long srcDataSize; /* Total amount of source data */ -extern unsigned long nbytes; /* bytes on net */ -extern unsigned long numCalls; /* # of I/O system calls */ -extern double cput, realt; /* user, real time (seconds) */ -extern unsigned long dt; - -extern unsigned short isDone; - -/* declare struct variables for various message types */ -extern ttcp_sequence::ShortSeq *sseq; -extern ttcp_sequence::LongSeq *lseq; -extern ttcp_sequence::OctetSeq *oseq; -extern ttcp_sequence::DoubleSeq *dseq; -extern ttcp_sequence::CharSeq *cseq; -extern ttcp_sequence::StructSeq *Sseq; - -#endif diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp b/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp deleted file mode 100644 index d98fcd1b4b3..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// $Id$ - -#include "ttcp_i.h" -#include <iostream.h> - -/* the ttcp_i class implementation */ -ttcp_sequence_i::ttcp_sequence_i(const char *obj_name) - :_skel_ttcp_sequence(obj_name) -{ - this->nbytes_ = 0; - numCalls = 0; -} - - -void -ttcp_sequence_i::start_timer (CORBA_Environment &IT_env) -{ - this->nbytes_ = 0; - ::prep_timer (); -} - -void -ttcp_sequence_i::stop_timer (CORBA_Environment &IT_env) -{ - (void) ::read_timer (stats, sizeof (stats)); - ::nbytes = this->nbytes_; - ::PrintStats(); - // reset - this->nbytes_ = 0; - numCalls = 0; -#if defined (USE_QUANTIFY) - quantify_stop_recording_data(); - ACE_Reactor::end_event_loop(); - cerr << "*********** just before exiting " << endl; -#endif -} - -void -ttcp_sequence_i::sendShortSeq(const ttcp_sequence::ShortSeq& ttcp_seq, CORBA_Environment &IT_env) -{ - numCalls++; - this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Short); -} - -void -ttcp_sequence_i::sendLongSeq(const ttcp_sequence::LongSeq& ttcp_seq, CORBA_Environment &IT_env) -{ - numCalls++; - this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Long) ; -} - -void -ttcp_sequence_i::sendOctetSeq(const ttcp_sequence::OctetSeq& ttcp_seq, CORBA_Environment &IT_env) -{ - numCalls++; - this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Octet) ; -} - -void -ttcp_sequence_i::sendDoubleSeq(const ttcp_sequence::DoubleSeq& ttcp_seq, CORBA_Environment &IT_env) -{ - numCalls++; - this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Double) ; -} - -void -ttcp_sequence_i::sendCharSeq(const ttcp_sequence::CharSeq& ttcp_seq, CORBA_Environment &IT_env) -{ - numCalls++; - this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Char) ; -} - -void -ttcp_sequence_i::sendStructSeq(const ttcp_sequence::StructSeq& ttcp_seq, CORBA_Environment &IT_env) -{ - numCalls++; - this->nbytes_ += ttcp_seq.length()*sizeof(PerfStruct) ; -#ifdef DEBUG - // cout << "Bytes received so far = " << this->nbytes_ << endl; -#endif -} - - - - - - - - - diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.h b/TAO/IIOP/tests/Thruput_test/ttcp_i.h deleted file mode 100644 index 71d2266e334..00000000000 --- a/TAO/IIOP/tests/Thruput_test/ttcp_i.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - - -// ttcp_i.h -// -// This header file provides facility to use it either as a BOA approach or as -// a TIE approach. -// -#if !defined (TTCP_I_H) -#define TTCP_I_H - -#include "ttcp_decl.h" -#include "ttcpS.h" - -/* define the data types to be sent */ -#define SEND_SHORT ((unsigned long)(1)) -#define SEND_LONG ((unsigned long)(2)) -#define SEND_CHAR ((unsigned long)(3)) -#define SEND_OCTET ((unsigned long)(4)) -#define SEND_DOUBLE ((unsigned long)(5)) -#define SEND_STRUCT ((unsigned long)(6)) - - -class ttcp_sequence_i: public _skel_ttcp_sequence -{ -public: - ttcp_sequence_i(const char *obj_name = 0); - - virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, - CORBA_Environment &IT_env); - - /* Routines to calculate the time required to transfer */ - virtual void start_timer (CORBA_Environment &IT_env); - virtual void stop_timer (CORBA_Environment &IT_env); - -private: - unsigned long nbytes_; -}; - -#endif // defined (TTCP_I_H) - diff --git a/TAO/IIOP/tests/Thruput_test/utils.cpp b/TAO/IIOP/tests/Thruput_test/utils.cpp deleted file mode 100644 index f1e30507799..00000000000 --- a/TAO/IIOP/tests/Thruput_test/utils.cpp +++ /dev/null @@ -1,561 +0,0 @@ -// $Id$ - -#include "ttcp_decl.h" - -int SetSocketBufferSize(int size, unsigned short isTrans) -{ - // go thru open file descriptors and check if its is a socket and - // if so, set its socket size to "size" - struct rlimit rlm; - memset(&rlm, 0, sizeof(struct rlimit)); - (void) getrlimit(RLIMIT_NOFILE, &rlm); - cout << "Total file descriptors = " << rlm.rlim_max << endl; - for (int i=3; i < rlm.rlim_max; i++){ - if (isTrans) - (void) setsockopt(i, SOL_SOCKET, SO_SNDBUF, - (char *) &size, sizeof(size)); - else - (void) setsockopt(i, SOL_SOCKET, SO_RCVBUF, - (char *) &size, sizeof(size)); - } - return 1; -} - -void -err (char *s) -{ - fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r"); - perror (s); - fprintf (stderr, "errno=%d\n", errno); - exit (1); -} - -void -mes (char *s) -{ - fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s); -} - -char * -outfmt (double b) -{ - static char obuf[50]; - switch (fmt) - { - case 'G': - sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0); - break; - default: - case 'K': - sprintf (obuf, "%.2f KB", b / 1024.0); - break; - case 'M': - sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0); - break; - case 'g': - sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0); - break; - case 'k': - sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0); - break; - case 'm': - sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0); - break; - } - return obuf; -} - -static struct itimerval itime0; /* Time at which timing started */ -static struct rusage ru0; /* Resource utilization at the start */ - -#if defined(SYSV) -/*ARGSUSED */ -static void -getrusage (int ignored, register struct rusage *ru) -{ - struct tms buf; - - times (&buf); - - /* Assumption: HZ <= 2147 (LONG_MAX/1000000) */ - ru->ru_stime.tv_sec = buf.tms_stime / HZ; - ru->ru_stime.tv_usec = ((buf.tms_stime % HZ) * 1000000) / HZ; - ru->ru_utime.tv_sec = buf.tms_utime / HZ; - ru->ru_utime.tv_usec = ((buf.tms_utime % HZ) * 1000000) / HZ; -} - -/*ARGSUSED */ -static void -gettimeofday (struct timeval *tp, struct timezone *zp) -{ - tp->tv_sec = time (0); - tp->tv_usec = 0; -} -#endif /* SYSV */ -/* - * P R E P _ T I M E R - */ -void -prep_timer () -{ - itime0.it_interval.tv_sec = 0; - itime0.it_interval.tv_usec = 0; - itime0.it_value.tv_sec = LONG_MAX / 22; /* greatest possible value , itimer() count backwards */ - itime0.it_value.tv_usec = 0; - - - getrusage (RUSAGE_SELF, &ru0); - - /* Init REAL Timer */ - if (setitimer (ITIMER_REAL, &itime0, NULL)) - { - perror ("Setting 'itimer' REAL failed"); - return; - } - -} - -/* - * R E A D _ T I M E R - * - */ -double -read_timer (char *str, int len) -{ - struct itimerval itimedol; - struct rusage ru1; - struct timeval td; - struct timeval tend, tstart; - char line[132]; - - getrusage (RUSAGE_SELF, &ru1); - - if (getitimer (ITIMER_REAL, &itimedol)) - { - perror ("Getting 'itimer' REAL failed"); - return (0.0); - } - - prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line); - (void) strncpy (str, line, len); - - /* Get real time */ - tvsub (&td, &itime0.it_value, &itimedol.it_value); - realt = td.tv_sec + ((double) td.tv_usec) / 1000000; - - /* Get CPU time (user+sys) */ - tvadd (&tend, &ru1.ru_utime, &ru1.ru_stime); - tvadd (&tstart, &ru0.ru_utime, &ru0.ru_stime); - tvsub (&td, &tend, &tstart); - cput = td.tv_sec + ((double) td.tv_usec) / 1000000; - if (cput < 0.00001) - cput = 0.00001; - return (cput); -} - -static void -prusage (register struct rusage *r0, struct rusage *r1, - struct timeval *e, struct timeval *b, char *outp) -{ - struct timeval tdiff; - register time_t t; - register char *cp; - register int i; - int ms; - - t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 + - (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 + - (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 + - (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000; - ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000; - -#define END(x) {while(*x) x++;} -#if defined(SYSV) - cp = "%Uuser %Ssys %Ereal %P"; -#else -#if defined(sgi) /* IRIX 3.3 will show 0 for %M,%F,%R,%C */ - cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw"; -#else - cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw"; -#endif -#endif - for (; *cp; cp++) - { - if (*cp != '%') - *outp++ = *cp; - else if (cp[1]) - switch (*++cp) - { - - case 'U': - tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime); - sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000); - END (outp); - break; - - case 'S': - tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime); - sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000); - END (outp); - break; - - case 'E': - psecs (ms / 100, outp); - END (outp); - break; - - case 'P': - sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1)))); - END (outp); - break; - -#if !defined(SYSV) - case 'W': - i = r1->ru_nswap - r0->ru_nswap; - sprintf (outp, "%d", i); - END (outp); - break; - - case 'X': - sprintf (outp, "%d", t == 0 ? 0 : (r1->ru_ixrss - r0->ru_ixrss) / t); - END (outp); - break; - - case 'D': - sprintf (outp, "%d", t == 0 ? 0 : - (r1->ru_idrss + r1->ru_isrss - (r0->ru_idrss + r0->ru_isrss)) / t); - END (outp); - break; - - case 'K': - sprintf (outp, "%d", t == 0 ? 0 : - ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) - - (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t); - END (outp); - break; - - case 'M': - sprintf (outp, "%d", r1->ru_maxrss / 2); - END (outp); - break; - - case 'F': - sprintf (outp, "%d", r1->ru_majflt - r0->ru_majflt); - END (outp); - break; - - case 'R': - sprintf (outp, "%d", r1->ru_minflt - r0->ru_minflt); - END (outp); - break; - - case 'I': - sprintf (outp, "%d", r1->ru_inblock - r0->ru_inblock); - END (outp); - break; - - case 'O': - sprintf (outp, "%d", r1->ru_oublock - r0->ru_oublock); - END (outp); - break; - case 'C': - sprintf (outp, "%d+%d", r1->ru_nvcsw - r0->ru_nvcsw, - r1->ru_nivcsw - r0->ru_nivcsw); - END (outp); - break; -#endif /* !SYSV */ - } - } - *outp = '\0'; -} - -static void -tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) -{ - - tsum->tv_sec = t0->tv_sec + t1->tv_sec; - tsum->tv_usec = t0->tv_usec + t1->tv_usec; - if (tsum->tv_usec > 1000000) - tsum->tv_sec++, tsum->tv_usec -= 1000000; -} - -static void -tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0) -{ - - tdiff->tv_sec = t1->tv_sec - t0->tv_sec; - tdiff->tv_usec = t1->tv_usec - t0->tv_usec; - if (tdiff->tv_usec < 0) - tdiff->tv_sec--, tdiff->tv_usec += 1000000; -} - -static void -psecs (long l, register char *cp) -{ - register int i; - - i = l / 3600; - if (i) - { - sprintf (cp, "%d:", i); - END (cp); - i = l % 3600; - sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10); - END (cp); - } - else - { - i = l; - sprintf (cp, "%d", i / 60); - END (cp); - } - i %= 60; - *cp++ = ':'; - sprintf (cp, "%d%d", i / 10, i % 10); -} - -/* - * N R E A D - */ -int -Nread (int fd, void *buf, int count) -{ - struct sockaddr_in from; - int len = sizeof (from); - register int cnt; - if (udp) - { - cnt = recvfrom (fd, (char *) buf, count, 0, (struct sockaddr *) &from, &len); - numCalls++; - } - else - { - if (b_flag) - cnt = mread (fd, (char *) buf, count); /* fill buf */ - else - { - cnt = read (fd, buf, count); - numCalls++; - } - if (touchdata && cnt > 0) - { - register int c = cnt, sum; - register char *b = (char *) buf; - while (c--) - sum += *b++; - } - } - return (cnt); -} - - -/* - * N W R I T E - */ -int -Nwrite (int fd, void *buf, int count) -{ - return 0; -} - -void -delay (int us) -{ - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = us; - (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv); -} - -/* - * M R E A D - * - * This function performs the function of a read(II) but will - * call read(II) multiple times in order to get the requested - * number of characters. This can be necessary because - * network connections don't deliver data with the same - * grouping as it is written with. Written by Robert S. Miles, BRL. - */ -int -mread (int fd, register char *bufp, unsigned n) -{ - register unsigned count = 0; - register int nread; - - do - { - nread = read (fd, bufp, n - count); - numCalls++; - if (nread < 0) - { - perror ("ttcp_mread"); - return (-1); - } - if (nread == 0) - return ((int) count); - count += (unsigned) nread; - bufp += nread; - } - while (count < n); - - return ((int) count); -} - -void -FillPattern (register char *cp, register int bufLen, unsigned long dt) -{ - unsigned long - num, i; - - switch(dt){ - case SEND_SHORT: - { - register short *SeqPtr = (short *)cp; - num = bufLen/sizeof(short); - for (i=0; i < num; i++) - SeqPtr[i] = (short)lrand48(); - sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr); - } - break; - case SEND_LONG: - { - register long *SeqPtr = (long *)cp; - num = bufLen/sizeof(long); - for (i=0; i < num; i++) - SeqPtr[i] = lrand48(); - lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr); - } - break; - case SEND_DOUBLE: - { - register double *SeqPtr = (double *)cp; - num = bufLen/sizeof(double); - for (i=0; i < num; i++) - SeqPtr[i] = drand48(); - dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr); - } - break; - case SEND_CHAR: - { - register CORBA_Char *SeqPtr = (CORBA_Char *)cp; - register char c = 0; - num = bufLen/sizeof(char); - for(i=0; i < num; i++){ - while (!isprint(c & 0x7f)) - c++; - SeqPtr[i] = (c++ & 0x7f); - } - cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr); - } - break; - case SEND_STRUCT: - { - register PerfStruct *SeqPtr = (PerfStruct *)cp; - register char c = 0; - num = bufLen/sizeof(PerfStruct); - for (i=0; i < num; i++){ - SeqPtr[i].s = (short)lrand48(); - SeqPtr[i].l = lrand48(); - SeqPtr[i].d = drand48(); - while (!isprint(c & 0x7f)) - c++; - SeqPtr[i].c = (c++ & 0x7f); - while (!isprint(c & 0x7f)) - c++; - SeqPtr[i].o = (unsigned char)(c++ & 0x7f); - } - Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr); - - } - break; - case SEND_OCTET: - default: - { - register CORBA_Octet *SeqPtr = (CORBA_Octet *)cp; - register char c = 0; - num = bufLen/sizeof(CORBA_Octet); - for(i=0; i < num; i++){ - while (!isprint(c & 0x7f)) - c++; - SeqPtr[i] = (c++ & 0x7f); - } - oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr); - } - break; - } -} -void PrintStats() -{ - if (cput <= 0.0) - cput = 0.001; - if (realt <= 0.0) - realt = 0.001; - -//#if defined (LM_RESULTS) - if (trans && (title != 0)) - { - double tmp; - FILE *outFile; - char filename[BUFSIZ]; - - strcpy(filename, title); - switch(dt){ - case SEND_SHORT: - strcat(filename, ".shortSeq.results"); - break; - case SEND_LONG: - strcat(filename, ".longSeq.results"); - break; - case SEND_DOUBLE: - strcat(filename, ".doubleSeq.results"); - break; - case SEND_CHAR: - strcat(filename, ".charSeq.results"); - break; - case SEND_STRUCT: - strcat(filename, ".structSeq.results"); - break; - case SEND_COMPOSITE: - strcat(filename, ".compositeSeq.results"); - break; - case SEND_OCTET: - default: - strcat(filename, ".octetSeq.results"); - break; - } - outFile = fopen (filename, "a+"); - if (new_line) - fprintf (outFile, "\n -l %ldk \t", buflen / 1024); - tmp = ((double) nbytes) / realt; - fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0); - fclose (outFile); - } -//#endif - - fprintf (stdout, - "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n", - trans ? "-t" : "-r", - nbytes, realt, outfmt (((double) nbytes) / realt)); - if (verbose) - { - fprintf (stdout, - "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n", - trans ? "-t" : "-r", - nbytes, cput, outfmt (((double) nbytes) / cput)); - } - fprintf (stdout, - "ttcp%s: %d Server Method calls, msec/call = %.2f, calls/sec = %.2f\n", - trans ? "-t" : "-r", - numCalls, - 1024.0 * realt / ((double) numCalls), - ((double) numCalls) / realt); - fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats); - if (verbose) - { - fprintf (stdout, - "ttcp%s: buffer address %#x\n", - trans ? "-t" : "-r", - buf); - } -} diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw deleted file mode 100644 index 979417360d2..00000000000 --- a/TAO/TAOACE.dsw +++ /dev/null @@ -1,80 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ACE dynamic library"=..\ace\ace_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "TAO"=.\tao\TAO.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name ACE dynamic library
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "orbsvcs"=.\orbsvcs\orbsvcs\orbsvcs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name TAO
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name ACE dynamic library
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name tao_idl
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "tao_idl"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name ACE dynamic library
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/announcement b/TAO/announcement deleted file mode 100755 index f9d33c28e9e..00000000000 --- a/TAO/announcement +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -VERSION=`cat VERSION` -URL="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO.tar.gz" - - -cat <<@EOM - -The first official beta release of The ACE ORB (TAO) has been released -by the Distributed Object Computing (DOC) Group at Washington -University in St. Louis. TAO is a freely available CORBA -2.x-compliant ORB with real-time extensions that can be downloaded -from the Internet at - -http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO.tar.gz - -$VERSION - -TAO uses IIOP 1.0 as its inter-ORB communication protocol and provides -the first implementation of the OMG's Portable Object Adapter (POA) -specification and latest IDL->C++ mappings. For more information -about the POA, please see - -http://www.cs.wustl.edu/~schmidt/C++-report-col11.ps.gz -http://www.cs.wustl.edu/~schmidt/C++-report-col12.ps.gz - -For more information on TAO, please see - -http://www.cs.wustl.edu/~schmidt/TAO.html - -TAO has been ported to a range of OS platforms including Windows NT -4.x using MSVC++ 4.x and 5.x, several versions of UNIX (e.g., Solaris -2.x, SGI IRIX 6.x, Linux, SCO, NetBSD, and FreeBSD), and Real-Time -OS's (RTOSs) (e.g., VxWorks and Chorus). Ultimately, TAO will be -ported to all OS platforms on which ACE runs. We have used TAO to -interwork with other ORBs (e.g., Orbix, COOL, CORBAPlus, and -VisiBroker), so we're confident that its IIOP implementation is robust -and interoperable. - -For information on installation and system requirements, please see -http://www.cs.wustl.edu/~schmidt/TAO-INSTALL.html (or INSTALL) in the -root directory of the unpacked tar file. - -Note that ACE is required to build TAO. Typically the most recent -beta release is required, which you can obtain at - -http://www.cs.wustl.edu/~schmidt/ACE.html - -Please see the installation notes for more details. - -Other HTML documentation is available in the '$TAO_ROOT/docs/' -directory. - -We welcome suggestions for improvement, bug fixes, portability -enhancements, etc. If you have any questions or problems with TAO, -please post them to the ACE mailing list (ace-users@cs.wustl.edu) or -send email to Douglas C. Schmidt (schmidt@cs.wustl.edu) and Chris -Cleeland (cleeland@cs.wustl.edu). - -The TAO Team -@EOM diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl b/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl deleted file mode 100644 index 952301d7091..00000000000 --- a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl +++ /dev/null @@ -1,250 +0,0 @@ -// $Id$ - -// IDL for Control and Management of Audio/Video Streams -// Revised Submission - -// Additional IDL for full profile -#include "AVStreams.idl" - -module AVStreams_Full -{ - exception protocolNotSupported{}; - exception formatNotSupported{}; - exception formatMismatch{}; - exception FEPMismatch{}; - exception alreadyConnected{}; - exception invalidSettings{string settings;}; - exception notConnected{}; - exception deviceQosMismatch{}; - exception failedToConnect{string reason;}; - exception failedToListen{string reason;}; - - - interface FlowProducer; - interface FlowConsumer; - interface FlowEndPoint; - interface FDev; - - interface FlowConnection : PropertyService::PropertySet - { - void stop(); - void start(); - void destroy(); - - boolean modify_QoS( - - inout AVStreams::QoS new_qos) - raises (AVStreams::QoSRequestFailed); - - boolean use_flow_protocol( - in string fp_name, - in any fp_settings) - raises (AVStreams::FPError, AVStreams::notSupported); - - oneway void push_event(in AVStreams::streamEvent the_event); - - boolean connect_devs(in FDev a_party, in FDev b_party, - inout AVStreams::QoS the_qos) - raises (AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::QoSRequestFailed); - - boolean connect( - in FlowProducer flow_producer, - in FlowConsumer flow_consumer, - inout AVStreams::QoS the_qos) - raises (formatMismatch, FEPMismatch, alreadyConnected); - - boolean disconnect(); - - // The notSupported exception is raised where - // flow cannot have multiple producers - boolean add_producer(in FlowProducer flow_producer, - inout AVStreams::QoS the_qos) - raises (alreadyConnected, AVStreams::notSupported); - - boolean add_consumer(in FlowConsumer flow_consumer, - inout AVStreams::QoS the_qos) - raises (alreadyConnected); - - boolean drop(in FlowEndPoint target) - raises (notConnected); - }; - - interface FlowEndPoint : PropertyService::PropertySet - { - boolean lock(); - void unlock(); - - void stop(); - void start(); - void destroy(); - - // Default is a nil object reference - attribute AVStreams::StreamEndPoint related_sep; - attribute FlowConnection related_flow_connection; - - FlowEndPoint get_connected_fep() - raises (notConnected, - AVStreams::notSupported); - - // syntax of fp_name is <flowProtocol> - boolean use_flow_protocol(in string fp_name, - in any fp_settings) - raises (AVStreams::FPError, AVStreams::notSupported); - - // set_format() initializes 'format' - // as current media format e.g. MPEG. - void set_format(in string format) - raises (AVStreams::notSupported); - - void set_dev_params( - in PropertyService::Properties new_settings) - raises (PropertyService::PropertyException, - AVStreams::streamOpFailed); - - void set_protocol_restriction(in AVStreams::protocolSpec - the_spec) - raises (AVStreams::notSupported); - - boolean is_fep_compatible(in FlowEndPoint fep) - raises (formatMismatch, deviceQosMismatch); - - boolean set_peer( - in FlowConnection the_fc, - - in FlowEndPoint the_peer_fep, - inout AVStreams::QoS the_qos) - raises (AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed); - - boolean set_Mcast_peer( - in FlowConnection the_fc, - in AVStreams::MCastConfigIf a_mcastconfigif, - inout AVStreams::QoS the_qos) - raises (AVStreams::QoSRequestFailed); - - }; - - interface FlowProducer : FlowEndPoint - { - boolean connect_to_peer(inout AVStreams::QoS the_qos, - in string address, - - in string use_flow_protocol) // syntax <flowProtocol> - raises(failedToConnect, - AVStreams::FPError, AVStreams::QoSRequestFailed); - - string connect_mcast(inout AVStreams::QoS the_qos, - out boolean is_met, - in string address, - in string use_flow_protocol) - raises (failedToConnect, - AVStreams::notSupported, - AVStreams::FPError, - AVStreams::QoSRequestFailed); - - string get_rev_channel(in string pcol_name); - - void set_key(in AVStreams::key the_key); - void set_source_id(in long source_id); - }; - - interface FlowConsumer : FlowEndPoint - { - - - // Needs to know its peer to choose its protocol correctly - // Also to ask for a reverse channel for credit-based flow - // control, if one is required - string go_to_listen( - inout AVStreams::QoS the_qos, - in boolean is_mcast, - in FlowProducer peer, - inout string flowProtocol)// syntax <flowProtocol> - raises(failedToListen, AVStreams::FPError, - AVStreams::QoSRequestFailed); - }; - - interface FDev : PropertyService::PropertySet { - FlowProducer create_producer( - in FlowConnection the_requester, - inout AVStreams::QoS the_qos, - out boolean met_qos, - inout string named_fdev) - raises(AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed); - - FlowConsumer create_consumer( - in FlowConnection the_requester, - inout AVStreams::QoS the_qos, - out boolean met_qos, - inout string named_fdev) - raises(AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed); - - FlowConnection bind(in FDev peer_device, - inout AVStreams::QoS the_qos, - out boolean is_met) - raises (AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed); - - FlowConnection bind_mcast(in FDev first_peer, - inout AVStreams::QoS the_qos, - out boolean is_met) - raises (AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed); - - void destroy(in FlowEndPoint the_ep, in string fdev_name) - // ie FDev not found - raises (AVStreams::notSupported); - }; - - enum PositionOrigin { - AbsolutePosition, RelativePosition, ModuloPosition - }; - - enum PositionKey { - ByteCount, SampleCount, MediaTime - }; - - struct Position { - PositionOrigin origin; - PositionKey key; - long value; - }; - - exception PostionKeyNotSupported { PositionKey key;}; - exception InvalidPosition { PositionKey key;}; - - // MediaControl interface is similar to - // ControlledStream interface in MSS. - // It can be inherited by flow endpoints or - // FlowConnection interfaces. - interface MediaControl{ - - exception PostionKeyNotSupported { PositionKey key;}; - - Position get_media_position( - in PositionOrigin an_origin, - in PositionKey a_key) - raises (PostionKeyNotSupported); - - void set_media_position(in Position a_position) - raises (PostionKeyNotSupported, InvalidPosition); - - void start(in Position a_position) - raises(InvalidPosition); - void pause(in Position a_position) - raises(InvalidPosition); - void resume(in Position a_position) - raises(InvalidPosition); - void stop(in Position a_position) - raises(InvalidPosition); - }; -}; - diff --git a/TAO/release.pl b/TAO/release.pl deleted file mode 100755 index 28c741f69e1..00000000000 --- a/TAO/release.pl +++ /dev/null @@ -1,91 +0,0 @@ -# $Id$ -# -# Takes over some of the release work rather than having it all -# inline in the Makefile. - -$date = `/usr/bin/date +"%a %b %d %T %Y"`; -chop $date; -$VERSION = "VERSION"; -$CHANGELOG = "ChangeLog"; -$TAO_VERSION = ''; -$MODNAME = 'TAO'; - -# Range of values on this is "alpha", "beta", or "major", -# in which case the 3rd, 2nd, or 1st digit. -$BUMP_WHICH = $ENV{'RELEASE_TYPE'}; - -sub inplace { - my($ext, @files) = @_; - my(@nfiles) = (); - my($nfile); - $ext = '~' if ($ext eq ''); - foreach $file (@files) { - $nfile = $file . $ext; - if (rename ($file, $nfile)) { - push(@nfiles, $nfile); - } - else { - warn "Unable to rename $files[$i] for in-place editing: $!\n"; - } - } - @nfiles; -} - -@inplace = inplace('.del', $VERSION, $CHANGELOG); - -open (VERSION, $inplace[0]) - || die "Unable to open file $inplace[0] for inplace edit: $!\n"; -open (VERSIONOUT, ">$VERSION") - || die "Unable to open file $VERSION for writing: $!\n"; - -undef $version_number; -while (<VERSION>) { - if ($BUMP_WHICH =~ m/major/i) { - $bump_expr = 'sprintf("$1%d.0.0", $2+1)'; - } - elsif ($BUMP_WHICH =~ m/beta/i) { - $bump_expr = 'sprintf("$1$2.%d.0", $3+1)'; - } - else { - $bump_expr = 'sprintf("$1$2.$3.%d", $4+1)'; - } - $subst = 's/(TAO version )(\d+)\.(\d+)\.(\d+)/' . $bump_expr . '/e'; - eval $subst; - ($version_number = $_) =~ s/.*(\d+\.\d+\.\d+).*/$1/ if (!defined($version_number)); - if (s/(, released ).*/$1$date./) { - ($TAO_VERSION = $_) =~ s/^This is //; - } - print VERSIONOUT $_; -} - -close (VERSIONOUT); -close (VERSION); -chmod 0644, $VERSION; - -$message = $date." ".$ENV{"SIGNATURE"}." <".$ENV{"LOGNAME"}."\@cs.wustl.edu>\n\n\t* ".$TAO_VERSION."\n"; -$message_printed = 0; - -open (CHANGELOG, $inplace[1]) - || die "Unable to open file $inplace[1] for inplace edit: $!\n"; -open (CHANGELOGOUT, ">$CHANGELOG") - || die "Unable to open file $CHANGELOG for writing: $!\n"; - -while (<CHANGELOG>) { - print CHANGELOGOUT "$message" if ( ! $message_printed++ ); - print CHANGELOGOUT $_; -} - -close (CHANGELOG); -close (CHANGELOGOUT); -chmod 0644, $CHANGELOG; - -# Morph the version number -chop $version_number; -($version_tag = $MODNAME."-".$version_number) =~ s/\./_/g; - -$CVSCOM = 'cvs'; -$COM = qq/$CVSCOM commit -m'$TAO_VERSION' $VERSION $CHANGELOG && $CVSCOM rtag $version_tag $MODNAME && $CVSCOM rtag -F Current $MODNAME/; -print $COM; -system $COM; - -unlink @inplace; diff --git a/TAO/tao/CORBA.cpp b/TAO/tao/CORBA.cpp deleted file mode 100644 index 46ccc7c2033..00000000000 --- a/TAO/tao/CORBA.cpp +++ /dev/null @@ -1,177 +0,0 @@ -// $Id$ - -#include "tao/corba.h" - -// String utility support; this can need to be integrated with the -// ORB's own memory allocation subsystem. - -CORBA::String -CORBA::string_copy (const CORBA::Char *str) -{ - if (!str) - return 0; - - CORBA::String retval = - CORBA::string_alloc (ACE_OS::strlen (str)); - - // clear the contents of the allocated string - ACE_OS::memset(retval, '\0', ACE_OS::strlen (str)); - - return ACE_OS::strcpy (retval, str); -} - -CORBA::String_var & -CORBA::String_var::operator= (char *p) -{ - if (this->ptr_ != p) - { - if (this->ptr_ != 0) - CORBA::string_free (this->ptr_); - this->ptr_ = p; - } - return *this; -} - -CORBA::String_var & -CORBA::String_var::operator= (const char *p) -{ - if (this->ptr_ != 0) - CORBA::string_free (this->ptr_); - - this->ptr_ = CORBA::string_dup (p); - return *this; -} - -CORBA::String_var & -CORBA::String_var::operator= (const CORBA::String_var& r) -{ - if (this != &r) - { - if (this->ptr_ != 0) - CORBA::string_free (this->ptr_); - this->ptr_ = CORBA::string_dup (r.ptr_); - } - return *this; -} - -// Wide Character string utility support; this can need to be -// integrated with the ORB's own memory allocation subsystem. - -CORBA::WString -CORBA::wstring_alloc (CORBA::ULong len) -{ - return new CORBA::WChar [(size_t) (len + 1)]; -} - -static -inline -CORBA::WChar * -wscpy (CORBA::WChar *dest, - const CORBA::WChar *src) -{ - CORBA::WChar *retval = dest; - - while ((*dest++ = *src++) != 0) - continue; - return retval; -} - -CORBA::WString -CORBA::wstring_copy (const CORBA::WChar *const str) -{ - if (*str) - return 0; - - CORBA::WString retval = CORBA::wstring_alloc (ACE_WString::wstrlen (str)); - return wscpy (retval, str); -} - -void -CORBA::wstring_free (CORBA::WChar *const str) -{ - delete [] str; -} - -// ORB initialisation, per OMG document 94-9-46. -// -// XXX in addition to the "built in" Internet ORB, there will be ORBs -// which are added separately, e.g. through a DLL listed in the -// registry. Registry will be used to assign orb names and to -// establish which is the default. - -CORBA::ORB_ptr -CORBA::ORB_init (int &argc, - char *const *argv, - const char * /* orb_name */, - CORBA::Environment &env) -{ - // Using ACE_Static_Object_Lock::instance() precludes ORB_init from - // being called within a static object CTOR. - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, - *ACE_Static_Object_Lock::instance (), 0)); - - env.clear (); - - // @@ We need to make sure it's ok for the following 3 - // initialization routines to be called multiple times. Or better - // yet, ensure that we just call them the first time, e.g., by - // putting them in some type of TAO_Object_Manager, along with the - // Typecode_Constants... - - // Put these initializations here so that exceptions are enabled - // immediately. - TAO_Marshal::initialize (); - TAO_Exceptions::init_standard_exceptions (env); - TAO_IIOP_Interpreter::init_table (); - - if (env.exception () != 0) - return 0; - - // Verify some of the basic implementation requirements. This test - // gets optimized away by a decent compiler (or else the rest of the - // routine does). - // - // NOTE: we still "just" assume that native floating point is IEEE. - - if (sizeof (CORBA::Short) != 2 - || sizeof (CORBA::Long) != 4 - || sizeof (CORBA::LongLong) != 8 - || sizeof (CORBA::Float) != 4 - || sizeof (CORBA::Double) != 8 - || sizeof (CORBA::LongDouble) != 16 - || sizeof (CORBA::WChar) < 2 - || sizeof (void *) != ACE_SIZEOF_VOID_P) - { - ACE_DEBUG ((LM_DEBUG, "%s; ERROR: unexpected basic type size; " - "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n", - sizeof (CORBA::Short), - sizeof (CORBA::Long), - sizeof (CORBA::LongLong), - sizeof (CORBA::Float), - sizeof (CORBA::Double), - sizeof (CORBA::LongDouble), - sizeof (CORBA::WChar), - sizeof (void *))); - - env.exception (new CORBA::INITIALIZE (CORBA::COMPLETED_NO)); - return 0; - } - - // Initialize the ORB Core instance. - int result = TAO_ORB_Core_instance ()->init (argc, (char **)argv); - - // check for errors and return 0 if error. - if (result == -1) - { - env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO)); - return 0; - } - - return TAO_ORB_Core_instance()->orb (); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Unbounded_Sequence<CORBA::Octet>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/factories.h b/TAO/tao/factories.h deleted file mode 100644 index 496dae62ed2..00000000000 --- a/TAO/tao/factories.h +++ /dev/null @@ -1,141 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// factories.h -// -// = AUTHOR -// Chris Cleeland -// -// = VERSION -// $Id$ -// ============================================================================ - -#if !defined (TAO_FACTORIES_H) -# define TAO_FACTORIES_H - -#if 0 -# include "ace/SOCK_Acceptor.h" -# include "ace/SOCK_Connector.h" -# include "ace/Strategies_T.h" -# include "ace/Connector.h" -# include "ace/Synch.h" - -# include "tao/params.h" -# include "tao/connect.h" -# include "tao/objtable.h" -#endif - -class TAO_Client_Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> - // = TITLE - // <Svc_Handler> used on the client side and returned - // by the <TAO_Client_Factory::CONNECTOR>. -{ -public: - TAO_Client_Connection_Handler (ACE_Thread_Manager* = 0); - // Do-nothing constructor - - virtual int open (void*); - // Initialization hook - - void in_use (CORBA::Boolean); - // Set the in-use flag. - - CORBA::Boolean in_use (void); - // Return state of the in-use flag. - -private: - CORBA::Boolean in_use_; - // True value indicates that something is using this handler. -}; - -class TAO_Client_Factory - // = TITLE - // Abstract factory used by the client to turn out various - // strategies used on the client side. -{ -public: - typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR> - CONNECTOR; - typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler> - NULL_CREATION_STRATEGY; - typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, - ACE_SOCK_CONNECTOR, - ACE_SYNCH_RW_MUTEX> - CACHED_CONNECT_STRATEGY; - -#if defined (TAO_HAS_CLIENT_CONCURRENCY) - CONCURRENCY_STRATEGY *concurrency_strategy (void); -#endif - - CONNECTOR *connector (void); - // Return a pointer to a connector using appropriate strategies. - - TAO_Client_Factory (void); - ~TAO_Client_Factory (void); - -private: -#if defined (TAO_HAS_CLIENT_CONCURRENCY) - CONCURRENCY_STRATEGY *concurrency_strategy_; -#endif - CONNECTOR connector_; - NULL_CREATION_STRATEGY null_creation_strategy_; - CACHED_CONNECT_STRATEGY caching_connect_strategy_; -}; - -class TAO_Server_Factory - // = TITLE - // Abstract factory used by the server side to turn out various - // strategies of special utility to it. -{ -public: - // = SERVER-SIDE - typedef ACE_Creation_Strategy<TAO_OA_Connection_Handler> CREATION_STRATEGY; - typedef ACE_Accept_Strategy<TAO_OA_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY; - typedef ACE_Concurrency_Strategy<TAO_OA_Connection_Handler> CONCURRENCY_STRATEGY; - typedef ACE_Scheduling_Strategy<TAO_OA_Connection_Handler> SCHEDULING_STRATEGY; - - CREATION_STRATEGY *creation_strategy (void); - // return concrete creation strategy - - ACCEPT_STRATEGY *accept_strategy (void); - // return concrete acceptor strategy - - CONCURRENCY_STRATEGY *concurrency_strategy (void); - // return the concurrency strategy used - - SCHEDULING_STRATEGY *scheduling_strategy (void); - // return the scheduling strategy used - - TAO_Object_Table *object_lookup_strategy (void); - // return the concrete object lookup strategy - - TAO_Server_Factory (void); - // constructor - -private: - // = COMMON - ACE_Thread_Strategy<TAO_OA_Connection_Handler> threaded_strategy_; - // The threaded strategy used for passively establishing connections. - ACE_Reactive_Strategy<TAO_OA_Connection_Handler> reactive_strategy_; - // A strategy for passively establishing connections which utilizes the Reactor. - - // = SERVER - CONCURRENCY_STRATEGY *concurrency_strategy_; - // concrete concurrency strategy - - TAO_Object_Table *objtable_; - // instance of object table -#if 0 - // Someday we'll need these! - CREATION_STRATEGY *creation_strategy_; - ACCEPT_STRATEGY *accept_strategy_; - SCHEDULING_STRATEGY *scheduling_strategy_; -#endif -}; - -#endif /* TAO_FACTORIES_H */ diff --git a/TAO/tests/Quoter/FactoryFinder.exe b/TAO/tests/Quoter/FactoryFinder.exe Binary files differdeleted file mode 100755 index 2d5a2b39e7a..00000000000 --- a/TAO/tests/Quoter/FactoryFinder.exe +++ /dev/null diff --git a/TAO/tests/Quoter/client.exe b/TAO/tests/Quoter/client.exe Binary files differdeleted file mode 100755 index 20113cff665..00000000000 --- a/TAO/tests/Quoter/client.exe +++ /dev/null diff --git a/TAO/tests/Quoter/ns.btm b/TAO/tests/Quoter/ns.btm deleted file mode 100644 index ebe5b49ad5d..00000000000 --- a/TAO/tests/Quoter/ns.btm +++ /dev/null @@ -1,4 +0,0 @@ -set nsiorfile=%temp%\qns_ior -REM Naming Service must have been built or else this will fail -start "Naming Service" /K ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport 10042 -ORBobjrefstyle url -o %nsiorfile - diff --git a/TAO/tests/Quoter/run_test.btm b/TAO/tests/Quoter/run_test.btm deleted file mode 100644 index a0e2ed1be86..00000000000 --- a/TAO/tests/Quoter/run_test.btm +++ /dev/null @@ -1,161 +0,0 @@ -@echo off - -REM This is a 4NT Batch file. To use, just type run_test and it will start the -REM server, wait for a second, and then start the client. At the end, it will -REM clean up. - -setlocal - -set nsiorfile=%temp%\qns_ior -set del=2 - -REM variables for parameters - -set nsport=20002 -set clport=20003 -set svport=20004 -set ffport=20005 -set lcport=20006 -set gfport=20007 -set n=1 -set leave=/C -set ior=0 -set done= - -:get_args - -if %1 == /h goto is_h -if %1 == /? goto is_h -goto no_h -:is_h -echo run_test [/n num] [/leave] [/h] [/ns, /sv, /ff, /cl, /gf] -echo. -echo /n num -- runs the client num times -echo /leave -- leaves the servers running and their windows open -echo /h -- prints this information -echo /ns /sv /ff /cl /gf -- Runs only one of the executables -quit -:no_h - -if not %1 == /ns goto no_ns -set done=quit -goto run_name_server -:no_ns - -if not %1 == /sv goto no_sv -set done=quit -goto run_server -:no_sv - -if not %1 == /ff goto no_ff -set done=quit -goto run_finder -:no_ff - -if not %1 == /lc goto no_lc -set done=quit -goto run_lifecycle_service -:no_lc - -if not %1 == /gf goto no_gf -set done=quit -goto run_generic_factory -:no_gf - - -if not %1 == /cl goto no_cl -set done=quit -goto run_client -:no_cl - -if not %1 == /n goto no_n -set n=%2 -shift -shift -goto get_args -:no_n - -if not %1 == /leave goto no_leave -set leave=/K -shift -goto get_args -:no_leave - -:run_name_server -REM Naming Service must have been built or else this will fail -start "Naming Service" %leave ..\..\orbsvcs\Naming_Service\Naming_Service.exe -ORBport %nsport -ORBobjrefstyle url -o %nsiorfile -rem -ORBnameserviceior %temp\qns_ior - -%done - -REM Delay some to let the Naming Service get set up -DELAY %del - -:run_server -REM read in the IOR from the file -for %%d in (@%nsiorfile) do set ior=%%d - -REM Start the server -start "Quoter Server" %leave server.exe -ORBport %svport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf - -%done - -REM Delay some to let the server get set up -DELAY %del - -:run_finder -REM read in the IOR from the file -for %%d in (@%nsiorfile) do set ior=%%d - -REM Start the factory finder -start "Quoter Factory Finder" %leave Factory_Finder.exe -ORBport %ffport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf - -%done - -REM Delay some to let the Factory Finder get set up -DELAY %del - -:run_lifecycle_service -REM read in the IOR from the file -REM for %%d in (@%nsiorfile) do set ior=%%d - -REM Start the Lifecycle Service -REM start "Quoter LifeCycle Service" %leave LifeCycle_Service.exe -ORBport %lcport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf - -%done - -REM Delay some to let the LifeCycle Service get set up -REM DELAY %del - -:run_generic_factory -REM read in the IOR from the file -for %%d in (@%nsiorfile) do set ior=%%d - -REM Start the factory finder -start "Quoter Generic Factory" %leave Generic_Factory.exe -ORBport %gfport -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf svc.conf - - -%done - -REM Delay some to let the Generic Factory get set up -DELAY %del - -:run_client -REM read in the IOR from the file -for %%d in (@%nsiorfile) do set ior=%%d - -REM And now start the client -for /l %x in (1,1,%n) do client.exe -ORBobjrefstyle url -ORBport %clport -ORBnameserviceior %ior -ORBsvcconf client.conf - -%done - -REM We don't really need to delete this -REM del %temp%\qns_ior - -REM Remove any running servers -if %leave==/C activate "Naming Service" CLOSE -if %leave==/C activate "Quoter Server" CLOSE -if %leave==/C activate "Quoter Factory Finder" CLOSE -if %leave==/C activate "Quoter Generic Factory" CLOSE - -endlocal
\ No newline at end of file diff --git a/TAO/tests/Quoter/server.exe b/TAO/tests/Quoter/server.exe Binary files differdeleted file mode 100755 index dc2f2787419..00000000000 --- a/TAO/tests/Quoter/server.exe +++ /dev/null diff --git a/TAO/tests/Quoter/sv.btm b/TAO/tests/Quoter/sv.btm deleted file mode 100644 index dff9cf19039..00000000000 --- a/TAO/tests/Quoter/sv.btm +++ /dev/null @@ -1,7 +0,0 @@ -set nsiorfile=%temp%\qns_ior -REM read in the IOR from the file -for %%d in (@%nsiorfile) do set ior=%%d - -REM Start the server -echo %ior -start "Quoter Server" /k Quoter_Server.exe -ORBport 10041 -ORBobjrefstyle url -ORBnameserviceior %ior -ORBsvcconf server.conf |