diff options
Diffstat (limited to 'TAO/tao/Servant_Base.h')
| -rw-r--r-- | TAO/tao/Servant_Base.h | 54 |
1 files changed, 17 insertions, 37 deletions
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h index d4bcae36244..dfa1f77591c 100644 --- a/TAO/tao/Servant_Base.h +++ b/TAO/tao/Servant_Base.h @@ -1,4 +1,3 @@ - // This may look like C, but it's really -*- C++ -*- // $Id$ @@ -39,24 +38,24 @@ public: virtual ~TAO_ServantBase (void); // Destructor. - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Returns the default POA for this servant. virtual CORBA::Boolean _is_a (const char* logical_type_id, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Local implementation of the CORBA::Object::_is_a method. - virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Default <_non_existent>: always returns false. // = Reference counting hooks: no-ops by default. - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual void _add_ref (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _remove_ref (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); virtual void *_downcast (const char *repository_id) = 0; // Get the correct vtable. - virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual TAO_Stub *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // This is an auxiliar method for _this() and _narrow(). protected: @@ -71,7 +70,7 @@ protected: virtual void _dispatch (CORBA::ServerRequest &request, void *context, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // Dispatches a request to the object: find the operation, cast the // type to the most derived type, demarshall all the parameters from // the request and finally invokes the operation, storing the @@ -90,31 +89,12 @@ protected: virtual const char *_interface_repository_id (void) const = 0; // Get this interface's repository id (TAO specific). - // = Should be protected/private, but a nested class needs it. - -public: - ACE_SYNCH_MUTEX &_single_threaded_poa_lock (void); - // Access to the single threaded poa lock. - -protected: - void _increment_single_threaded_poa_lock_count (void); - // New single threaded POA wants to use this lock. - - void _decrement_single_threaded_poa_lock_count (void); - // Single threaded POA is no longer interested in this lock. - TAO_Operation_Table *optable_; // The operation table for this servant, it is initialized by the // most derived class. - - ACE_SYNCH_MUTEX *single_threaded_poa_lock_; - // Lock for single threaded POAs. - - u_long single_threaded_poa_lock_count_; - // Reference count for lock. }; -class TAO_Export TAO_RefCountServantBase : public virtual TAO_ServantBase +class TAO_RefCountServantBase : public virtual TAO_ServantBase { // = TITLE // Reference counting mix-in class. @@ -147,10 +127,10 @@ public: ~TAO_RefCountServantBase (void); // Destructor. - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual void _add_ref (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Increase reference count by one. - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual void _remove_ref (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Decreases reference count by one; if the resulting reference // count equals zero, _remove_ref invokes delete on its this pointer // in order to destroy the servant. @@ -174,7 +154,7 @@ private: // Reference counter. }; -class TAO_Export TAO_ServantBase_var +class TAO_ServantBase_var { // = TITLE // Auto pointer for reference counting servants. @@ -225,7 +205,7 @@ class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase // = TITLE // Base class for local skeletons and servants. protected: - TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + TAO_Stub *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // This is an auxiliar method for _this(). Make sure *not* to // register with the default POA }; @@ -244,19 +224,19 @@ class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase // circumstances may lead to unpredictable results. public: virtual void invoke (CORBA::ServerRequest_ptr request, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // The invoke() method receives requests issued to any CORBA object // incarnated by the DSI servant and performs the processing // necessary to execute the request. virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // The _primary_interface() method receives an ObjectId value and a // POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. - CORBA::Object_ptr _this (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Object_ptr _this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Returns a CORBA::Object_ptr for the target object. protected: @@ -267,12 +247,12 @@ protected: virtual void *_downcast (const char *repository_id); // Simply returns "this" - virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual TAO_Stub *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // This is an auxiliar method for _this() and _narrow(). virtual void _dispatch (CORBA::ServerRequest &request, void *context, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Turns around and calls invoke. }; |