diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
51 files changed, 1227 insertions, 1116 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 082b96ddbb6..5882da9dc92 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -6,24 +6,29 @@ // // = LIBRARY // cos -// +// // = FILENAME // AVStreams_i.h // // = AUTHOR // Sumedh Mungee <sumedh@cs.wustl.edu> -// -// +// +// // ============================================================================ -#if !defined (AVSTREAMS_I_H) -#define AVSTREAMS_I_H +#ifndef AVSTREAMS_I_H +#define AVSTREAMS_I_H #include "orbsvcs/orbsvcs_export.h" #include "orbsvcs/CosPropertyServiceS.h" #include "orbsvcs/AVStreamsS.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "ace/Process.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/CosNamingC.h" #include "orbsvcs/AV/Endpoint_Strategy.h" #include "orbsvcs/Null_MediaCtrlS.h" @@ -35,76 +40,76 @@ public: AV_Null_MediaCtrl (void); }; -class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl +class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl : public virtual POA_AVStreams::Basic_StreamCtrl // = DESCRIPTION // Base class for StreamCtrl, implements basic stream start -// and stop functionality +// and stop functionality { public: TAO_Basic_StreamCtrl (void); // Default Constructor - virtual void stop (const AVStreams::flowSpec &the_spec, + virtual void stop (const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Stop the transfer of data of the stream // Empty the_spec means apply operation to all flows - virtual void start (const AVStreams::flowSpec &the_spec, + virtual void start (const AVStreams::flowSpec &the_spec, CORBA::Environment &env); - // Start the transfer of data in the stream. - // Empty the_spec means apply operation to all flows + // Start the transfer of data in the stream. + // Empty the_spec means apply operation to all flows - virtual void destroy (const AVStreams::flowSpec &the_spec, + virtual void destroy (const AVStreams::flowSpec &the_spec, CORBA::Environment &env); - // Tears down the stream. This will close the connection, and delete + // Tears down the stream. This will close the connection, and delete // the streamendpoint and vdev associated with this stream // Empty the_spec means apply operation to all flows - virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Changes the QoS associated with the stream // Empty the_spec means apply operation to all flows - virtual void push_event (const char *the_event, + virtual void push_event (const char *the_event, CORBA::Environment &env); // Used by StreamEndPoint and VDev to inform StreamCtrl of events. // E.g., loss of flow, reestablishment of flow, etc.. - - virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, - const char *fp_name, - const CORBA::Any &fp_settings, + + virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, + const char *fp_name, + const CORBA::Any &fp_settings, CORBA::Environment &env); // Used to control the flow protocol parameters. - virtual CORBA::Object_ptr get_flow_connection (const char *flow_name, + virtual CORBA::Object_ptr get_flow_connection (const char *flow_name, CORBA::Environment &env); - // Not implemented in the light profile, will raise the notsupported - // exception - - virtual void set_flow_connection (const char *flow_name, - CORBA::Object_ptr flow_connection, + // Not implemented in the light profile, will raise the notsupported + // exception + + virtual void set_flow_connection (const char *flow_name, + CORBA::Object_ptr flow_connection, CORBA::Environment &env); // Not implemented in the light profile, will raise the notsupported // exception - + virtual ~TAO_Basic_StreamCtrl (void); // Destructor protected: - + AVStreams::VDev_var vdev_a_; AVStreams::VDev_var vdev_b_; // The Virtual Devices for this stream - + AVStreams::StreamEndPoint_A_var stream_endpoint_a_; AVStreams::StreamEndPoint_B_var stream_endpoint_b_; // The Endpoints for this stream }; -class TAO_ORBSVCS_Export TAO_StreamCtrl - : public virtual POA_AVStreams::StreamCtrl, +class TAO_ORBSVCS_Export TAO_StreamCtrl + : public virtual POA_AVStreams::StreamCtrl, public virtual TAO_Basic_StreamCtrl // = DESCRIPTION // Implementation the A/V StreamCtrl class. this class @@ -114,11 +119,11 @@ class TAO_ORBSVCS_Export TAO_StreamCtrl public: TAO_StreamCtrl (void); // Default Constructor - - virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party, - AVStreams::MMDevice_ptr b_party, - AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, + + virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party, + AVStreams::MMDevice_ptr b_party, + AVStreams::streamQoS &the_qos, + const AVStreams::flowSpec &the_flows, CORBA::Environment &env); // Establish a stream between a_party and b_party, // with qos the_qos, and for the flows in the_flows @@ -126,27 +131,27 @@ public: // Causes a connection to be established between the StreamEndpoints. // Returns success/failure - virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party, - AVStreams::StreamEndPoint_B_ptr b_party, - AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, + virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party, + AVStreams::StreamEndPoint_B_ptr b_party, + AVStreams::streamQoS &the_qos, + const AVStreams::flowSpec &the_flows, CORBA::Environment &env); // Establish a connection between two streamendpoints. This can // be used if the streamendpoints have been created independent of // a MMDevice - - virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, - const AVStreams::flowSpec &the_spec, + + virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); - // Unbind the_ep from the stream. Empty the_spec means apply to all flows. - + // Unbind the_ep from the stream. Empty the_spec means apply to all flows. + virtual void unbind (CORBA::Environment &env); // unbind the stream. Same effect as Basic_StreamCtrl::destroy () - + virtual ~TAO_StreamCtrl (void); // Destructor -}; +}; class TAO_ORBSVCS_Export TAO_Base_StreamEndPoint @@ -167,13 +172,13 @@ public: virtual int handle_stop (const AVStreams::flowSpec &the_spec, CORBA::Environment &env) = 0; // Application needs to define this - - virtual int handle_start (const AVStreams::flowSpec &the_spec, + + virtual int handle_start (const AVStreams::flowSpec &the_spec, CORBA::Environment &env) = 0; // Application needs to define this - - virtual int handle_destroy (const AVStreams::flowSpec &the_spec, + + virtual int handle_destroy (const AVStreams::flowSpec &the_spec, CORBA::Environment &env) = 0; // Application needs to define this }; @@ -193,12 +198,12 @@ class TAO_ORBSVCS_Export TAO_Server_Base_StreamEndPoint : public virtual TAO_Base_StreamEndPoint { public: - virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec, CORBA::Environment &env) = 0; // Application needs to define this }; -class TAO_ORBSVCS_Export TAO_StreamEndPoint +class TAO_ORBSVCS_Export TAO_StreamEndPoint : public virtual POA_AVStreams::StreamEndPoint, // The POA class public virtual TAO_Base_StreamEndPoint { @@ -209,84 +214,84 @@ public: TAO_StreamEndPoint (void); // Constructor - virtual void stop (const AVStreams::flowSpec &the_spec, + virtual void stop (const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Stop the stream. Empty the_spec means, for all the flows - - virtual void start (const AVStreams::flowSpec &the_spec, + + virtual void start (const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Start the stream, Empty the_spec means, for all the flows - virtual void destroy (const AVStreams::flowSpec &the_spec, + virtual void destroy (const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Destroy the stream, Empty the_spec means, for all the flows - virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, - AVStreams::streamQoS &qos_spec, - const AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, + AVStreams::streamQoS &qos_spec, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env) = 0; // Called by StreamCtrl. responder is the peer to connect to - virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, - CORBA::Boolean is_mcast, - AVStreams::streamQoS &qos, - AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, + CORBA::Boolean is_mcast, + AVStreams::streamQoS &qos, + AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Called by the peer StreamEndPoint. The flow_spec indicates the // flows (which contain transport addresses etc.) - virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows, + virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, + const AVStreams::flowSpec &the_flows, CORBA::Environment &env); // Change the transport qos on a stream - - virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec, + + virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec, CORBA::Environment &env); // Used to restrict the set of protocols - - virtual void disconnect (const AVStreams::flowSpec &the_spec, + + virtual void disconnect (const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // disconnect the flows - - virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, - const char *fp_name, - const CORBA::Any &fp_settings, + + virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, + const char *fp_name, + const CORBA::Any &fp_settings, CORBA::Environment &env); // Used to control the flow - - virtual CORBA::Object_ptr get_fep (const char *flow_name, + + virtual CORBA::Object_ptr get_fep (const char *flow_name, CORBA::Environment &env); // Not implemented in the light profile, throws notsupported - virtual char * add_fep (CORBA::Object_ptr the_fep, + virtual char * add_fep (CORBA::Object_ptr the_fep, CORBA::Environment &env); // Not implemented in the light profile, throws notsupported - - virtual void remove_fep (const char *fep_name, + + virtual void remove_fep (const char *fep_name, CORBA::Environment &env); // Not implemented in the light profile, throws notsupported - - virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator, + + virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator, CORBA::Environment &env); // Used to "attach" a negotiator to the endpoint - - virtual void set_key (const char *flow_name, + + virtual void set_key (const char *flow_name, const AVStreams::encryption_key & the_key, CORBA::Environment &env); - // Used for public key encryption. - - virtual void set_source_id (CORBA::Long source_id, + // Used for public key encryption. + + virtual void set_source_id (CORBA::Long source_id, CORBA::Environment &env); // Used to set a unique id for packets sent by this streamendpoint virtual ~TAO_StreamEndPoint (void); // Destructor - + }; -class TAO_ORBSVCS_Export TAO_Client_StreamEndPoint : - public virtual POA_AVStreams::StreamEndPoint_A, +class TAO_ORBSVCS_Export TAO_Client_StreamEndPoint : + public virtual POA_AVStreams::StreamEndPoint_A, public virtual TAO_StreamEndPoint, public virtual TAO_Client_Base_StreamEndPoint { @@ -296,25 +301,25 @@ public: TAO_Client_StreamEndPoint (void); // Constructor - virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, - AVStreams::streamQoS &qos_spec, - const AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, + AVStreams::streamQoS &qos_spec, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Called by StreamCtrl. responder is the peer to connect to - virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, + AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Used for ATM-style multicast - - virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, - AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, + + virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, + AVStreams::streamQoS &the_qos, + const AVStreams::flowSpec &the_flows, CORBA::Environment &env); // Used for ATM-style multicast - virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, - const AVStreams::flowSpec &theSpec, + virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, + const AVStreams::flowSpec &theSpec, CORBA::Environment &env); // Used to remove a multicast leaf @@ -323,8 +328,8 @@ public: }; -class TAO_ORBSVCS_Export TAO_Server_StreamEndPoint : - public virtual POA_AVStreams::StreamEndPoint_B, +class TAO_ORBSVCS_Export TAO_Server_StreamEndPoint : + public virtual POA_AVStreams::StreamEndPoint_B, public virtual TAO_StreamEndPoint, public virtual TAO_Server_Base_StreamEndPoint // Abstract interface { @@ -334,21 +339,21 @@ public: TAO_Server_StreamEndPoint (void); // Constructor - virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, - AVStreams::streamQoS &qos_spec, - const AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, + AVStreams::streamQoS &qos_spec, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); - virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, - CORBA::Boolean is_mcast, - AVStreams::streamQoS &qos, - AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, + CORBA::Boolean is_mcast, + AVStreams::streamQoS &qos, + AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Called by the peer StreamEndPoint. The flow_spec indicates the // flows (which contain transport addresses etc.) - virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, + AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Used for internet-style multicast @@ -356,8 +361,8 @@ public: // Destructor }; -class TAO_ORBSVCS_Export TAO_VDev - :public virtual TAO_PropertySet, +class TAO_ORBSVCS_Export TAO_VDev + :public virtual TAO_PropertySet, public virtual POA_AVStreams::VDev // = DESCRIPTION // Implements the VDev interface. One of these is created per connection, @@ -367,36 +372,36 @@ class TAO_ORBSVCS_Export TAO_VDev TAO_VDev (void); // Default Constructor - virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, - AVStreams::VDev_ptr the_peer_dev, - AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, + AVStreams::VDev_ptr the_peer_dev, + AVStreams::streamQoS &the_qos, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Called to tell the vdev who the streamctrl, peer vdev is - virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, - AVStreams::MCastConfigIf_ptr a_mcastconfigif, - AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, + virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, + AVStreams::MCastConfigIf_ptr a_mcastconfigif, + AVStreams::streamQoS &the_qos, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Used to set the streamctrl and multicast device - - virtual void configure (const CosPropertyService::Property &the_config_mesg, + + virtual void configure (const CosPropertyService::Property &the_config_mesg, CORBA::Environment &env); // Called by the peer VDev to configure the device (catch all) - - virtual void set_format (const char *flowName, - const char *format_name, + + virtual void set_format (const char *flowName, + const char *format_name, CORBA::Environment &env); // Used to set a format on a flowname - - virtual void set_dev_params (const char *flowName, - const CosPropertyService::Properties &new_params, + + virtual void set_dev_params (const char *flowName, + const CosPropertyService::Properties &new_params, CORBA::Environment &env); // Used to set device parameters - - virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, + + virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Called to change QoS of the device @@ -410,21 +415,21 @@ class TAO_ORBSVCS_Export TAO_VDev private: AVStreams::StreamCtrl_var streamctrl_; // My stream controller - + AVStreams::VDev_var peer_; // My peer }; class TAO_AV_Endpoint_Strategy; -class TAO_ORBSVCS_Export TAO_MMDevice - : public virtual TAO_PropertySet, +class TAO_ORBSVCS_Export TAO_MMDevice + : public virtual TAO_PropertySet, public virtual POA_AVStreams::MMDevice // = DESCRIPTION // Implements a factory to create Endpoints and VDevs { protected: - + TAO_AV_Endpoint_Strategy *endpoint_strategy_; public: @@ -447,21 +452,21 @@ class TAO_ORBSVCS_Export TAO_MMDevice CORBA::Environment &env); // Multicast bind - virtual AVStreams::StreamEndPoint_A_ptr create_A (AVStreams::StreamCtrl_ptr the_requester, - AVStreams::VDev_out the_vdev, - AVStreams::streamQoS &the_qos, - CORBA::Boolean_out met_qos, - char *&named_vdev, - const AVStreams::flowSpec &the_spec, + virtual AVStreams::StreamEndPoint_A_ptr create_A (AVStreams::StreamCtrl_ptr the_requester, + AVStreams::VDev_out the_vdev, + AVStreams::streamQoS &the_qos, + CORBA::Boolean_out met_qos, + char *&named_vdev, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Called by StreamCtrl to create a "A" type streamandpoint and vdev - - virtual AVStreams::StreamEndPoint_B_ptr create_B (AVStreams::StreamCtrl_ptr the_requester, - AVStreams::VDev_out the_vdev, - AVStreams::streamQoS &the_qos, - CORBA::Boolean_out met_qos, - char *&named_vdev, - const AVStreams::flowSpec &the_spec, + + virtual AVStreams::StreamEndPoint_B_ptr create_B (AVStreams::StreamCtrl_ptr the_requester, + AVStreams::VDev_out the_vdev, + AVStreams::streamQoS &the_qos, + CORBA::Boolean_out met_qos, + char *&named_vdev, + const AVStreams::flowSpec &the_spec, CORBA::Environment &env); // Called by StreamCtrl to create a "B" type streamandpoint and vdev @@ -474,14 +479,14 @@ class TAO_ORBSVCS_Export TAO_MMDevice CORBA::Environment &env); // Not supported in the light profile, raises notsupported - virtual CORBA::Object_ptr get_fdev (const char *flow_name, + virtual CORBA::Object_ptr get_fdev (const char *flow_name, CORBA::Environment &env); // Not supported in the light profile, raises notsupported - virtual void remove_fdev (const char *flow_name, + virtual void remove_fdev (const char *flow_name, CORBA::Environment &env); // Not supported in the light profile, raises notsupported - + virtual ~TAO_MMDevice (void); // Destructor }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 22b68d9a8ac..d964036148a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -6,18 +6,18 @@ // // = LIBRARY // cos -// +// // = FILENAME // Endpoint_Strategy.h // // = AUTHOR // Sumedh Mungee <sumedh@cs.wustl.edu> -// -// +// +// // ============================================================================ -#if !defined (TAO_AV_ENDPOINT_STRATEGY_H) -#define TAO_AV_ENDPOINT_STRATEGY_H +#ifndef TAO_AV_ENDPOINT_STRATEGY_H +#define TAO_AV_ENDPOINT_STRATEGY_H #include "orbsvcs/AV/AVStreams_i.h" #include "tao/TAO.h" @@ -87,7 +87,7 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy virtual int get_vdev (CORBA::Environment &env); // Get the Vdev object reference for the newly created - // endpoint + // endpoint CosNaming::NamingContext_var naming_context_; // Naming context @@ -97,10 +97,10 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy char host_[MAXHOSTNAMELEN]; // name of this host used for resolving unique names. - + pid_t pid_; // My child's process id. -}; +}; // ---------------------------------------------------------------------- @@ -117,7 +117,7 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy_A virtual ~TAO_AV_Endpoint_Process_Strategy_A (void); // Destructor. - protected: + protected: virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev, CORBA::Environment &env); @@ -125,8 +125,8 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy_A virtual int get_stream_endpoint (CORBA::Environment &env); // Gets the "A" type stream endpoint from the child process - -}; + +}; // ---------------------------------------------------------------------- @@ -147,12 +147,12 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Process_Strategy_B AVStreams::VDev_ptr &vdev, CORBA::Environment &env); // Creates a "B" type stream endpoint, and a vdev - - + + virtual int get_stream_endpoint (CORBA::Environment &env); // Gets the object reference of the "B" type streamendpoint. - -}; + +}; // Include the templates here. #include "Endpoint_Strategy_T.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index da3ffcad393..8483ce20a34 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -1,6 +1,6 @@ // $Id$ -#if !defined (TAO_AV_ENDPOINT_STRATEGY_T_H) +#ifndef TAO_AV_ENDPOINT_STRATEGY_T_H #define TAO_AV_ENDPOINT_STRATEGY_T_H #include "Endpoint_Strategy.h" @@ -20,10 +20,10 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Reactive_Strategy virtual int activate (void); // creates and activates the streamendpoint, vdev, and mediacontrol - + virtual int activate_stream_endpoint (CORBA::Environment &env) = 0; // activates the stream_endpoint with the POA - + virtual int activate_vdev (CORBA::Environment &env); // activates the vdev with the POA @@ -70,7 +70,7 @@ class TAO_ORBSVCS_Export TAO_AV_Endpoint_Reactive_Strategy_A CORBA::Environment &env); // Called by the MMDevice, when it needs to create an A type endpoint - + }; // ---------------------------------------------------------------------- @@ -114,22 +114,22 @@ public: int init (int argc, char **argv); // Initializes the ORB, creates and activates the // T_StreamEndpoint, T_VDev, T_MediaCtrl in the POA - + int run (ACE_Time_Value *tv = 0); // runs the ORB event loop protected: - int activate_objects (int argc, + int activate_objects (int argc, char **argv, CORBA::Environment &env); // Creates the objects and inserts them into the Naming // Service, so the parent can pick the IOR's and // return them to the client - + int bind_to_naming_service (CORBA::Environment &env); // Binds to the naming service - + int register_vdev (CORBA::Environment &env); // Registers vdev with the naming service @@ -171,9 +171,9 @@ public: T_MediaCtrl *media_ctrl_; // Media controller - + pid_t pid_; - // pid of this process + // pid of this process char host_[MAXHOSTNAMELEN]; // Name of the host. diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h index 487e688eb2c..ce4252418cb 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace -// +// // = FILENAME // Channel_Clients // diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index e384b935053..129022f97ae 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (_CC_LOCK_H) +#ifndef _CC_LOCK_H #define _CC_LOCK_H #include "ace/Synch.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/CosConcurrencyControlC.h" #define NUMBER_OF_LOCK_MODES 5 diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index f316ecfc6e1..5b6087189c5 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -32,10 +32,15 @@ // // ============================================================================ -#if !defined (_CC_LOCKSET_H) +#ifndef _CC_LOCKSET_H #define _CC_LOCKSET_H #include "ace/Synch.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Token.h" #include "orbsvcs/CosConcurrencyControlS.h" @@ -76,21 +81,21 @@ public: // = CosConcurrencyControl methods virtual void lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &env); + CORBA::Environment &env); // Acquires this lock. Blocks until lock is obtained virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &env); + CORBA::Environment &env); // Tries to acquire this lock. If it is not possible to acquire the // lock, false is returned virtual void unlock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &env); + CORBA::Environment &env); // Releases this lock. virtual void change_mode (CosConcurrencyControl::lock_mode held_mode, - CosConcurrencyControl::lock_mode new_mode, - CORBA::Environment &env); + CosConcurrencyControl::lock_mode new_mode, + CORBA::Environment &env); // Changes the mode of this lock. // = Debugging methods diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 5802cf81c3b..f0f12c6d214 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_CC_LOCKSETFACTORY_H) +#ifndef _CC_LOCKSETFACTORY_H #define _CC_LOCKSETFACTORY_H // #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index 0958472b535..112b433a9c3 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_CONCURRENCY_SERVER_H) +#ifndef _CONCURRENCY_SERVER_H #define _CONCURRENCY_SERVER_H #include "tao/corba.h" @@ -42,7 +42,7 @@ public: //Default constructor. TAO_Concurrency_Server (CORBA::ORB_var &orb, - PortableServer::POA_var &poa); + PortableServer::POA_var &poa); // Takes the POA under which to register the Concurrency Service // implementation object. diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.h b/TAO/orbsvcs/orbsvcs/Event/BCU.h index 07d64c46271..6e81c989e15 100644 --- a/TAO/orbsvcs/orbsvcs/Event/BCU.h +++ b/TAO/orbsvcs/orbsvcs/Event/BCU.h @@ -5,7 +5,7 @@ // // = LIBRARY // ace ORB -// +// // = FILENAME // Benchmark Computation Units // @@ -18,10 +18,15 @@ // numbers. // ============================================================================ -#if !defined (ACE_BCU_H) +#ifndef ACE_BCU_H #define ACE_BCU_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/orbsvcs_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h index a3c398030c8..ddf74892afb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -5,7 +5,7 @@ // // = LIBRARY // orbsvcs -// +// // = FILENAME // Dispatching_Module // @@ -58,15 +58,15 @@ public: // Default construction. virtual void open (ACE_ES_Consumer_Module *up, - ACE_ES_Correlation_Module *down); + ACE_ES_Correlation_Module *down); // Link to adjacent modules. virtual void connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + CORBA::Environment &); // Forward down_. virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + CORBA::Environment &); // Forward down_. virtual void disconnected (ACE_Push_Consumer_Proxy *consumer); @@ -77,11 +77,11 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &) = 0; + CORBA::Environment &) = 0; // Forward up_. virtual int dispatch_event (ACE_ES_Dispatch_Request *request, - u_long &command_action); + u_long &command_action); // Called by ACE_ES_Dispatch_Requests when dequeued by RT_Tasks. virtual void dispatch_queue_closed (ACE_ES_Dispatch_Queue *q); @@ -132,32 +132,32 @@ class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request : public ACE_RT_Task_Command public: ACE_ES_Dispatch_Request (void); // Default construction. - + virtual ~ACE_ES_Dispatch_Request (void); // Default destruction. - - ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, - RtecScheduler::handle_t rt_info); + + ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, + RtecScheduler::handle_t rt_info); // All the events must be added after construction to the // event_set. - ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, - const TAO_EC_Event_Array &event_set, - RtecScheduler::handle_t rt_info); + ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, + const TAO_EC_Event_Array &event_set, + RtecScheduler::handle_t rt_info); // Set consumer_ to <consumer> and copy <event_set> to event_set_. // <rt_info> describes the method receiving this dispatch. ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, - const RtecEventComm::Time &time, - RtecScheduler::handle_t rt_info); + const RtecEventComm::Time &time, + RtecScheduler::handle_t rt_info); // Set consumer_ to <consumer> and sets // single_event_.header.creation_time to <time>. Sets // use_single_event_ to 1. <rt_info> describes the method // receiving this dispatch. ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, - const TAO_EC_Event &event, - RtecScheduler::handle_t rt_info); + const TAO_EC_Event &event, + RtecScheduler::handle_t rt_info); // Sets consumer_ and the first slot of event_set_. We use the // event_set_ instead of the single_event_ so that we can just carry // around the pointer to <event>. <rt_info> describes the method @@ -167,8 +167,8 @@ public: // Description of the method receiving this request. void set (ACE_ES_Dispatching_Base *dispatching_module, - RtecScheduler::OS_Priority priority, - RtecScheduler::Preemption_Subpriority sub_priority); + RtecScheduler::OS_Priority priority, + RtecScheduler::Preemption_Subpriority sub_priority); // For multi-threaded implementations, <dispatching_module> is // called back when a request is dequeued. <priority> is the // dispatch priority of the event. <sub_priority> is the enqueue @@ -240,7 +240,7 @@ protected: #if defined (ACE_WIN32) class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy -// = TITLE +// = TITLE // Event Service ReactorEx Notification Strategy // // = DESCRIPTION @@ -252,7 +252,7 @@ class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy { public: ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh, - TAO_EC_Timer_Module *tm); + TAO_EC_Timer_Module *tm); // Stores away <eh> for when this->open is called. int open (void); @@ -266,7 +266,7 @@ public: // point to a dispatching module. virtual int notify (void); virtual int notify (ACE_Event_Handler *, - ACE_Reactor_Mask mask); + ACE_Reactor_Mask mask); // ACE_HANDLE get_handle (void); // Returns event_.handle (). @@ -284,7 +284,7 @@ typedef ACE_ES_ReactorEx_NS ACE_ES_Notification_Strategy; #else // ******************************************************* class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Strategy -// = TITLE +// = TITLE // Event Service Reactor Notification Strategy // // = DESCRIPTION @@ -293,7 +293,7 @@ class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Str { public: ACE_ES_Reactor_NS (ACE_Event_Handler *eh, - TAO_EC_Timer_Module *tm); + TAO_EC_Timer_Module *tm); // Calls ACE_Reactor_Notification_Strategy with the ORB's reactor // and signal mask. @@ -330,18 +330,18 @@ class TAO_ORBSVCS_Export ACE_ES_Dispatch_Queue : public ACE_RT_Task { public: ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatching_module, - ACE_ES_Notification_Strategy *notification_strategy); + ACE_ES_Notification_Strategy *notification_strategy); // Stores <dispatching_module> for this->threads_closed. Stores // away <notification_strategy> for this->synch_threads. int open_queue (RtecScheduler::Period &period, - int threads); + int threads); // This is a hack to get the channel to work with the new // scheduler. #if 0 int open_queue (RtecScheduler::OS_Priority priority, - int threads); + int threads); // Creates a name from the <priority> and tries to find a scheduling // qos structure. If one is not found, but created, qos_ is set // with default values. Either way, if qos_->thread_ > 0, it calls @@ -383,7 +383,7 @@ public: // Delete queues. void connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + CORBA::Environment &); // Allocate any needed dispatching resources for this consumers // priority. @@ -395,7 +395,7 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + CORBA::Environment &); // Enqueues the request on the appropriate Dispatch Queue. virtual void activate (int threads_per_queue); @@ -465,7 +465,7 @@ public: // the dispatching base constructor. virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + CORBA::Environment &); // Forward up_. }; @@ -480,16 +480,16 @@ class TAO_ORBSVCS_Export ACE_ES_RTU_Dispatching : public ACE_ES_Priority_Dispatc { public: ACE_ES_RTU_Dispatching (ACE_EventChannel *channel); - // Store <channel>. + // Store <channel>. virtual int dispatch_event (ACE_ES_Dispatch_Request *request, - u_long &command_action); + u_long &command_action); // Called by ACE_Dispatch_Queues and handle_signal when an event // needs to be dequeued. Implements an RTU-like delayed preemption // policy. virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + CORBA::Environment &); // Calls ACE_ES_Priority_Dispatching::push and then checks if // preemption is necessary. }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index 46a1ca2233e..e5ba8e67229 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -159,10 +159,10 @@ private: ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP> supplier_; // Our supplier personality.... - // We use a different Consumer_Proxy + // We use a different Consumer_Proxy typedef ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map; typedef ACE_Map_Iterator<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map_Iterator; - + Consumer_Map consumer_proxy_map_; RtecEventChannelAdmin::ProxyPushConsumer_var default_consumer_proxy_; // We talk to the EC (as a supplier) using either an per-supplier diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h index e5bfe24a4e8..b00aca0c11f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -54,6 +54,11 @@ #define TAO_EC_GATEWAY_UDP_H #include "ace/SOCK_CODgram.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Dgram_Mcast.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecUDPAdminS.h" @@ -83,8 +88,8 @@ public: void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, - RtecUDPAdmin::AddrServer_ptr addr_server, - ACE_SOCK_Dgram* dgram, + RtecUDPAdmin::AddrServer_ptr addr_server, + ACE_SOCK_Dgram* dgram, CORBA::Environment &_env); // To do its job this class requires to know the local EC it will // connect to; it also requires to build an RT_Info for the local @@ -149,7 +154,7 @@ public: RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, const ACE_INET_Addr& ignore_from, - RtecUDPAdmin::AddrServer_ptr addr_server, + RtecUDPAdmin::AddrServer_ptr addr_server, CORBA::Environment &_env); // To do its job this class requires to know the local EC it will // connect to; it also requires to build an RT_Info for the local @@ -175,10 +180,10 @@ public: // The PushSupplier method. virtual void disconnect_push_supplier (CORBA::Environment &); - + void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment& env); + RtecUDPAdmin::UDP_Addr_out addr, + CORBA::Environment& env); // Call the RtecUDPAdmin::AddrServer private: @@ -243,7 +248,7 @@ public: TAO_ECG_Mcast_EH (TAO_ECG_UDP_Receiver *recv); int open (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + CORBA::Environment& _env); // Register for changes in the EC subscription list. // When the subscription list becomes non-empty we join the proper // multicast groups (using the receiver to translate between event @@ -260,9 +265,9 @@ public: // Reactor callbacks void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment& _env); + CORBA::Environment& _env); void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment& _env); + CORBA::Environment& _env); // The Observer methods class Observer : public POA_RtecEventChannelAdmin::Observer @@ -282,9 +287,9 @@ public: // The Observer methods virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment& _env); + CORBA::Environment& _env); virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment& _env); + CORBA::Environment& _env); private: TAO_ECG_Mcast_EH* eh_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index ef2220d1714..8d7c41842b0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -14,7 +14,7 @@ // // = DESCRIPTION // Simple implementations of the UDP Administration service. -// +// // connects to a "remote" EC as a consumer, it also connects to the // <local> EC as a supplier of events, this later EC is usually // collocated. @@ -60,8 +60,8 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment& env); + RtecUDPAdmin::UDP_Addr_out addr, + CORBA::Environment& env); private: CORBA::UShort port_; diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index 2203852802e..27ed245a42d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -31,6 +31,11 @@ #define ACE_EVENT_CHANNEL_H #include "ace/Containers.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Map_Manager.h" #include "tao/Timeprobe.h" @@ -70,7 +75,7 @@ void operator += (TAO_EC_Event_Array &dest, // = DESCRIPTION // The Event Channel must compare events (actually event headers) // for equality. -// +// ACE_INLINE int operator == (const RtecEventComm::Event &event1, const RtecEventComm::Event &event2); @@ -200,8 +205,8 @@ public: SHUTDOWN = CONSUMER | SUPPLIER }; ACE_EventChannel (CORBA::Boolean activate_threads = 1, - u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE, - TAO_Module_Factory* factory = 0); + u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE, + TAO_Module_Factory* factory = 0); // Construction of the given <type>. Check the **_CHANNEL // enumerations defined below. // By default we activate the threads on construction, but it is @@ -272,9 +277,9 @@ public: virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer, - CORBA::Environment &env); + CORBA::Environment &env); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &env); + CORBA::Environment &env); // The observer manipulators // = Timer managment @@ -288,7 +293,7 @@ public: int cancel_timer (RtecScheduler::OS_Priority preemption_priority, int id, - ACE_ES_Timer_ACT *&act); + ACE_ES_Timer_ACT *&act); // Cancel the timer associated with the priority of // <preemption_priority> and <id>. <act> is filled in with the // Timer_ACT used when scheduling the timer. Returns 0 on success, @@ -327,10 +332,10 @@ private: // + When was the last update. // + Does it want to receive all changes? // - + Observer_Entry (void); Observer_Entry (RtecEventChannelAdmin::Observer_Handle h, - RtecEventChannelAdmin::Observer_ptr o); + RtecEventChannelAdmin::Observer_ptr o); RtecEventChannelAdmin::Observer_Handle handle; // The handle @@ -957,7 +962,7 @@ public: // Unregister the consumer from the Event Service. virtual void push (const ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + CORBA::Environment &); RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (CORBA::Environment &); // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin. @@ -971,7 +976,7 @@ public: void fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos); // Fill the QoS with the disjuction off all the subscriptions in - // this EC. + // this EC. // It leaves the gateways out of the list. private: @@ -1159,14 +1164,14 @@ private: // = Push helper methods. int push_source (ACE_Push_Supplier_Proxy *source, - const TAO_EC_Event &event, - CORBA::Environment &_env); + const TAO_EC_Event &event, + CORBA::Environment &_env); // Push <event> to all consumers subscribed to all events from // <source>. Returns 0 on success, -1 on failure. int push_source_type (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event, - CORBA::Environment &_env); + CORBA::Environment &_env); // Push <event> to all consumers subscribed to <event>.type_ from // <source>. Returns 0 on success, -1 on failure. @@ -1217,7 +1222,7 @@ public: virtual void push (ACE_Push_Supplier_Proxy *proxy, RtecEventComm::EventSet &event, - CORBA::Environment &); + CORBA::Environment &); // The supplier module acts on behalf of the supplier proxy to // forward events through the channel. @@ -1238,7 +1243,7 @@ public: void fill_qos (RtecEventChannelAdmin::SupplierQOS& s_qos); // Fill the QoS with the disjuction off all the publications in - // this EC. + // this EC. // It leaves the gateways out of the list. private: diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h index c740d70303e..66a281e7c22 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (TAO_EC_EVENT_MANIP_H) +#ifndef TAO_EC_EVENT_MANIP_H #define TAO_EC_EVENT_MANIP_H #include "orbsvcs/RtecEventCommC.h" @@ -44,7 +44,7 @@ public: ~TAO_EC_Event_Set (void); // destructor - + CORBA::ULong length (void) const; // The length. @@ -71,7 +71,7 @@ private: private: CORBA::ULong length_; // The length of the buffer. - + RtecEventComm::Event* buffer_; // The buffer. @@ -79,7 +79,7 @@ private: // Synchronize access to the class internals. CORBA::ULong refcnt_; - // The reference count. + // The reference count. }; class TAO_ORBSVCS_Export TAO_EC_Event @@ -104,7 +104,7 @@ public: CORBA::ULong index); // Constructor, we assume ownership (i.e. duplicate and release the // set) - + ~TAO_EC_Event (void); // Destructor diff --git a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h index 5ff831379c2..ced85087e93 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h +++ b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h @@ -1,24 +1,29 @@ // // $Id$ // -#if !defined (FAST_REACTOR_H) +#ifndef FAST_REACTOR_H #define FAST_REACTOR_H #if defined (ACE_OLD_STYLE_REACTOR) # if defined (ACE_WIN32) # include "ace/ReactorEx.h" -# define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx -# else + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +# define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx +# else # include "ace/Reactor.h" -# define ACE_ES_FAST_REACTOR_BASE ACE_Reactor +# define ACE_ES_FAST_REACTOR_BASE ACE_Reactor # endif /* ACE_WIN32 */ #else # if defined (ACE_WIN32) # include "ace/WFMO_Reactor.h" # define ACE_ES_FAST_REACTOR_BASE ACE_WFMO_Reactor -# else +# else # include "ace/Select_Reactor.h" -# define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor +# define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor # endif /* ACE_WIN32 */ #endif /* ACE_OLD_STYLE_REACTOR */ //## end module.includes @@ -34,14 +39,14 @@ public: ACE_Time_Value *this_timeout = &timer_buf ; if (this->timer_queue_->calculate_timeout (max_wait_time, - this_timeout) == 0) + this_timeout) == 0) { - ACE_Time_Value t (0, 500000); - ACE_OS::select (0, 0, 0, 0, &t); + ACE_Time_Value t (0, 500000); + ACE_OS::select (0, 0, 0, 0, &t); } else { - ACE_OS::select (0, 0, 0, 0, this_timeout); + ACE_OS::select (0, 0, 0, 0, this_timeout); } return this->timer_queue_->expire () == -1 ? -1 : 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h index 8ce6e79488b..c2c6f093f30 100644 --- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h +++ b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h @@ -10,10 +10,15 @@ // // ============================================================================ -#if !defined (ACE_GPlot_File_H) +#ifndef ACE_GPlot_File_H #define ACE_GPlot_File_H #include "ace/Map_Manager.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" class TAO_ORBSVCS_Export ACE_GPlot_File @@ -25,7 +30,7 @@ class TAO_ORBSVCS_Export ACE_GPlot_File // entry value // entry value // entry value -// ... +// ... // They represent x,y pairs to be graphed by GPlot. entry's are // type long. value's are type long or float. { diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h index cc37eb01d12..4ba8dbb44c9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h +++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h @@ -5,7 +5,7 @@ // // = LIBRARY // ORB Services -// +// // = FILENAME // Local_ESTypes.h // diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h index 4ec2467f90b..b246930b37a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h +++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h @@ -5,7 +5,7 @@ // // = LIBRARY // ORB Services -// +// // = FILENAME // Memory_Pools // @@ -18,6 +18,11 @@ #define ACE_MEMORY_POOLS_H #include "ace/Synch.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Event_Channel.h" #include "Dispatching_Modules.h" @@ -31,10 +36,10 @@ typedef ACE_Thread_Mutex ACE_MEMORY_POOL_MUTEX; #endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION || !ACE_HAS_THREADS */ -typedef char +typedef char ACE_ES_Dispatch_Request_Chunk[sizeof (ACE_ES_Dispatch_Request)]; -typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX> +typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX> _ACE_Dispatch_Request_Allocator; class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request_Allocator : public _ACE_Dispatch_Request_Allocator diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h index dd8198bc255..8233726cdea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h @@ -50,7 +50,7 @@ class TAO_ORBSVCS_Export TAO_Module_Factory // achieved by constructing modules with different dynamic // types. This class encapsulates all the strategies creation in // a single point. - // + // public: virtual ~TAO_Module_Factory (void); @@ -93,7 +93,7 @@ class TAO_ORBSVCS_Export TAO_Default_Module_Factory : public TAO_Module_Factory // achieved by constructing modules with different dynamic // types. This class encapsulates all the strategies creation in // a single point. - // + // public: TAO_Default_Module_Factory (void); virtual ~TAO_Default_Module_Factory (void); @@ -137,7 +137,7 @@ class TAO_ORBSVCS_Export TAO_Reactive_Module_Factory : public TAO_Module_Factory // An Event Channel configured with this factory can exhibit high // priority inversion, but it should provide high-performance due // to the elimination of context switching. - // + // public: TAO_Reactive_Module_Factory (void); virtual ~TAO_Reactive_Module_Factory (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h index d506aa3393f..be8fc01ff9e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (ACE_RT_TASK_H) +#ifndef ACE_RT_TASK_H #define ACE_RT_TASK_H #include "ace/Task.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/RtecSchedulerC.h" class TAO_ORBSVCS_Export ACE_RT_Thread_Manager : public ACE_Thread_Manager diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h index 3bd0a1c25c1..8ae5982544d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h @@ -13,6 +13,11 @@ // Added these. #include "ace/Timer_Heap.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Timer_List.h" #include "Local_ESTypes.h" @@ -61,7 +66,7 @@ private: ACE_Timer_List timer_queue_; // The timer storage mechanism used by reactor_. -#if !defined (ACE_OLD_STYLE_REACTOR) +#ifndef ACE_OLD_STYLE_REACTOR ACE_ES_Fast_Reactor fast_reactor_; // The timer dispatch mechanism. #endif /* ! ACE_OLD_STYLE_REACTOR */ diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h index 6e0c39fc0e2..2d988fac177 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h @@ -3,10 +3,15 @@ // $Id$ // -#if !defined(TAO_EC_TIMER_MODULE_H) +#ifndef TAO_EC_TIMER_MODULE_H #define TAO_EC_TIMER_MODULE_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/orbsvcs/Event/RT_Task.h" @@ -53,8 +58,8 @@ public: // Add a timer at the given priority. virtual int register_handler (RtecScheduler::Preemption_Priority priority, - ACE_Event_Handler* eh, - ACE_HANDLE handle) = 0; + ACE_Event_Handler* eh, + ACE_HANDLE handle) = 0; // Register a handler????? virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority) = 0; @@ -95,8 +100,8 @@ public: int id, const void*& act); virtual int register_handler (RtecScheduler::Preemption_Priority priority, - ACE_Event_Handler* eh, - ACE_HANDLE handle); + ACE_Event_Handler* eh, + ACE_HANDLE handle); virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority); private: @@ -149,14 +154,14 @@ public: int id, const void*& act); virtual int register_handler (RtecScheduler::Preemption_Priority priority, - ACE_Event_Handler* eh, - ACE_HANDLE handle); + ACE_Event_Handler* eh, + ACE_HANDLE handle); virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority); - + private: int shutdown_; // The reactors are shutdown, do not attempt to restart them. - + ReactorTask *reactorTasks[ACE_Scheduler_MAX_PRIORITIES]; // The set of ReactorTasks diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 2cbc7cc9fc4..dd91d88c36e 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -5,10 +5,15 @@ // the Scheduling Service implementation. // -#if !defined (ACE_ES_CONSTANTS_H) +#ifndef ACE_ES_CONSTANTS_H #define ACE_ES_CONSTANTS_H #include "ace/Message_Block.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "orbsvcs/Time_Utilities.h" diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index 5e9dfb36354..d5d1a8ee2ad 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -9,21 +9,26 @@ // = FILENAME // svr.h // -// = DESCRIPTION -// Defines a class that listens to a multicast address for client requests +// = DESCRIPTION +// Defines a class that listens to a multicast address for client requests // for ior of a bootstrappable service. -// +// // = AUTHORS // Sergio Flores-Gaitan // // ============================================================================ -#if !defined (TAO_IOR_MULTICAST_H) +#ifndef TAO_IOR_MULTICAST_H #define TAO_IOR_MULTICAST_H #include "tao/corba.h" #include "orbsvcs/orbsvcs_export.h" #include "ace/INET_Addr.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Dgram_Mcast.h" #include "ace/Reactor.h" @@ -35,7 +40,7 @@ class TAO_ORBSVCS_Export TAO_IOR_Multicast : public ACE_Event_Handler public: TAO_IOR_Multicast (void); - // Default constructor + // Default constructor TAO_IOR_Multicast (const char *ior, u_short port, @@ -46,16 +51,16 @@ public: u_short port, const char *mcast_addr, TAO_Service_ID service_id); - + // destructor ~TAO_IOR_Multicast (void); // call back when input is received on the handle. virtual int handle_input (ACE_HANDLE fd); - + // callback when a timeout has occurred. virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + const void *arg); // returns the internal handle used to receive multicast virtual ACE_HANDLE get_handle (void) const; @@ -65,8 +70,8 @@ private: // temporary buffer TAO_Service_ID service_id_; - // Service id that we're waiting for. - + // Service id that we're waiting for. + ACE_SOCK_Dgram_Mcast mcast_dgram_; // multicast endpoint of communication diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h index 1b7756f7d92..722aa9bbf85 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if !defined (TAO_ORBSVCS_LOGGER_I_H) +#ifndef TAO_ORBSVCS_LOGGER_I_H #define TAO_ORBSVCS_LOGGER_I_H #include "orbsvcs/LoggerS.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h index ce7bdca0f0f..ca51363c127 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h +++ b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h @@ -15,7 +15,7 @@ // // ============================================================================ -#if !defined (TAO_NAMING_I_H) +#ifndef TAO_NAMING_I_H #define TAO_NAMING_I_H #include "orbsvcs/CosNamingS.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 8aec6d8914d..e00e504723b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -5,42 +5,47 @@ // // = LIBRARY // cos -// +// // = FILENAME // Entries.h // // = AUTHOR // Marina Spivak <marina@cs.wustl.edu> -// +// // ============================================================================ -#if !defined (TAO_ENTRIES_H) +#ifndef TAO_ENTRIES_H #define TAO_ENTRIES_H #include "ace/Hash_Map_Manager.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "ace/SString.h" #include "tao/corba.h" #include "orbsvcs/CosNamingC.h" -class TAO_ORBSVCS_Export TAO_IntId +class TAO_ORBSVCS_Export TAO_IntId { // = TITLE // Stores information a context keeps for each bound name. - // + // // = DESCRIPTION // Each bound name is associated with an object reference and - // the type of binding. + // the type of binding. public: // = Initialization and termination methods. TAO_IntId (void); // Constructor. TAO_IntId (CORBA::Object_ptr obj, - CosNaming::BindingType type /* = CosNaming::nobject */); + CosNaming::BindingType type /* = CosNaming::nobject */); // Constructor. - + TAO_IntId (const TAO_IntId & rhs); // Copy constructor. @@ -50,37 +55,37 @@ public: void operator= (const TAO_IntId & rhs); // Assignment operator (does copy memory). - CORBA::Object_ptr ref_; + CORBA::Object_ptr ref_; // CORBA object reference of the bound object. - CosNaming::BindingType type_; + CosNaming::BindingType type_; // Indicator of whether the object is a NamingContext that should // participate in name resolution when compound names are used. }; -class TAO_ORBSVCS_Export TAO_ExtId +class TAO_ORBSVCS_Export TAO_ExtId { // = TITLE // Stores the name to which an object is bound. // // = DESCRIPTION // This class is used as the External ID for the - // <ACE_Hash_Map_Manager>. + // <ACE_Hash_Map_Manager>. public: // = Initialization and termination methods. TAO_ExtId (void); // Constructor. - TAO_ExtId (const char *id, - const char *kind); + TAO_ExtId (const char *id, + const char *kind); // Constructor. - + TAO_ExtId (const TAO_ExtId & rhs); // Copy constructor. ~TAO_ExtId (void); - // Destructor. + // Destructor. void operator= (const TAO_ExtId & rhs); // Assignment operator (does copy memory). @@ -94,10 +99,10 @@ public: u_long hash (void) const; // This class has to have a hash for use with ACE_Hash_Map_Manager. - ACE_CString kind_; + ACE_CString kind_; // Any information user wants to store (not used by Naming Service). - ACE_CString id_; + ACE_CString id_; // Any information user wants to store (not used by Naming Service). }; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h index ca950c1d7f2..91f356d8989 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_NAMING_UTILS_H) +#ifndef TAO_NAMING_UTILS_H #define TAO_NAMING_UTILS_H #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index ecce5aebc1b..560a5b08231 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -14,10 +14,15 @@ // // ============================================================================ -#if !defined (COSPROPERTYSERVICE_I_H) -#define COSPROPERTYSERVICE_I_H +#ifndef COSPROPERTYSERVICE_I_H +#define COSPROPERTYSERVICE_I_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/orbsvcs_export.h" #include "orbsvcs/CosPropertyServiceS.h" diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index fd73102608d..81fcc5773eb 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -19,8 +19,8 @@ class TAO_ORBSVCS_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Sched // public: ACE_Runtime_Scheduler (int config_count, - ACE_Scheduler_Factory::POD_Config_Info config_info[], - int entry_count, + ACE_Scheduler_Factory::POD_Config_Info config_info[], + int entry_count, ACE_Scheduler_Factory::POD_RT_Info rt_info[]); // Initialize the data from the POD_RT_Info array. @@ -41,7 +41,7 @@ public: virtual void set (RtecScheduler::handle_t handle, RtecScheduler::Criticality criticality, RtecScheduler::Time time, - RtecScheduler::Time typical_time, + RtecScheduler::Time typical_time, RtecScheduler::Time cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, @@ -80,7 +80,7 @@ public: virtual void compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, - RtecScheduler::Config_Info_Set_out configs, + RtecScheduler::Config_Info_Set_out configs, CORBA::Environment &_env) TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, @@ -89,8 +89,8 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority p_priority, RtecScheduler::OS_Priority& priority, - RtecScheduler::Dispatching_Type & d_type, - CORBA::Environment &_env) + RtecScheduler::Dispatching_Type & d_type, + CORBA::Environment &_env) TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 7b7f7fc9415..866b373dd72 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -5,6 +5,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/RtecSchedulerS.h" #include "orbsvcs/Event_Service_Constants.h" @@ -44,9 +48,9 @@ public: virtual void set (RtecScheduler::handle_t handle, RtecScheduler::Criticality criticality, - RtecScheduler::Time time, - RtecScheduler::Time typical_time, - RtecScheduler::Time cached_time, + RtecScheduler::Time time, + RtecScheduler::Time typical_time, + RtecScheduler::Time cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, RtecScheduler::Quantum quantum, @@ -84,7 +88,7 @@ public: virtual void compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, - RtecScheduler::Config_Info_Set_out configs, + RtecScheduler::Config_Info_Set_out configs, CORBA::Environment &_env) TAO_THROW_SPEC((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, @@ -93,8 +97,8 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority p_priority, RtecScheduler::OS_Priority& priority, - RtecScheduler::Dispatching_Type & d_type, - CORBA::Environment &_env) + RtecScheduler::Dispatching_Type & d_type, + CORBA::Environment &_env) TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); @@ -115,7 +119,7 @@ private: // trait for the scheduler implementation base class typedef ACE_DynScheduler BaseSchedImplType; - // traits for the scheduler strategy + // traits for the scheduler strategy #if defined (TAO_USES_MUF_SCHEDULING) typedef ACE_MUF_Scheduler_Strategy Scheduler_Strategy; diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index 3d44e52ca59..a4f7a67cd48 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -17,10 +17,15 @@ // // ============================================================================ -#if ! defined (DYNSCHED_H) +#ifndef DYNSCHED_H #define DYNSCHED_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Map_Manager.h" #include "ace/Message_Block.h" #include "ace/Synch.h" @@ -96,7 +101,7 @@ public: }; - + ///////////////////////////// // public member functions // ///////////////////////////// @@ -169,7 +174,7 @@ public: // Obtains an RT_Info based on its "handle". status_t lookup_config_info (Preemption_Priority priority, - Config_Info* &config_info); + Config_Info* &config_info); // Obtains a Config_Info based on its priority. status_t schedule (void); @@ -189,7 +194,7 @@ public: // subpriorities of the Task that was assigned handle. "preemption_prio" // is a platform-independent priority queue number, ranging from a // highest priority value of 0 to the lowest priority value, which is - // returned by "minimum_priority_queue ()". Returns 0 on success, + // returned by "minimum_priority_queue ()". Returns 0 on success, // or -1 if an invalid handle was supplied. // = Access the platform-independent priority value of the lowest-priority diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 496c242fd08..9c6141e14d6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if ! defined (SCHEDENTRY_H) +#ifndef SCHEDENTRY_H #define SCHEDENTRY_H #include "orbsvcs/RtecSchedulerC.h" @@ -243,13 +243,13 @@ private: // The set of arrivals in the entry's effective period. ACE_Ordered_MultiSet<Dispatch_Entry_Link> dispatches_; - // Depth-first-search status of the entry. + // Depth-first-search status of the entry. DFS_Status dfs_status_; - // Depth-first-search discovery order of the entry. + // Depth-first-search discovery order of the entry. long discovered_; - // Depth-first-search completion order of the entry. + // Depth-first-search completion order of the entry. long finished_; // Flag identifying threads in the call graph. @@ -268,7 +268,7 @@ private: }; -// Wrapper for dependencies between RT_Infos +// Wrapper for dependencies between RT_Infos class TAO_ORBSVCS_Export Task_Entry_Link { public: diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index 90106022157..257329bb4e7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -18,10 +18,15 @@ // // ============================================================================ -#if ! defined (SCHEDULER_H) +#ifndef SCHEDULER_H #define SCHEDULER_H #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Map_Manager.h" #include "ace/Message_Block.h" #include "ace/Synch.h" @@ -142,7 +147,7 @@ public: // In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task // (rtinfo, 0, handle) is called. Returns FAILED if an error // occurs. - // + // // One motivation for allocating RT_Info's from within the Scheduler // is to allow RT_Infos to persist after the tasks that use them. // For instance, we may want to call this->schedule right before the @@ -151,11 +156,11 @@ public: // fail. virtual status_t lookup_rt_info (handle_t handle, - RT_Info* &rtinfo) = 0; + RT_Info* &rtinfo) = 0; // Obtains an RT_Info based on its "handle". virtual status_t lookup_config_info (Preemption_Priority priority, - Config_Info* &config_info) = 0; + Config_Info* &config_info) = 0; // Obtains a Config_Info based on its priority. @@ -178,7 +183,7 @@ public: // a highest priority value of 0 to the lowest priority value, which is // returned by "minimum_priority_queue ()". The current and deadline times // are part of the scheduling service implementation interface, but may be - // ignored by some implementations and used by others. + // ignored by some implementations and used by others. // = Access the platform-independent priority value of the lowest-priority // thread. @@ -215,7 +220,7 @@ public: // (debug) static int add_dependency(RT_Info* rt_info, - const Dependency_Info& d); + const Dependency_Info& d); static int number_of_dependencies(RT_Info* rt_info); static int number_of_dependencies(RT_Info& rt_info); @@ -225,7 +230,7 @@ public: virtual int dispatch_configuration (const Preemption_Priority &p_priority, OS_Thread_Priority& priority, - Dispatching_Type & d_type); + Dispatching_Type & d_type); // provide the thread priority and queue type for the given priority level diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index a8546dfec12..68c33084cc0 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if ! defined (SCHEDULER_INTERNAL_H) +#ifndef SCHEDULER_INTERNAL_H #define SCHEDULER_INTERNAL_H #include "Scheduler.h" @@ -50,7 +50,7 @@ public: // Obtains an RT_Info based on its "handle". virtual status_t lookup_config_info (Preemption_Priority priority, - Config_Info* &config_info); + Config_Info* &config_info); // Obtains a Config_Info based on its priority. // = Computes the schedule. diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index 2abce70e8c2..15abbb9760a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if ! defined (STRATEGY_SCHEDULER_H) +#ifndef STRATEGY_SCHEDULER_H #define STRATEGY_SCHEDULER_H #include "DynSched.h" @@ -77,7 +77,7 @@ private: }; - + //////////////////////////////////////// // Factory for strategized schedulers // //////////////////////////////////////// @@ -150,7 +150,7 @@ public: // and then on the dependency topological sort finishing time (ascending). - virtual ACE_DynScheduler::Dispatching_Type + virtual ACE_DynScheduler::Dispatching_Type dispatch_type (const Dispatch_Entry &entry) = 0; // provide the dispatching queue type for the given dispatch entry @@ -172,7 +172,7 @@ protected: }; - + class TAO_ORBSVCS_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strategy // = TITLE // ACE_MUF_Scheduler_Strategy @@ -206,7 +206,7 @@ public: virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority (); // = determine the minimum critical priority number - virtual ACE_DynScheduler::Dispatching_Type + virtual ACE_DynScheduler::Dispatching_Type dispatch_type (const Dispatch_Entry &entry); // provide the dispatching queue type for the given dispatch entry @@ -269,7 +269,7 @@ public: virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority (); // = determine the minimum critical priority number - virtual ACE_DynScheduler::Dispatching_Type + virtual ACE_DynScheduler::Dispatching_Type dispatch_type (const Dispatch_Entry &entry); // provide the dispatching queue type for the given dispatch entry @@ -299,7 +299,7 @@ private: - + class TAO_ORBSVCS_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strategy // = TITLE // ACE_MLF_Scheduler_Strategy @@ -327,7 +327,7 @@ public: u_int count); // = sort the dispatch entry link pointer array in ascending laxity order - virtual ACE_DynScheduler::Dispatching_Type + virtual ACE_DynScheduler::Dispatching_Type dispatch_type (const Dispatch_Entry &entry); // provide the dispatching queue type for the given dispatch entry @@ -386,7 +386,7 @@ public: u_int count); // = sort the dispatch entry link pointer array in ascending deadline (period) order - virtual ACE_DynScheduler::Dispatching_Type + virtual ACE_DynScheduler::Dispatching_Type dispatch_type (const Dispatch_Entry &entry); // provide the dispatching queue type for the given dispatch entry @@ -418,7 +418,7 @@ private: }; - + class TAO_ORBSVCS_Export ACE_RMS_Dyn_Scheduler_Strategy : public ACE_Scheduler_Strategy // = TITLE // ACE_RMS_Dyn_Scheduler_Strategy @@ -451,7 +451,7 @@ public: virtual ACE_DynScheduler::Preemption_Priority minimum_critical_priority (); // = determine the minimum critical priority number - virtual ACE_DynScheduler::Dispatching_Type + virtual ACE_DynScheduler::Dispatching_Type dispatch_type (const Dispatch_Entry &entry); // provide the dispatching queue type for the given dispatch entry diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index eb937fe61d1..95707b4370c 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -5,6 +5,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/CosNamingC.h" #include "orbsvcs/RtecSchedulerC.h" @@ -60,9 +64,9 @@ public: // = DESCRIPTION // This class provide us with a plain old data version of // configuration info, which is useful for implementing static arrays - // NOTE: if used in an array, the run-time scheduler requires that the - // array index match the preemption priority stored in the config info - // at that index: this is used to detect uninitialized/corrupted schedules + // NOTE: if used in an array, the run-time scheduler requires that the + // array index match the preemption priority stored in the config info + // at that index: this is used to detect uninitialized/corrupted schedules { RtecScheduler::Preemption_Priority preemption_priority; RtecScheduler::OS_Priority thread_priority; diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index 327b915efb0..becd59c0c64 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h @@ -9,6 +9,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/orbsvcs_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index f3bcc2b64c0..0b953421d15 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -3,15 +3,15 @@ // ===================================================================== // $Id$ // -// = LIBRARY +// = LIBRARY // orbsvcs -// +// // = FILENAME // Constraint_Nodes.h -// -// = AUTHOR -// Seth Widoff <sbw1@cs.wustl.edu> -// +// +// = AUTHOR +// Seth Widoff <sbw1@cs.wustl.edu> +// // ===================================================================== #ifndef TAO_CONSTRAINT_NODES_H @@ -46,22 +46,22 @@ public: // Implementing the pattern of double dispatching, each subclass of // TAO_Constraint will call back on an InterpreterVisitor the // method to handle a node of its ExpressionType. - + virtual TAO_Expression_Type expr_type (void) const = 0; // Return the expression type represented by this node. - - virtual ~TAO_Constraint (void) {} + + virtual ~TAO_Constraint (void) {} }; class TAO_Noop_Constraint : public TAO_Constraint // = TITLE -// A node that represents an operation with no operands. +// A node that represents an operation with no operands. { public: TAO_Noop_Constraint (TAO_Expression_Type type) : type_ (type) {} - + virtual int accept (TAO_Constraint_Visitor* visitor); virtual TAO_Expression_Type expr_type (void) const @@ -79,10 +79,10 @@ class TAO_Binary_Constraint : public TAO_Constraint // and right operands. { public: - + TAO_Binary_Constraint (TAO_Expression_Type op_type, - TAO_Constraint* left, - TAO_Constraint* right); + TAO_Constraint* left, + TAO_Constraint* right); virtual int accept (TAO_Constraint_Visitor* visitor); @@ -90,10 +90,10 @@ public: virtual TAO_Expression_Type expr_type (void) const { return this->op_; } - + TAO_Constraint* left_operand (void) const; // Return the left operand of the binary expression - + TAO_Constraint* right_operand (void) const; // Return the right operand of the binary expression @@ -114,16 +114,16 @@ public: static int visit_mult (TAO_Constraint_Visitor* , TAO_Binary_Constraint*); static int visit_div (TAO_Constraint_Visitor* , TAO_Binary_Constraint*); static int visit_twiddle (TAO_Constraint_Visitor* , TAO_Binary_Constraint*); - static int visit_in (TAO_Constraint_Visitor* , TAO_Binary_Constraint*); - + static int visit_in (TAO_Constraint_Visitor* , TAO_Binary_Constraint*); + private: TAO_Binary_Constraint (const TAO_Binary_Constraint&); TAO_Binary_Constraint& operator= (const TAO_Binary_Constraint&); - + TAO_Expression_Type op_; // The operator type - + TAO_Constraint* left_; TAO_Constraint* right_; // The operands of the expression @@ -136,27 +136,27 @@ class TAO_Unary_Constraint : public TAO_Constraint // one operand. { public: - + TAO_Unary_Constraint (TAO_Expression_Type op_type, - TAO_Constraint* operand); - + TAO_Constraint* operand); + virtual ~TAO_Unary_Constraint (void); - + virtual int accept (TAO_Constraint_Visitor* visitor); virtual TAO_Expression_Type expr_type (void) const { return this->op_; } - + TAO_Constraint* operand (void); - + private: TAO_Unary_Constraint (const TAO_Unary_Constraint&); TAO_Unary_Constraint& operator= (const TAO_Unary_Constraint&); - + TAO_Expression_Type op_; // The operator type - + TAO_Constraint* operand_; // The operand of the expression }; @@ -168,24 +168,24 @@ class TAO_Property_Constraint : public TAO_Constraint // value is determined by the offer being evaluated. { public: - + TAO_Property_Constraint (const char* name); virtual ~TAO_Property_Constraint (void); - + virtual int accept (TAO_Constraint_Visitor* visitor); virtual TAO_Expression_Type expr_type (void) const { return TAO_IDENT; } - + const char* name (void) const; // Returns the name of the property. - + private: TAO_Property_Constraint (const TAO_Property_Constraint&); TAO_Property_Constraint& operator= (const TAO_Property_Constraint&); - + char* name_; // The name of the property. }; @@ -194,7 +194,7 @@ class TAO_Literal_Constraint : public TAO_Constraint // // = TITLE // TAO_Literal_Constraint represents a literal occuring in -// the constraint expression tree. +// the constraint expression tree. { public: @@ -202,108 +202,108 @@ class TAO_Literal_Constraint : public TAO_Constraint : type_ (TAO_UNKNOWN) {} // = Constructors for each of the various types of literals. - - TAO_Literal_Constraint (CORBA::Any* any); + + TAO_Literal_Constraint (CORBA::Any* any); TAO_Literal_Constraint (CORBA::ULong uinteger); TAO_Literal_Constraint (CORBA::Long integer); TAO_Literal_Constraint (CORBA::Boolean boolean); - TAO_Literal_Constraint (CORBA::Double doub); + TAO_Literal_Constraint (CORBA::Double doub); TAO_Literal_Constraint (const char* str); - + TAO_Literal_Constraint (const TAO_Literal_Constraint& lit); // Copy constructor - + ~TAO_Literal_Constraint(void); // Destructor. - + virtual int accept (TAO_Constraint_Visitor* visitor); // Visitor accept methods. - + virtual TAO_Expression_Type expr_type (void) const { return type_; } void operator= (const TAO_Literal_Constraint& co); // Assignment operator. - + // Conversion routines. operator CORBA::Boolean (void) const; operator CORBA::ULong (void) const; - operator CORBA::Long (void) const; + operator CORBA::Long (void) const; operator CORBA::Double (void) const; operator const char* (void) const; - operator const CORBA::Any* (void) const; - + operator const CORBA::Any* (void) const; + // Return the type represented by this MysteryOperand. - + // = Comparison operators. - + friend int operator< (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend int operator<= (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend int operator> (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend int operator>= (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend int operator== (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend int operator!= (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend int operator== (double left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend int operator== (const TAO_String_Manager& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + // = Arithmetic operators. - + friend TAO_Literal_Constraint operator+ (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend TAO_Literal_Constraint operator- (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend TAO_Literal_Constraint operator* (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend TAO_Literal_Constraint operator/ (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); - + const TAO_Literal_Constraint& right); + friend TAO_Literal_Constraint operator- (const TAO_Literal_Constraint& operand); - + static TAO_Expression_Type widest_type (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right); + const TAO_Literal_Constraint& right); // Ensure both operands are of the same simple numeric type. - + static TAO_Expression_Type comparable_type (CORBA::TypeCode_ptr type); // Determine the comparable Expression Type from the CORBA type - + private: void copy (const TAO_Literal_Constraint& co); // Private copy method. - + union { char* str_; @@ -314,10 +314,10 @@ class TAO_Literal_Constraint : public TAO_Constraint CORBA::Double double_; } op_; // Union of the possible literal types. - + TAO_Expression_Type type_; // The actual types of the TAO_Literal_Constraint. - + }; #endif /* TAO_CONSTRAINT_NODES_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index d8653f45cea..a77cab4e473 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -3,15 +3,15 @@ // ======================================================================== // $Id$ // -// = LIBRARY +// = LIBRARY // orbsvcs -// +// // = FILENAME // Constraint_Visitor.h -// -// = AUTHOR -// Seth Widoff <sbw1@cs.wustl.edu> -// +// +// = AUTHOR +// Seth Widoff <sbw1@cs.wustl.edu> +// // ======================================================================== #ifndef TAO_CONSTRAINT_VISITOR_H @@ -45,12 +45,12 @@ class TAO_Constraint_Visitor // appropriate method on the visitor passed to it, based on its // own type. So, the Constraint_Visitor has a method to deal with // each possible type of node in an expression tree; one for each -// operator in the grammar. +// operator in the grammar. { public: virtual ~TAO_Constraint_Visitor (void) {} - + virtual int visit_constraint (TAO_Unary_Constraint* constraint) = 0; virtual int visit_with (TAO_Unary_Constraint* unary_with) = 0; @@ -58,7 +58,7 @@ public: virtual int visit_max (TAO_Unary_Constraint* unary_max) = 0; virtual int visit_first (TAO_Noop_Constraint* noop_first) = 0; virtual int visit_random (TAO_Noop_Constraint* noop_random) = 0; - + virtual int visit_and (TAO_Binary_Constraint* boolean_and) = 0; virtual int visit_or (TAO_Binary_Constraint* boolean_or) = 0; virtual int visit_not (TAO_Unary_Constraint* unary_not) = 0; @@ -110,13 +110,13 @@ class TAO_Constraint_Validator : public TAO_Constraint_Visitor // property names. The algorithm for type // checking is as follows: ensure that operand expression(s) // return the correct types using expr_returns* methods. If they - // (or it) return the correct types, call accept + // (or it) return the correct types, call accept // on each operand until all return true or one returns false, // at which point we can back out of the traversal and indicate - // failure. + // failure. { public: - + TAO_Constraint_Validator (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct); // The constructor creates a map of property names to their values @@ -128,12 +128,12 @@ public: virtual ~TAO_Constraint_Validator (void); // Desctructor. - + int validate (TAO_Constraint* root); // Validate returns 1 if the expression tree whose root is <root> // makes semantic sense, in that the operands for each operation // comply with each other and the types accepted by the operator. - + // = Visitor Methods virtual int visit_constraint (TAO_Unary_Constraint* constraint); @@ -143,34 +143,34 @@ public: virtual int visit_max (TAO_Unary_Constraint* unary_max); virtual int visit_first (TAO_Noop_Constraint* noop_first); virtual int visit_random (TAO_Noop_Constraint* noop_random); - + virtual int visit_and (TAO_Binary_Constraint* boolean_and); virtual int visit_or (TAO_Binary_Constraint* boolean_or); // The two operands must return a boolean value. - + virtual int visit_not (TAO_Unary_Constraint* unary_not); // The operand must return a boolean value. - + virtual int visit_exist (TAO_Unary_Constraint* unary_exist); // The operand must return a valid (i.e., present in the service // type description) property name. - + virtual int visit_unary_minus (TAO_Unary_Constraint* unary_minus); // The operand must return a number to be negated. - + virtual int visit_add (TAO_Binary_Constraint* boolean_add); virtual int visit_sub (TAO_Binary_Constraint* boolean_sub); virtual int visit_mult (TAO_Binary_Constraint* boolean_mult); virtual int visit_div (TAO_Binary_Constraint* boolean_div); // Both operands must return numeric results. - + virtual int visit_twiddle (TAO_Binary_Constraint* binary_twiddle); // Both operands must return strings. - + virtual int visit_in (TAO_Binary_Constraint* binary_in); // The right operand must be a sequence of the same simple type as // the left operand. - + virtual int visit_less_than (TAO_Binary_Constraint* boolean_lt); virtual int visit_less_than_equal (TAO_Binary_Constraint* boolean_lte); virtual int visit_greater_than (TAO_Binary_Constraint* boolean_gt); @@ -178,28 +178,28 @@ public: virtual int visit_equal (TAO_Binary_Constraint* boolean_eq); virtual int visit_not_equal (TAO_Binary_Constraint* boolean_neq); // The left and right operands must both be of the same simple type. - + virtual int visit_literal (TAO_Literal_Constraint* literal); virtual int visit_property (TAO_Property_Constraint* literal); // The property must be defined in the service type description. - + private: - + TAO_Typecode_Table type_map_; // A map gleaned from the ServiceTypeStruct, which correlates // property names with their types. CORBA::TypeCode* extract_type (TAO_Constraint* expr_type, - TAO_Expression_Type& type); - + TAO_Expression_Type& type); + int expr_returns_boolean (TAO_Expression_Type expr_type); // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will - // return a boolean. - + // return a boolean. + int expr_returns_number (TAO_Expression_Type expr_type); // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will - // return a number. - + // return a number. + int expr_returns_string (TAO_Expression_Type expr_type); // expr_returns_boolean returns 1 if <expr_type>, when evaluated, will // return a string. @@ -220,7 +220,7 @@ class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor // TAO_Constraint_Evaluator traverse a constraint expression tree, // and determines whether an offer fits the constraints // represented by the tree -// +// // = DESCRIPTION // Using the Visitor pattern, the TAO_Constraint_Evaluator has each // node of the expression tree call back to it with the method @@ -235,8 +235,8 @@ class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor public: TAO_Constraint_Evaluator (CosTrading::Offer* offer, - CORBA::Boolean supports_dynamic_properties = 1); - + CORBA::Boolean supports_dynamic_properties = 1); + CORBA::Boolean evaluate_constraint (TAO_Constraint* root); // Evaluate returns 1 if the offer satisfies the constraints // represented by the the expression tree rooted at <root>, 0 if it @@ -244,12 +244,12 @@ public: // automatically fails. int evaluate_preference (TAO_Constraint* root, - TAO_Literal_Constraint& result); + TAO_Literal_Constraint& result); // The result of the preference evaluation is stored in result. The // method returns 0 upon success, -1 upon failure. - + // = Visitor Methods - + virtual int visit_constraint (TAO_Unary_Constraint* constraint); virtual int visit_with (TAO_Unary_Constraint* unary_with); @@ -257,7 +257,7 @@ public: virtual int visit_max (TAO_Unary_Constraint* unary_max); virtual int visit_first (TAO_Noop_Constraint* noop_first); virtual int visit_random (TAO_Noop_Constraint* noop_random); - + virtual int visit_and (TAO_Binary_Constraint* boolean_and); // Takes the logical and of the results of both operands. Note that // in the case where the left operand returns zero, the result is @@ -270,20 +270,20 @@ public: virtual int visit_not (TAO_Unary_Constraint* unary_not); // Logically negates the value of the operand. - + virtual int visit_exist (TAO_Unary_Constraint* unary_exist); // The property exists if its name is bound to a value in the // <props_> map. virtual int visit_unary_minus (TAO_Unary_Constraint* unary_minus); // Mathematically negates the return value the operand. - + virtual int visit_add (TAO_Binary_Constraint* boolean_add); // Add the results of evaluating the left and right operands. - + virtual int visit_sub (TAO_Binary_Constraint* boolean_sub); // Subtract the results of evaluating the left and right operands. - + virtual int visit_mult (TAO_Binary_Constraint* boolean_mult); // Multiply the results of evaluating the left and right operands. @@ -310,13 +310,13 @@ public: virtual int visit_property (TAO_Property_Constraint* literal); // Copy the value of the property into the result container. - + private: class Operand_Queue : public ACE_Unbounded_Queue <TAO_Literal_Constraint> // = TITLE - // A queue adapter with methods to setting and getting operands + // A queue adapter with methods to setting and getting operands // from the expression evaluation results. { public: @@ -335,13 +335,13 @@ private: void dequeue_operand (void); // Remove an operand from the queue. }; - + void do_the_op (int operation); // Method for performing a arithmetic or comparison operation. - + int visit_bin_op (TAO_Binary_Constraint* op, int operation); // Method for evaluating a binary operation. - + CORBA::Boolean sequence_does_contain (CORBA::Any* sequence, TAO_Literal_Constraint& element); // Determine if sequence contains <element>, a literal of the same @@ -350,13 +350,13 @@ private: TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&); TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&); // Disallow copying. - + TAO_Lookup_Table props_; // The map of property names to their values for a property. TAO_Property_Evaluator prop_eval_; // Utility with which to evaluate the properties of an offer, be - // they dyanmic or static. + // they dyanmic or static. Operand_Queue queue_; // The result of a non_boolean operation. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h index 2476c0aee25..0c79088727e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h @@ -5,7 +5,7 @@ // // = LIBRARY // Trading -// +// // = FILENAME // Locking.h // @@ -13,7 +13,7 @@ // Marina Spivak <marina@cs.wustl.edu> // Seth Widoff <sbw1@cs.wustl.edu> // Irfan Pyarali <irfan@cs.wustl.edu> -// +// // ========================================================================== #ifndef TAO_LOCKING_H #define TAO_LOCKING_H diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index 7d117940433..b79ecffe98a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -5,13 +5,13 @@ // // = LIBRARY // orbsvcs -// +// // = FILENAME // Offer_Database.h // // = AUTHOR // Seth Widoff <sbw1@cs.wustl.edu> -// +// // ======================================================================== #ifndef TAO_OFFER_DATABASE_H @@ -30,12 +30,12 @@ class TAO_Offer_Database // underlying structure is a map of maps. The first maps maps the // service type name to a map of exported offers. The second map // maps the identifying index for that offer within the service -// types. So a service type name and an index uniquely identifies an +// types. So a service type name and an index uniquely identifies an // exported offer. In fact, when the register export interface // returns a CosTrading::OfferId, it's returning no more than a // simple string concatenation of these two values. In addition to -// all these wonderful things, the TAO_Offer_Database has built-in -// locking, one reader/writer-style lock for modifying the top-level +// all these wonderful things, the TAO_Offer_Database has built-in +// locking, one reader/writer-style lock for modifying the top-level // map and a reader/writer-style for each of the offer // maps. Needless to say the locks are acquired when the // TAO_Offer_Database performs operations on the structures they @@ -52,34 +52,34 @@ public: // Traits typedef TAO_Service_Offer_Iterator<LOCK_TYPE> offer_iterator; - + TAO_Offer_Database (void); // No arg constructor. ~TAO_Offer_Database (void); - + CosTrading::OfferId insert_offer (const char* type, CosTrading::Offer* offer); // Add an offer of type <type> and generate a CosTrading::OfferId // for it. Returns 0 on failure. int remove_offer (const CosTrading::OfferId offer_id, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)); - + CosTrading::UnknownOfferId)); + CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)); + CosTrading::UnknownOfferId)); // Lookup an offer whose offer_id is <offer_id>, and return // it. Otherwise, throw the appropriate exception. CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, - char*& type_name, - CORBA::Environment& _env) + char*& type_name, + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)); + CosTrading::UnknownOfferId)); // Lookup an offer whose OfferId is <offer_id> and return in // <type_name> the type name of the object. Type name is just a // pointer to a location in offer_id, so DON'T DELETE IT. @@ -88,14 +88,14 @@ public: // Return an iterator that will traverse and return all the offer // ids in the service type map. - struct Offer_Map_Entry + struct Offer_Map_Entry { TAO_Offer_Map* offer_map_; CORBA::ULong counter_; LOCK_TYPE lock_; }; - typedef ACE_Hash_Map_Manager + typedef ACE_Hash_Map_Manager < TAO_String_Hash_Key, Offer_Map_Entry*, @@ -104,41 +104,41 @@ public: Offer_Database; private: - + // The internal id is a pointer here, not only to avoid copying, // since we would only copy on insertion, and we only insert once // --- with an empty Offer_Map_Entry --- but also since most locks // have unimplemented copy constructors. - + CosTrading::Offer* lookup_offer (const char* type, - CORBA::ULong id); + CORBA::ULong id); // Lookup an offer whose type is <type> and id, <id>. Return 0 on - // failure. + // failure. int remove_offer (const char* type, CORBA::ULong id); - // Remove an offers whose id is <offer_id>. Returns 0 on success, -1 - // on failure, and throws a CosTrading::IllegalOfferId if it can't + // Remove an offers whose id is <offer_id>. Returns 0 on success, -1 + // on failure, and throws a CosTrading::IllegalOfferId if it can't // parse the CosTrading::OfferId. static CosTrading::OfferId generate_offer_id (const char *type_name, - CORBA::ULong id); + CORBA::ULong id); // Take in a service type name for the offer the current value of // of the counter and generate an offer id. - + static void parse_offer_id (const CosTrading::OfferId offer_id, - char* &service_type, - CORBA::ULong& id, - CORBA::Environment& _env) + char* &service_type, + CORBA::ULong& id, + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTrading::IllegalOfferId)); // Take in a previously generated offer id and return the type - // and id that were used to generate the offer id. + // and id that were used to generate the offer id. // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Offer_Database<LOCK_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Offer_Database (const TAO_Offer_Database<LOCK_TYPE> &)) - + ACE_UNIMPLEMENTED_FUNC (TAO_Offer_Database (const TAO_Offer_Database<LOCK_TYPE> &)) + LOCK_TYPE db_lock_; - + Offer_Database offer_db_; // The protected data structure. }; @@ -149,30 +149,30 @@ class TAO_Service_Offer_Iterator // TAO_Service_Offer_Iterator iterates over the set of exported // offers for a given type. Handily, it takes care of all the // necessary locking, acquiring them in the constructor, and -// releasing them in the destructor. +// releasing them in the destructor. { public: typedef TAO_Offer_Database<LOCK_TYPE> Offer_Database; - + TAO_Service_Offer_Iterator (const char* type, - TAO_Offer_Database<LOCK_TYPE>& offer_database); - + TAO_Offer_Database<LOCK_TYPE>& offer_database); + ~TAO_Service_Offer_Iterator (void); // Release all the locks acquired. - + int has_more_offers (void); // Returns 1 if there are more offers, 0 otherwise. - + CosTrading::OfferId get_id (void); // Get the id for the current offer. - + CosTrading::Offer* get_offer (void); // Returns the next offer in the series. - + void next_offer (void); // Advances the iterator 1. - + private: // Protected constructor. @@ -184,7 +184,7 @@ class TAO_Service_Offer_Iterator TAO_Offer_Map::iterator* offer_iter_; // Iterator over the actual offer map. - + const char* type_; // The name of the type. Used for constructing offer ids. }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index ee3f93c1f94..f1513e0835c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -91,9 +91,9 @@ public: TAO_Offer_Iterator (TAO_Offer_Iterator& iter) {} // To satisfy g++'s insane lust for copy constructors... - + TAO_Offer_Iterator& operator=(const TAO_Offer_Iterator&); - + TAO_Property_Filter pfilter_; // The filter through which each returned offer must pass. Used to // strip offers of undesirable properties. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index f21c2197e9d..fa74f0acf5e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -5,14 +5,14 @@ // // = LIBRARY // orbsvcs -// +// // = FILENAME // Offer_Iterators_T.h // // = AUTHOR // Marina Spivak <marina@cs.wustl.edu> // Seth Widoff <sbw1@cs.wustl.edu> -// +// // ======================================================================== #ifndef TAO_REGISTER_OFFER_ITERATOR_H @@ -31,36 +31,36 @@ class TAO_Register_Offer_Iterator : public TAO_Offer_Iterator // = DESCRIPTION // Stores ids of offers to be iterated over. Before returning // an offer, checks if the offer is still there (since it may - // have been removed by the Register). + // have been removed by the Register). public: // = Initialization and termination methods. TAO_Register_Offer_Iterator (TAO_Offer_Database<MAP_LOCK_TYPE> &db, - const TAO_Property_Filter& pfilter); - // Takes service type and trader reference in order to + const TAO_Property_Filter& pfilter); + // Takes service type and trader reference in order to // later locate offers using their ids. virtual ~TAO_Register_Offer_Iterator (void); // destructor. - virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment& _env) + virtual CORBA::Boolean next_n (CORBA::ULong n, + CosTrading::OfferSeq_out offers, + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException)); // Deposit at maximum n offers into the return sequence and return 1, // or return 0 if the iterator is done and no offers are returned. - - virtual CORBA::ULong max_left (CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)); - // Throws CosTrading::UnknownMaxLeft since with the presence of - // "Register" functionality, the iterator cannot guarantee that + + virtual CORBA::ULong max_left (CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::UnknownMaxLeft)); + // Throws CosTrading::UnknownMaxLeft since with the presence of + // "Register" functionality, the iterator cannot guarantee that // the trader will have all the offers it has now when the time // to return them comes. void add_offer (CosTrading::OfferId id, - const CosTrading::Offer* offer); + const CosTrading::Offer* offer); // Add an offer the iterator should iterate over. private: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index 6e6aabcaee2..1be09f077cc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -2,17 +2,17 @@ // ======================================================================== // $Id$ -// +// // = LIBRARY // orbsvcs -// +// // = FILENAME // Service_Type_Repository.h // // = AUTHOR // Marina Spivak <marina@cs.wustl.edu> // Seth Widoff <sbw1@cs.wustl.edu> -// +// // ======================================================================== #ifndef TAO_SERVICE_TYPE_REPOSITORY_H @@ -25,36 +25,36 @@ class TAO_ORBSVCS_Export TAO_Service_Type_Repository : // // = TITLE // This class implements CosTradingRepos::ServiceTypeRepository - // IDL interface. + // IDL interface. { public: - + TAO_Service_Type_Repository (ACE_Lock* lock = 0); // Parameterize the Service_Type_Repository with a lock to serialize // access to the type repository map. A reader/writer lock is - // probably best. The Service_Type_Repository assumes control of the + // probably best. The Service_Type_Repository assumes control of the // lock. - + ~TAO_Service_Type_Repository (void); - - virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber - incarnation (CORBA::Environment& _env); - - virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber - add_type (const char * name, - const char * if_name, - const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, - CORBA::Environment& _env) + + virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber + incarnation (CORBA::Environment& _env); + + virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber + add_type (const char * name, + const char * if_name, + const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); + CosTrading::IllegalServiceType, + CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, + CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, + CosTrading::IllegalPropertyName, + CosTrading::DuplicatePropertyName, + CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, + CosTrading::UnknownServiceType, + CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); // BEGIN SPEC // The add_type operation enables the creation of new service types @@ -96,16 +96,16 @@ public: // ServiceTypeNames in "super_types" does not exist, then the // CosTrading::UnknownServiceType exception is raised. ° If the same // service type name is included two or more times in this - // parameter, the DuplicateServiceTypeName exception is raised. + // parameter, the DuplicateServiceTypeName exception is raised. // END SPEC - + virtual void remove_type (const char * name, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::HasSubTypes)); + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTradingRepos::ServiceTypeRepository::HasSubTypes)); // BEGIN SPEC // The remove_type operation removes the named type from the service @@ -114,12 +114,12 @@ public: // does not exist within the repository, then the // CosTrading::UnknownServiceType exception is raised. ° If "name" // has a service type which has been derived from it, then the - // HasSubTypes exception is raised. + // HasSubTypes exception is raised. // END SPEC - - virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq* + + virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq* list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& which_types, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC @@ -130,29 +130,29 @@ public: // added/modified since a particular incarnation number The names of // the requested types are returned by the operation for subsequent // querying via the describe_type or the fully_describe_type - // operation. - // END SPEC - + // operation. + // END SPEC + virtual CosTradingRepos::ServiceTypeRepository::TypeStruct* describe_type (const char * name, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)); + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType)); // BEGIN SPEC // The describe_type operation permits a client to obtain the // details for a particular service type. ° If "name" is malformed, // then the CosTrading::IllegalServiceType exception is raised. ° If // "name" does not exist within the repository, then the - // CosTrading::UnknownServiceType exception is raised. + // CosTrading::UnknownServiceType exception is raised. // END SPEC - - virtual CosTradingRepos::ServiceTypeRepository::TypeStruct* + + virtual CosTradingRepos::ServiceTypeRepository::TypeStruct* fully_describe_type (const char * name, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)); + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType)); // BEGIN SPEC // The fully_describe_type operation permits a client to obtain the // details for a particular service type. The property sequence @@ -162,15 +162,15 @@ public: // transitive closure of the super type relation. ° If "name" is // malformed, then the CosTrading::IllegalServiceType exception is // raised. ° If "name" does not exist within the repository, then - // the CosTrading::UnknownServiceType exception is raised. - // END SPEC + // the CosTrading::UnknownServiceType exception is raised. + // END SPEC virtual void mask_type (const char * name, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::AlreadyMasked)); + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTradingRepos::ServiceTypeRepository::AlreadyMasked)); // BEGIN SPEC // The mask_type operation permits the deprecation of a particular // type (i.e., after being masked, exporters will no longer be able @@ -181,15 +181,15 @@ public: // does not exist within the repository, then the // CosTrading::UnknownServiceType exception is raised. ° If the type // is currently in the masked state, then the AlreadyMasked - // exception is raised. - // END SPEC - + // exception is raised. + // END SPEC + virtual void unmask_type (const char * name, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::NotMasked)); + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTradingRepos::ServiceTypeRepository::NotMasked)); // BEGIN SPEC // The unmask_type undeprecates a type (i.e., after being unmasked, // exporters will be able to resume advertisement of offers of that @@ -198,21 +198,21 @@ public: // does not exist within the repository, then the // CosTrading::UnknownServiceType exception is raised. ° If the type // is not currently in the masked state, then the NotMasked - // exception is raised. + // exception is raised. // END SPEC private: - + struct Type_Info { // storage structure for information pertinent to the type. - CosTradingRepos::ServiceTypeRepository::TypeStruct type_struct_; + CosTradingRepos::ServiceTypeRepository::TypeStruct type_struct_; // standard type info. - + CORBA::Boolean has_subtypes_; // names of subtypes. }; - + typedef ACE_Hash_Map_Manager < TAO_String_Hash_Key, @@ -220,7 +220,7 @@ private: ACE_Null_Mutex > Prop_Map; - + typedef ACE_Hash_Map_Manager < TAO_String_Hash_Key, @@ -230,59 +230,59 @@ private: Service_Type_Map; void fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct, - CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, - CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types); + CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, + CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types); // Build a sequence aggregating the property names from all // supertypes of the type, and a sequence representing the // transitive closure of the super type relation. void collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct, TAO_String_Queue& target); - + void validate_properties (Prop_Map& prop_map, - const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, - CORBA::Environment& _env) + const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + CosTrading::DuplicatePropertyName)); // Confirm that the properties in props have valid names, and aren't // duplicated. Cram those properties into the prop_map. - + void validate_supertypes (Service_Type_Map& super_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, - CORBA::Environment& _env) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::DuplicatePropertyName)); - // Confirm that the each super type exists, and cram them into super_map. - + CosTrading::UnknownServiceType, + CosTrading::DuplicatePropertyName)); + // Confirm that the each super type exists, and cram them into super_map. + void validate_inheritance (Prop_Map& prop_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, - CORBA::Environment& _env) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)); // Ensure that properties of a super_type aren't having their types // or retstrictions redefined. // void validate_interface (const char* if_name, - // Service_Type_Map& super_map, - // CORBA::Environment& _env) + // Service_Type_Map& super_map, + // CORBA::Environment& _env) // TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch)); // Ensure that the interface type derives from its superclasses'. - + void update_type_map (const char* name, - const char * if_name, - const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, - Prop_Map& prop_map, - Service_Type_Map& super_map); + const char * if_name, + const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props, + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types, + Prop_Map& prop_map, + Service_Type_Map& super_map); // Update the type map with the information contained in the // TypeStruct, prop_map, and super_map. TAO_Service_Type_Repository (const TAO_Service_Type_Repository&); TAO_Service_Type_Repository& operator= (const TAO_Service_Type_Repository&); - + ACE_Lock* lock_; // Lock with which to serialize access to the service type map. - + Service_Type_Map type_map_; // Stores information for each service type in the repository. // This is a mapping from service type name to a Type_Info struct diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 050978a3461..03dae79a92c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -30,6 +30,11 @@ #define TAO_TRADER_BASE_H #include "ace/Hash_Map_Manager.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Containers.h" #include "orbsvcs/CosTradingS.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 58ed40d5945..7ee9754254a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -5,7 +5,7 @@ // // = LIBRARY // orbsvcs -// +// // = FILENAME // Trader_Interfaces.h // @@ -13,7 +13,7 @@ // Marina Spivak <marina@cs.wustl.edu> // Seth Widoff <sbw1@cs.wustl.edu> // Irfan Pyarali <irfan@cs.wustl.edu> -// +// // ======================================================================== #ifndef TAO_TRADER_INTERFACES_H @@ -45,41 +45,41 @@ class TAO_Lookup : // // = TITLE // This class implements CosTrading::Lookup IDL interface. -{ +{ public: - + TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); ~TAO_Lookup (void); - + virtual void query (const char *type, - const char *constr, - const char *pref, - const CosTrading::PolicySeq& policies, - const CosTrading::Lookup::SpecifiedProps& desired_props, - CORBA::ULong how_many, - CosTrading::OfferSeq_out offers, - CosTrading::OfferIterator_out offer_itr, - CosTrading::PolicyNameSeq_out limits_applied, - CORBA::Environment& env) + const char *constr, + const char *pref, + const CosTrading::PolicySeq& policies, + const CosTrading::Lookup::SpecifiedProps& desired_props, + CORBA::ULong how_many, + CosTrading::OfferSeq_out offers, + CosTrading::OfferIterator_out offer_itr, + CosTrading::PolicyNameSeq_out limits_applied, + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTrading::IllegalConstraint, + CosTrading::Lookup::IllegalPreference, + CosTrading::Lookup::IllegalPolicyName, + CosTrading::Lookup::PolicyTypeMismatch, + CosTrading::Lookup::InvalidPolicyValue, + CosTrading::IllegalPropertyName, + CosTrading::DuplicatePropertyName, + CosTrading::DuplicatePolicyName)); // BEGIN SPEC // The query operation is the means by which an object can obtain // references to other objects that provide services meeting its // requirements. - + // The "type" parameter conveys the required service type. It is key // to the central purpose of trading: to perform an introduction for // future type safe interactions between importer and exporter. By @@ -94,7 +94,7 @@ public: // query for the "type" is also a well-formed query with respect to // any subtypes. However, if the importer specifies the policy of // exact_type_match = TRUE, then only offers with the exact (no - // subtype) service type requested are returned. + // subtype) service type requested are returned. // The constraint "constr" is the means by which the importer states // those requirements of a service that are not captured in the @@ -122,7 +122,7 @@ public: // implementation of the trader. However, some names are // standardized where they effect the interpretation of other // parameters or where they may impact linking and federation of - // traders. + // traders. // The "desired_props" parameter defines the set of properties // describing returned offers that are to be returned with the @@ -134,7 +134,7 @@ public: // The desired_props parameter does not affect whether or not a // service offer is returned. To avoid "missing" desired properties, // the importer should specify "exists prop_name" in the - // constraint. + // constraint. // The returned offers are passed back in one of two ways (or a // combination of both). °The "offers" return result conveys a list @@ -143,7 +143,7 @@ public: // how many offers are to be returned via the "offers" result, any // remaining offers are available via the iterator interface. If the // "how_many" exceeds the number of offers to be returned, then the - // "offer_itr" will be nil. + // "offer_itr" will be nil. // If any cardinality or other limits were applied by one or more // traders in responding to a particular query, then the @@ -153,31 +153,31 @@ public: // concatenated onto the names of limits applied locally and // returned. // END SPEC - + private: TAO_Offer_Iterator* create_offer_iterator (const TAO_Property_Filter&); // Factory method for creating an appropriate Offer Iterator based - // on the presence of the Register Interface. - + // on the presence of the Register Interface. + void lookup_all_subtypes (const char* type, - CosTradingRepos::ServiceTypeRepository::IncarnationNumber& inc_num, + CosTradingRepos::ServiceTypeRepository::IncarnationNumber& inc_num, TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database, - CosTradingRepos::ServiceTypeRepository_ptr rep, - TAO_Constraint_Interpreter& constr_inter, - TAO_Preference_Interpreter& pref_inter, - TAO_Offer_Filter& offer_filter); + CosTradingRepos::ServiceTypeRepository_ptr rep, + TAO_Constraint_Interpreter& constr_inter, + TAO_Preference_Interpreter& pref_inter, + TAO_Offer_Filter& offer_filter); // Traverse the type hierarchy to pull the matching offers from all // subtypes of the root type. - + void lookup_one_type (const char* type, - TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database, - TAO_Constraint_Interpreter& constr_inter, - TAO_Preference_Interpreter& pref_inter, - TAO_Offer_Filter& offer_filter); + TAO_Offer_Database<MAP_LOCK_TYPE>& offer_database, + TAO_Constraint_Interpreter& constr_inter, + TAO_Preference_Interpreter& pref_inter, + TAO_Offer_Filter& offer_filter); // Check if offers of a type fit the constraints and order them // according to the preferences submitted. - + int fill_receptacles (const char* type, CORBA::ULong how_many, const CosTrading::Lookup::SpecifiedProps& desired_props, @@ -187,7 +187,7 @@ private: CosTrading::OfferIterator_ptr& offer_itr, CORBA::Environment& env) TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + CosTrading::DuplicatePropertyName)); // This method takes the list of ordered offers and places a number // of them in the sequence of returned offers and the rest into thr // iterator. In addition, fill_receptacles uses the @@ -196,67 +196,67 @@ private: void forward_query (const char* next_hop, const char *type, - const char *constr, - const char *pref, + const char *constr, + const char *pref, const CosTrading::PolicySeq& policy_seq, - const CosTrading::Lookup::SpecifiedProps& desired_props, - CORBA::ULong how_many, - CosTrading::OfferSeq_out offers, - CosTrading::OfferIterator_out offer_itr, - CosTrading::PolicyNameSeq_out limits_applied, - CORBA::Environment& env) + const CosTrading::Lookup::SpecifiedProps& desired_props, + CORBA::ULong how_many, + CosTrading::OfferSeq_out offers, + CosTrading::OfferIterator_out offer_itr, + CosTrading::PolicyNameSeq_out limits_applied, + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); - // If a starting_trader policy was specfied, foward the query to the + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTrading::IllegalConstraint, + CosTrading::Lookup::IllegalPreference, + CosTrading::Lookup::IllegalPolicyName, + CosTrading::Lookup::PolicyTypeMismatch, + CosTrading::Lookup::InvalidPolicyValue, + CosTrading::IllegalPropertyName, + CosTrading::DuplicatePropertyName, + CosTrading::DuplicatePolicyName)); + // If a starting_trader policy was specfied, foward the query to the // next link in the sequence. - + CORBA::Boolean retrieve_links (TAO_Policies& policies, - CORBA::ULong offer_returned, - CosTrading::LinkNameSeq_out links, - CORBA::Environment& _env) + CORBA::ULong offer_returned, + CosTrading::LinkNameSeq_out links, + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::Lookup::PolicyTypeMismatch)); + CosTrading::Lookup::PolicyTypeMismatch)); // Assemble a sequence of links that the federate_query method - // should follow. Use the starting_trader policy, if one's provided, + // should follow. Use the starting_trader policy, if one's provided, // otherwise use the Link interface to determine which of the // registered links should be followed in this query. - + void federated_query (const CosTrading::LinkNameSeq& links, const TAO_Policies& policies, const CosTrading::Admin::OctetSeq& request_id, TAO_Preference_Interpreter& pref_inter, - const char *type, - const char *constr, - const char *pref, - const CosTrading::Lookup::SpecifiedProps& desired_props, - CORBA::ULong how_many, - CosTrading::OfferSeq& offers, - CosTrading::OfferIterator_ptr& offer_itr, - CosTrading::PolicyNameSeq& limits_applied, - CORBA::Environment& env) + const char *type, + const char *constr, + const char *pref, + const CosTrading::Lookup::SpecifiedProps& desired_props, + CORBA::ULong how_many, + CosTrading::OfferSeq& offers, + CosTrading::OfferIterator_ptr& offer_itr, + CosTrading::PolicyNameSeq& limits_applied, + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTrading::IllegalConstraint, + CosTrading::Lookup::IllegalPreference, + CosTrading::Lookup::IllegalPolicyName, + CosTrading::Lookup::PolicyTypeMismatch, + CosTrading::Lookup::InvalidPolicyValue, + CosTrading::IllegalPropertyName, + CosTrading::DuplicatePropertyName, + CosTrading::DuplicatePolicyName)); // Perform and pass on a query over a set of links. Merge the // results of the federated queries into a single set of results - // suitable for returning to the user. + // suitable for returning to the user. void order_merged_sequence (TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers); @@ -267,20 +267,20 @@ private: CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)); - + // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) ACE_UNIMPLEMENTED_FUNC (TAO_Lookup (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) const unsigned int IDS_SAVED; - + TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_; // A reference to the trader for obtaining offer maps. - + typedef ACE_Unbounded_Queue<CosTrading::Admin::OctetSeq*> Request_Ids; - + Request_Ids request_ids_; - // A list of recent request_id_stems + // A list of recent request_id_stems TRADER_LOCK_TYPE lock_; // Lock to secure the set of request ids. @@ -305,20 +305,20 @@ public: virtual ~TAO_Register (void); - virtual CosTrading::OfferId export (CORBA::Object_ptr reference, - const char *type, - const CosTrading::PropertySeq& properties, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)); + virtual CosTrading::OfferId export (CORBA::Object_ptr reference, + const char *type, + const CosTrading::PropertySeq& properties, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::Register::InvalidObjectRef, + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTrading::Register::InterfaceTypeMismatch, + CosTrading::IllegalPropertyName, + CosTrading::PropertyTypeMismatch, + CosTrading::ReadonlyDynamicProperty, + CosTrading::MissingMandatoryProperty, + CosTrading::DuplicatePropertyName)); // BEGIN SPEC // The export operation is the means by which a service is @@ -363,7 +363,7 @@ public: // If the type of any of the property values is not the // same as the declared type (declared in the service type), then a - // PropertyTypeMismatch exception is raised. + // PropertyTypeMismatch exception is raised. // ° If an attempt is made to assign a dynamic property value to a // readonly property, then the ReadonlyDynamicProperty exception is @@ -373,12 +373,12 @@ public: // properties with the same property name are included in this // parameter, the DuplicatePropertyName exception is raised. // END SPEC - + virtual void withdraw (const char *id, CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)); + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::IllegalOfferId, + CosTrading::UnknownOfferId, + CosTrading::Register::ProxyOfferId)); // BEGIN SPEC // The withdraw operation removes the service offer from the trader @@ -390,17 +390,17 @@ public: // "id" is legal but there is no offer within the trader with that // "id," then an UnknownOfferId exception is raised. ° If the "id" // identifies a proxy offer rather than an ordinary offer, then a - // ProxyOfferId exception is raised. + // ProxyOfferId exception is raised. // END SPEC - + virtual CosTrading::Register::OfferInfo* describe (const char * id, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)); - + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::IllegalOfferId, + CosTrading::UnknownOfferId, + CosTrading::Register::ProxyOfferId)); + // BEGIN SPEC // The describe operation returns the information about an offered // service that is held by the trader. It comprises the "reference" @@ -412,25 +412,25 @@ public: // raised. ° If the "id" is legal but there is no offer within the // trader with that "id," then an UnknownOfferId exception is // raised. ° If the "id" identifies a proxy offer rather than an - // ordinary offer, then a ProxyOfferId exception is raised. + // ordinary offer, then a ProxyOfferId exception is raised. // END SPEC - - virtual void modify (const char * id, - const CosTrading::PropertyNameSeq& del_list, - const CosTrading::PropertySeq& modify_list, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId, - CosTrading::IllegalPropertyName, - CosTrading::Register::UnknownPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::MandatoryProperty, - CosTrading::Register::ReadonlyProperty, - CosTrading::DuplicatePropertyName)); + + virtual void modify (const char * id, + const CosTrading::PropertyNameSeq& del_list, + const CosTrading::PropertySeq& modify_list, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::NotImplemented, + CosTrading::IllegalOfferId, + CosTrading::UnknownOfferId, + CosTrading::Register::ProxyOfferId, + CosTrading::IllegalPropertyName, + CosTrading::Register::UnknownPropertyName, + CosTrading::PropertyTypeMismatch, + CosTrading::ReadonlyDynamicProperty, + CosTrading::Register::MandatoryProperty, + CosTrading::Register::ReadonlyProperty, + CosTrading::DuplicatePropertyName)); // BEGIN SPEC // The modify operation is used to change the description of a @@ -482,18 +482,18 @@ public: // DuplicatePropertyName exception is raised. // The NotImplemented exception shall be raised if and only if the - // supports_modifiable_properties attribute yields FALSE. + // supports_modifiable_properties attribute yields FALSE. // END SPEC - - virtual void withdraw_using_constraint (const char *type, - const char *constr, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Register::NoMatchingOffers)); - + + virtual void withdraw_using_constraint (const char *type, + const char *constr, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTrading::IllegalConstraint, + CosTrading::Register::NoMatchingOffers)); + // BEGIN SPEC // The withdraw_using_constraint operation withdraws a set of offers // from within a single trader. This set is identified in the same @@ -507,24 +507,24 @@ public: // service types, then an IllegalServiceType exception is raised. ° // If the "type" is correct syntactically but is not recognized as a // service type by the trader, then an UnknownServiceType exception - // is raised. + // is raised. // The constraint "constr" is the means by which the client // restricts the set of offers to those that are intended for // withdrawal. ° If "constr" does not obey the syntax rules for a // constraint then an IllegalConstraint exception is raised. ° If // the constraint fails to match with any offer of the specified - // service type, then a NoMatchingOffers exception is raised. + // service type, then a NoMatchingOffers exception is raised. // END SPEC - + virtual CosTrading::Register_ptr resolve (const CosTrading::TraderName &name, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::IllegalTraderName, - CosTrading::Register::UnknownTraderName, - CosTrading::Register::RegisterNotSupported)); - + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::Register::IllegalTraderName, + CosTrading::Register::UnknownTraderName, + CosTrading::Register::RegisterNotSupported)); + // BEGIN SPEC // This operation is used to resolve a context relative name for // another trader. In particular, it is used when exporting to a @@ -549,21 +549,21 @@ public: // END SPEC protected: - + void validate_properties (const char* type, - const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, - const CosTrading::PropertySeq& properties, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)); + const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, + const CosTrading::PropertySeq& properties, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + CosTrading::PropertyTypeMismatch, + CosTrading::ReadonlyDynamicProperty, + CosTrading::MissingMandatoryProperty, + CosTrading::DuplicatePropertyName)); // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) ACE_UNIMPLEMENTED_FUNC (TAO_Register (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - + private: TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_; @@ -574,7 +574,7 @@ public: // ************************************************************* template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -class TAO_Admin : +class TAO_Admin : public TAO_Trader_Components <POA_CosTrading::Admin>, public TAO_Support_Attributes <POA_CosTrading::Admin>, public TAO_Import_Attributes <POA_CosTrading::Admin>, @@ -582,9 +582,9 @@ class TAO_Admin : // // = TITLE // This class implements CosTrading::Admin IDL interface. -// +// // = DESCRIPTION (FROM SPEC) -// +// // The admin interface enables the values of the trader attributes to // be read and written. All attributes are defined as readonly in // either SupportAttributes, ImportAttributes, LinkAttributes, or @@ -598,7 +598,7 @@ class TAO_Admin : // operations in the proxy interface. However, in this case, it does // have the effect of making any proxy offers exported via the proxy // interface for that trader unavailable to satisfy queries on that -// trader's lookup interface. +// trader's lookup interface. { public: @@ -609,95 +609,95 @@ public: // = Importing Parameters (used by the Lookup Interface) virtual CORBA::ULong set_def_search_card (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_search_card (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); // search card is the cardinality of the offers searched for - // constraint compliance. + // constraint compliance. virtual CORBA::ULong set_def_match_card (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_match_card (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); // match card is the cardinality of offers found compliant with the - // constraints. + // constraints. virtual CORBA::ULong set_def_return_card (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_return_card (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); // return card is the cardinality of the offers returned from // Lookup. virtual CORBA::ULong set_max_list (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_modifiable_properties (CORBA::Boolean value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_dynamic_properties (CORBA::Boolean value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_proxy_offers (CORBA::Boolean value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); // Types of offers available for consideration. Ween out those // offers with modifiable properties - + // = Link Interface parameters virtual CORBA::ULong set_def_hop_count (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_hop_count (CORBA::ULong value, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_def_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_max_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_max_link_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment &env) + CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); // = Set Type Repository - + virtual CosTrading::TypeRepository_ptr set_type_repos (CosTrading::TypeRepository_ptr repository, - CORBA::Environment& env) + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::Admin::OctetSeq* request_id_stem (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); - + virtual CosTrading::Admin::OctetSeq* set_request_id_stem (const CosTrading::Admin::OctetSeq& stem, - CORBA::Environment& env) + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual void list_offers (CORBA::ULong how_many, - CosTrading::OfferIdSeq_out ids, - CosTrading::OfferIdIterator_out id_itr, - CORBA::Environment& env) + CosTrading::OfferIdSeq_out ids, + CosTrading::OfferIdIterator_out id_itr, + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)); + CosTrading::NotImplemented)); // BEGIN SPEC @@ -715,27 +715,27 @@ public: // identifiers are to be returned via the "ids" result; any // remaining are available via the iterator interface. If the // "how_many" exceeds the number of offers held in the trader, then - // the "id_itr" is nil. + // the "id_itr" is nil. // END SPEC virtual void list_proxies (CORBA::ULong how_many, - CosTrading::OfferIdSeq_out ids, - CosTrading::OfferIdIterator_out id_itr, - CORBA::Environment& env) + CosTrading::OfferIdSeq_out ids, + CosTrading::OfferIdIterator_out id_itr, + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)); + CosTrading::NotImplemented)); private: // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) ACE_UNIMPLEMENTED_FUNC (TAO_Admin (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - + TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_; - + CosTrading::Admin::OctetSeq stem_id_; // Unique prefix to create a sequence number space. - + CORBA::ULong sequence_number_; // Current sequence number. @@ -747,7 +747,7 @@ private: // ************************************************************* template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -class TAO_Link : +class TAO_Link : public TAO_Trader_Components <POA_CosTrading::Link>, public TAO_Support_Attributes <POA_CosTrading::Link>, public TAO_Link_Attributes <POA_CosTrading::Link> @@ -757,22 +757,22 @@ public: TAO_Link (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); ~TAO_Link (void); - - virtual void add_link (const char *name, - CosTrading::Lookup_ptr target, - CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule, - CORBA::Environment& _env) + + virtual void add_link (const char *name, + CosTrading::Lookup_ptr target, + CosTrading::FollowOption def_pass_on_follow_rule, + CosTrading::FollowOption limiting_follow_rule, + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::DuplicateLinkName, - CosTrading::InvalidLookupRef, - CosTrading::Link::DefaultFollowTooPermissive, - CosTrading::Link::LimitingFollowTooPermissive)); + CosTrading::Link::IllegalLinkName, + CosTrading::Link::DuplicateLinkName, + CosTrading::InvalidLookupRef, + CosTrading::Link::DefaultFollowTooPermissive, + CosTrading::Link::LimitingFollowTooPermissive)); // BEGIN SPEC // The add_link operation allows a trader subsequently to use the // service of another trader in the performance of its own trading - // service operations. + // service operations. // The "name" parameter is used in subsequent link management // operations to identify the intended link. If the parameter is not @@ -807,14 +807,14 @@ public: // trader's "max_link_follow_policy" later in the life of a link, as // it is possible that the trader could set its // "max_link_follow_policy" to a more restrictive value after the - // creation of the link. + // creation of the link. // END SPEC - + virtual void remove_link (const char *name, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)); + CosTrading::Link::IllegalLinkName, + CosTrading::Link::UnknownLinkName)); // BEGIN SPEC // The remove_link operation removes all knowledge of the target @@ -824,14 +824,14 @@ public: // The "name" parameter identifies the link to be removed. The // exception IllegalLinkName is raised if the link is formed poorly // and the UnknownLinkName exception is raised if the named link is - // not in the trader. + // not in the trader. // END SPEC - + virtual CosTrading::Link::LinkInfo* describe_link (const char *name, - CORBA::Environment&) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)); + CORBA::Environment&) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::Link::IllegalLinkName, + CosTrading::Link::UnknownLinkName)); // BEGIN SPEC // The describe_link operation returns information on a link held in @@ -853,9 +853,9 @@ public: // Operation" on page 16-45, most implementations will opt for // determining the Register interface when add_link is called and // storing that information statically with the rest of the link - // state. + // state. // END SPEC - + virtual CosTrading::LinkNameSeq* list_links (CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException)); @@ -863,17 +863,17 @@ public: // The list_links operation returns a list of the names of all // trading links within the trader. The names can be used // subsequently for other management operations, such as - // describe_link or remove_link. + // describe_link or remove_link. // END SPEC - - virtual void modify_link (const char *name, - CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName, - CosTrading::Link::DefaultFollowTooPermissive, - CosTrading::Link::LimitingFollowTooPermissive)); + + virtual void modify_link (const char *name, + CosTrading::FollowOption def_pass_on_follow_rule, + CosTrading::FollowOption limiting_follow_rule, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName, + CosTrading::Link::UnknownLinkName, + CosTrading::Link::DefaultFollowTooPermissive, + CosTrading::Link::LimitingFollowTooPermissive)); // BEGIN SPEC // The modify_link operation is used to change the existing link @@ -895,15 +895,15 @@ public: // The "limiting_follow_rule" parameter specifies the new limit for // the follow behavior of this link. The exception // LimitingFollowTooPermissive is raised if the value exceeds the - // current "max_link_follow_policy" of the trader. + // current "max_link_follow_policy" of the trader. // END SPEC - + private: // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) ACE_UNIMPLEMENTED_FUNC (TAO_Link (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - + typedef ACE_Hash_Map_Manager < TAO_String_Hash_Key, @@ -911,11 +911,11 @@ private: MAP_LOCK_TYPE > Links; - + Links links_; // The collection of link connecting this trader to others in the - // federation. - + // federation. + TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_; }; @@ -924,7 +924,7 @@ private: // ************************************************************* template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -class TAO_Proxy : +class TAO_Proxy : public TAO_Trader_Components <POA_CosTrading::Proxy>, public TAO_Support_Attributes <POA_CosTrading::Proxy> { @@ -935,56 +935,56 @@ public: ~TAO_Proxy (void); virtual CosTrading::OfferId - export_proxy (CosTrading::Lookup_ptr target, - const char *type, - const CosTrading::PropertySeq& properties, - CORBA::Boolean if_match_all, - const char * recipe, - const CosTrading::PolicySeq& policies_to_pass_on, - CORBA::Environment& _env) + export_proxy (CosTrading::Lookup_ptr target, + const char *type, + const CosTrading::PropertySeq& properties, + CORBA::Boolean if_match_all, + const char * recipe, + const CosTrading::PolicySeq& policies_to_pass_on, + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::InvalidLookupRef, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::Proxy::IllegalRecipe, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTrading::InvalidLookupRef, + CosTrading::IllegalPropertyName, + CosTrading::PropertyTypeMismatch, + CosTrading::ReadonlyDynamicProperty, + CosTrading::MissingMandatoryProperty, + CosTrading::Proxy::IllegalRecipe, + CosTrading::DuplicatePropertyName, + CosTrading::DuplicatePolicyName)); virtual void withdraw_proxy (const char *id, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Proxy::NotProxyOfferId)); + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::IllegalOfferId, + CosTrading::UnknownOfferId, + CosTrading::Proxy::NotProxyOfferId)); virtual CosTrading::Proxy::ProxyInfo * describe_proxy (const char *id, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Proxy::NotProxyOfferId)); + CosTrading::IllegalOfferId, + CosTrading::UnknownOfferId, + CosTrading::Proxy::NotProxyOfferId)); - // = CosTrading::TraderComponents methods. + // = CosTrading::TraderComponents methods. virtual void list_proxies (CORBA::ULong how_many, - CosTrading::OfferIdSeq*& ids, - CosTrading::OfferIdIterator_ptr& id_itr, - CORBA::Environment& env) + CosTrading::OfferIdSeq*& ids, + CosTrading::OfferIdIterator_ptr& id_itr, + CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)); - + CosTrading::NotImplemented)); + private: // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) ACE_UNIMPLEMENTED_FUNC (TAO_Proxy (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - + TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_; }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index 0e873606bb9..3d640c2ef4d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -2,10 +2,10 @@ // ======================================================================== // $Id$ -// +// // = LIBRARY // orbsvcs -// +// // = FILENAME // Trader.h // @@ -13,7 +13,7 @@ // Marina Spivak <marina@cs.wustl.edu> // Seth Widoff <sbw1@cs.wustl.edu> // Irfan Pyarali <irfan@cs.wustl.edu> -// +// // ======================================================================== #ifndef TAO_TRADER_H @@ -35,8 +35,8 @@ class TAO_Trader : public TAO_Trader_Base // // = DESCRIPTION // TAO_Trader contains all the components that together represent - // a single trader. Based on its constructor arguments, - // TAO_Trader creates instances of appropriate interface + // a single trader. Based on its constructor arguments, + // TAO_Trader creates instances of appropriate interface // implementations as well as instances of objects common to // more than one interface (offers, attributes, etc.). // TAO_Trader also enforces the proper order on all @@ -44,46 +44,46 @@ class TAO_Trader : public TAO_Trader_Base // creates appropriate components, holds everything together, // and enforces order. TAO_Trader is parameterized by two types // of locks: one for its service service offers, one for its - // state (configuration). -{ + // state (configuration). +{ public: - // The desired combination of interfaces to be passed to the + // The desired combination of interfaces to be passed to the // TAO_Trader constructor. typedef TAO_Offer_Database<MAP_LOCK_TYPE> Offer_Database; // Offer Database Trait. TAO_Trader (Trader_Components components = LOOKUP); - // Constructor which based on its arguments will create + // Constructor which based on its arguments will create // a particular type of trader (e.g. Query trader, Simple trader, etc.) // The argument is a bitwise OR of desired Trader_Components as listed // in enumerated type above. virtual ~TAO_Trader (void); // destructor. - + Offer_Database& offer_database (void); // Accessor for the structure with all the service offers. ACE_Lock &lock (void); // returns the trader - -protected: - + +protected: + typedef TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> TRADER_SELF; - - Offer_Database offer_database_; + + Offer_Database offer_database_; ACE_Lock_Adapter<TRADER_LOCK_TYPE> lock_; // lock that guards the state of the trader (its configuration). enum { LOOKUP_IF, REGISTER_IF, ADMIN_IF, PROXY_IF, LINK_IF }; - + PortableServer::ServantBase* ifs_[5]; - + private: - + // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> &)) }; @@ -98,35 +98,35 @@ class TAO_Trader_Components : public virtual IF public: TAO_Trader_Components (const TAO_Trading_Components_i& comps); - - // = CosTrading::TraderComponents methods. + + // = CosTrading::TraderComponents methods. virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); // Returns an object reference to the Lookup interface of the trader. // Returns nil if the trader does not support Lookup interface. - + virtual CosTrading::Register_ptr register_if (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Register interface of the trader. // Returns nil if the trader does not support Register interface. - + virtual CosTrading::Link_ptr link_if (CORBA::Environment& env) - TAO_THROW_SPEC ((CORBA::SystemException)); + TAO_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Link interface of the trader. // Returns nil if the trader does not support Link interface. virtual CosTrading::Proxy_ptr proxy_if (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); // Returns object reference to the Proxy interface of the trader. - // Returns nil if the trader does not support Proxy interface. - + // Returns nil if the trader does not support Proxy interface. + virtual CosTrading::Admin_ptr admin_if (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Admin interface of the trader. // Returns nil if the trader does not support Admin interface. private: - + const TAO_Trading_Components_i& comps_; }; @@ -138,19 +138,19 @@ public: TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs); // = CosTrading::SupportAttributes methods. - + virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); - + virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); - + private: const TAO_Support_Attributes_i& attrs_; @@ -164,7 +164,7 @@ public: TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs); // = CosTrading::ImportAttributes methods. - + virtual CORBA::ULong def_search_card (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); @@ -172,8 +172,8 @@ public: TAO_THROW_SPEC ((CORBA::SystemException)); // Search cardinality determines the maximum number of offers searched - // before not considering other offers. - + // before not considering other offers. + virtual CORBA::ULong def_match_card (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); @@ -182,17 +182,17 @@ public: // Match cardinality determines the maximum number of offers // matched to the constraints before not considering other offers.. - + virtual CORBA::ULong def_return_card (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong max_return_card (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); - // Return cardinality determines the maximum number of offers marked + // Return cardinality determines the maximum number of offers marked // to return before not considering other offers. - + virtual CORBA::ULong max_list (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); @@ -208,7 +208,7 @@ public: virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment& env) TAO_THROW_SPEC ((CORBA::SystemException)); - + private: const TAO_Import_Attributes_i& attrs_; @@ -224,7 +224,7 @@ public: // = CosTrading::LinkAttributes methods virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &env) TAO_THROW_SPEC ((CORBA::SystemException)); - + private: const TAO_Link_Attributes_i& attrs_; @@ -238,20 +238,20 @@ template <class SEQ_TYPE> class TAO_Sequence_Extracter : private TAO_Sequence_Extracter_Base // = TITLE // Happy hack to extract sequence data out of user defined sequence -// that may have x number of typedef aliases. +// that may have x number of typedef aliases. { public: TAO_Sequence_Extracter (CORBA::TypeCode* type_code) : typecode_ (CORBA::TypeCode::_duplicate (type_code)) {} - + CORBA::Boolean extract (const CORBA::Any&, SEQ_TYPE*&); // Extract the underlying sequence value into a newly allocated // sequence of type SEQ_TYPE. The any assumes ownership of the // sequence, so don't release it. - + private: - + CORBA::TypeCode_var typecode_; }; @@ -264,4 +264,4 @@ CORBA::Boolean TAO_find (const SEQ& sequence, const OPERAND_TYPE operand); #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_TRADER_H */ - + diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index 0d5abf78d88..5df0ea1dca6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -5,7 +5,7 @@ // // = LIBRARY // orbsvcs -// +// // = FILENAME // Trader_Utils.h // @@ -25,7 +25,7 @@ // TAO_Property_Filter // TAO_Property_Evaluator // TAO_Property_Evaluator_By_Name -// +// // ======================================================================== #ifndef TAO_TRADER_UTILS_H @@ -46,25 +46,25 @@ class TAO_ORBSVCS_Export TAO_Property_Evaluator // for a static property, TAO_Property_Evaluator provides methods // that will unify the two approaches under a single // interface. Since dynamic properties aren't necessarily supported -// by a trader, this class accounts for that contingency. The use of +// by a trader, this class accounts for that contingency. The use of // indexed lookups allows them to occur in constant time on the // CORBA sequences, but requires that the client know the layout of -// properties ahead of time. +// properties ahead of time. { public: - + TAO_Property_Evaluator(const CosTrading::PropertySeq& properties, - CORBA::Boolean supports_dp = 1); - + CORBA::Boolean supports_dp = 1); + TAO_Property_Evaluator(CosTrading::Offer& offer, - CORBA::Boolean supports_dp = 1); + CORBA::Boolean supports_dp = 1); // Construct an instance of TAO_Property_Evaluator that operates on // an <offer> where the support for dynamic properties is dictated // by <supports_dynamic_properties>. virtual ~TAO_Property_Evaluator (void); // Clean up dynamic properties. - + int is_dynamic_property(int index); // Returns 1 if the property at index <index> is dynamic. Returns a // 0 when the index is out of bounds. @@ -73,28 +73,28 @@ public: TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // Returns value of the property whose index is <index>. If the - // property at that index is dynamic and the trader supports dynamic + // property at that index is dynamic and the trader supports dynamic // properties, then the property_value method will obtain the value // of the dynamic property using the evalDP method on the // CosTradingDynamic::DynamicPropEval interface, passing on a // CosTradingDynamic::DPEvalFailure exception on failure. If the // property index is undefined, the method returns a null pointer. - + CORBA::TypeCode_ptr property_type (int index); // Returns the type of the property whose index is <index>. If the // property is dynamic and the trader supports dynamic properties, // then the method returns the <returned_type> field of the // CosTradingDynamic::DynamicProp struct associated with the - // property name. If the index is out of bounds, the method returns + // property name. If the index is out of bounds, the method returns // a null pointer (that is, 0). - - protected: - + + protected: + typedef CosTradingDynamic::DynamicProp DP_Struct; typedef CosTradingDynamic::DynamicPropEval DP_Eval; - + const CosTrading::PropertySeq& props_; - // The offer from which the TAO_Property_Evaluator extracts property + // The offer from which the TAO_Property_Evaluator extracts property // information. int supports_dp_; @@ -105,7 +105,7 @@ public: // retrieved from dynamic properties and free them upon deletion. If // we didn't do this, then the property_value method would leak or // cause seg faults, since the client wouldn't be able to tell - // whether or not the return value should be freed. + // whether or not the return value should be freed. private: @@ -117,7 +117,7 @@ public: // TAO_Property_Evaluator_By_Name // ************************************************************* -class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name : +class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator // // = TITLE @@ -133,13 +133,13 @@ class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name : public: TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties, - CORBA::Environment& _env, - CORBA::Boolean supports_dp = 1) + CORBA::Environment& _env, + CORBA::Boolean supports_dp = 1) TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName, - CosTrading::IllegalPropertyName)); - + CosTrading::IllegalPropertyName)); + TAO_Property_Evaluator_By_Name(CosTrading::Offer& offer, - CORBA::Boolean supports_dp = 1); + CORBA::Boolean supports_dp = 1); // Construct an instance of TAO_Property_Evaluator that operates on // an <offer> where the support for dynamic properties is dictated // by <supports_dynamic_properties>. @@ -150,28 +150,28 @@ public: // will throw a Property_Undefined exception with impunity. CORBA::Any* property_value(const char* property_name, - CORBA::Environment& _env) + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // This method is identical to its counterpart in - // TAO_Property_Evaluator, except property_value first discovers the + // TAO_Property_Evaluator, except property_value first discovers the // index through a string matching lookup. - + CORBA::TypeCode_ptr property_type(const char* property_name); // This method is identical to its counterpart in // TAO_Property_Evaluator, exception property_type first discovers // the index through a string matching lookup. const CosTrading::Property* get_property (const char* property_name); - + private: TAO_Property_Evaluator_By_Name (const TAO_Property_Evaluator_By_Name&); TAO_Property_Evaluator_By_Name& operator= (const TAO_Property_Evaluator_By_Name&); - + TAO_Lookup_Table table_; // The instance of the above mapping for the offer provided in the - // constructor. + // constructor. }; // ************************************************************* @@ -187,23 +187,23 @@ class TAO_ORBSVCS_Export TAO_Dynamic_Property : public: TAO_Dynamic_Property (void) {} - + TAO_Dynamic_Property (const TAO_Dynamic_Property& dp) {} - + virtual ~TAO_Dynamic_Property (void); - + virtual CORBA::Any* evalDP(const char* name, - CORBA::TypeCode_ptr returned_type, - const CORBA::Any& extra_info, - CORBA::Environment& _env) + CORBA::TypeCode_ptr returned_type, + const CORBA::Any& extra_info, + CORBA::Environment& _env) TAO_THROW_SPEC ((CORBA::SystemException, - CosTradingDynamic::DPEvalFailure)) = 0; + CosTradingDynamic::DPEvalFailure)) = 0; // Dynamic property evaluation call-back method. - + CosTradingDynamic::DynamicProp* - construct_dynamic_prop (const char* name, - CORBA::TypeCode_ptr returned_type, - const CORBA::Any& extra_info); + construct_dynamic_prop (const char* name, + CORBA::TypeCode_ptr returned_type, + const CORBA::Any& extra_info); // Method to construct a dynamic property structure suitable for // exporting in a CosTrading::PropertyStruct to the Trading Service. }; @@ -218,11 +218,11 @@ class TAO_Policies // = TITLE // This class ensures that policies submitted to Lookup make sense, // have the correct value types, and don't exceed the maximums set -// through the Admin Interface. +// through the Admin Interface. // // = DESCRIPTION // TAO_Policies does an admirable job of reconciling differences -// between the default parameter settings of the Trader and the import +// between the default parameter settings of the Trader and the import // and other policies set by the client. Unbeknownst to its client // TAO_Policies hides this arbitration, and records whether the user // policy was chosen, or the default. This information gets returned @@ -249,15 +249,15 @@ public: // This enum represents the relative order that properties are // passed from one trader to another. Hence, as recommended by the // spec, the starting_trader policies will be the first element in - // the polcy sequence if it's set for a query. - + // the polcy sequence if it's set for a query. + static const char * POLICY_NAMES[]; - + TAO_Policies (TAO_Trader_Base& trader, - const CosTrading::PolicySeq& policies, - CORBA::Environment& _env) + const CosTrading::PolicySeq& policies, + CORBA::Environment& _env) TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, - CosTrading::DuplicatePolicyName)); + CosTrading::DuplicatePolicyName)); // BEGIN SPEC // The "policies" parameter allows the importer to specify how the @@ -278,11 +278,11 @@ public: // starting_trader policy value is malformed), then an // InvalidPolicyValue exception is raised. ° If the same policy name // is included two or more times in this parameter, then the - // DuplicatePolicyName exception is raised. + // DuplicatePolicyName exception is raised. // END SPEC ~TAO_Policies (void); - + CORBA::ULong search_card (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -294,7 +294,7 @@ public: // trader. If this policy is not specified, then the value of the // trader's def_search_card attribute is used. // END SPEC - + CORBA::ULong match_card (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -306,7 +306,7 @@ public: // not specified, then the value of the trader's def_match_card // attribute is used. // END SPEC - + CORBA::ULong return_card (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -316,11 +316,11 @@ public: // query. The lesser of this value and the trader's max_return_card // attribute is used by the trader. If this policy is not specified, // then the value of the trader's def_return_card attribute is - // used. + // used. // END SPEC - + // = Offer consideration policies - + CORBA::Boolean use_modifiable_properties (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -333,7 +333,7 @@ public: // will not. If this policy is not specified, such offers will be // included. // END SPEC - + CORBA::Boolean use_dynamic_properties (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -346,7 +346,7 @@ public: // will not. If this policy is not specified, such offers will be // included. // END SPEC - + CORBA::Boolean use_proxy_offers (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -358,7 +358,7 @@ public: // will be included; if FALSE, they will not. If this policy is not // specified, such offers will be included. // END SPEC - + CORBA::Boolean exact_type_match (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -368,12 +368,12 @@ public: // type; if not (and by default), then any offer of a type // conformant to the importer's service type is considered. // END SPEC - + // = Federated trader policies (not implemented yet) - + CosTrading::TraderName* starting_trader (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue)); + CosTrading::Lookup::InvalidPolicyValue)); // BEGIN SPEC // The "starting_trader" policy facilitates the distribution of the // trading service itself. It allows an importer to scope a search @@ -397,25 +397,25 @@ public: // BEGIN SPEC //The "link_follow_rule" policy indicates how the client wishes //links to be followed in the resolution of its query. See the - //discussion in "Link Follow Behavior" on page 16-16 for details. + //discussion in "Link Follow Behavior" on page 16-16 for details. // END SPEC - + CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info, - CORBA::Environment& _env) const + CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, + CosTrading::Lookup::InvalidPolicyValue, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)); // Determine the link follow policy for a given <link_name>. - // This method returns the link_follow_rule for a link whose name is + // This method returns the link_follow_rule for a link whose name is // <link_name> using the following formula: // if the importer specified a link_follow_rule policy // min(trader.max_follow_policy, link.limiting_follow_rule, // query.link_follow_rule) // else min(trader.max_follow_policy, link.limiting_follow_rule, - // trader.def_follow_policy) - + // trader.def_follow_policy) + CORBA::ULong hop_count (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); @@ -428,18 +428,18 @@ public: // the trader's def_hop_count attribute if it is not. If the // resulting value is zero, then no federated queries are // permitted. If it is greater than zero, then it must be - // decremented before passing on to a federated trader. + // decremented before passing on to a federated trader. // END SPEC CosTrading::Admin::OctetSeq* request_id (CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Return the request_id passed to the query method across a link to - // another trader. + // another trader. void copy_to_pass (CosTrading::PolicySeq& policy_seq, const CosTrading::Admin::OctetSeq& request_id) const; // Policies to forward to the next trader in a federated query. - + void copy_to_forward (CosTrading::PolicySeq& policy_seq, const CosTrading::TraderName& name) const; // Policies to forward to the next trader in a directed query. @@ -450,29 +450,29 @@ public: TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)); // Determine the link follow policy to pass down the link with <link_name>. - // This method returns the link_follow_rule for a link whose name is + // This method returns the link_follow_rule for a link whose name is // <link_name> using the following formula: // If the importer specified a link_follow_rule, policy // pass on min(query.link_follow_rule, link.limiting_follow_rule, // trader.max_follow_policy) // else pass on min(link.def_pass_on_follow_rule, // trader.max_follow_policy) - -private: - + +private: + CORBA::ULong ulong_prop (POLICY_TYPE pol, - CORBA::Environment& _env) const + CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconclile a ULong property with its default. - + CORBA::Boolean boolean_prop (POLICY_TYPE pol, - CORBA::Environment& _env) const + CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconcile a Boolean property with its debault. TAO_Policies (const TAO_Policies&); TAO_Policies& operator= (const TAO_Policies&); - + CosTrading::Policy* policies_[TAO_NUM_POLICIES]; // The policies indexable from the enumerated type. @@ -488,7 +488,7 @@ class TAO_ORBSVCS_Export TAO_Policy_Manager // = TITLE // // This class is a utility for clients using the CosTrading::Lookup -// interface that helps them build a policy sequence without violating +// interface that helps them build a policy sequence without violating // syntax rules and having to mess with typecodes. { public: @@ -496,25 +496,25 @@ public: TAO_Policy_Manager (int num_policies = 0); // = Routines to set policies. - + void search_card (CORBA::ULong scard); // Set the maximum number of offers searched for the query. - + void match_card (CORBA::ULong mcard); // Set the maximum number of offers searched for the query. - + void return_card (CORBA::ULong rcard); - // Set the maximum number of offers rerturned for the query. + // Set the maximum number of offers rerturned for the query. // A note about cardinalities: The spec implies that these // cardinalities apply to the global office space, that is, all // offers on all linked traders. However, there's no mechanism for // one trader to return to the calling trader the number of offers // searched or matched. Thus, these cardinalities are applied on a - // per-trader basis. - + // per-trader basis. + void use_modifiable_properties (CORBA::Boolean mod_props); - // Consider offers with modifiable properties. + // Consider offers with modifiable properties. void use_dynamic_properties (CORBA::Boolean dyn_props); // Consider offers with dynamic properties. @@ -525,7 +525,7 @@ public: void starting_trader (const CosTrading::TraderName& name); // Copy void starting_trader (CosTrading::TraderName* name); // Own // Designate a trader at which to begin the query. - + void link_follow_rule (CosTrading::FollowOption follow_option); // Specify under what conditions a federated query is appropriate. @@ -534,7 +534,7 @@ public: void request_id (const CosTrading::Admin::OctetSeq& request_id); // Set the identifier for this query (clients shouldn't use this). - + void exact_type_match (CORBA::Boolean exact_type); // Search only the designated type --- not it's subtypes. @@ -544,19 +544,19 @@ public: const CosTrading::PolicySeq& policy_seq (void) const; // Return a PolicySeq suitable for passing to the query method of // the Lookup interface. - + private: TAO_Policy_Manager (const TAO_Policy_Manager&); TAO_Policy_Manager& operator= (const TAO_Policy_Manager&); - + CosTrading::Policy& fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type); // Method to prepare the next slot in the policies_ sequence for // policy insertion. - + int poltable_[TAO_Policies::REQUEST_ID + 1]; // Table mapping policy enum value to the index in the policies sequence. - + CosTrading::PolicySeq policies_; // The sequence being prepared for submittal to the query method. @@ -572,34 +572,34 @@ private: class TAO_Offer_Modifier // = TITLE // This class deletes, modifies, and adds properties to a given -// offer according to the rules of the modify method on the Register +// offer according to the rules of the modify method on the Register // interface. { public: TAO_Offer_Modifier (const char* type, - const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct, - CosTrading::Offer* offer); + const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct, + CosTrading::Offer* offer); // Modify an <offer> of type <type>, whose properties are described // by <type_struct> ~TAO_Offer_Modifier (void); void delete_properties (const CosTrading::PropertyNameSeq& deletes, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, - CosTrading::Register::MandatoryProperty, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + CORBA::Environment& _env) + TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, + CosTrading::Register::MandatoryProperty, + CosTrading::IllegalPropertyName, + CosTrading::DuplicatePropertyName)); // Delete the properties whose names were given to the // constructor. Ensure we don't delete mandatory properties. void merge_properties (CosTrading::PropertySeq& modifies, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName, CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, + CosTrading::ReadonlyDynamicProperty, CosTrading::Register::ReadonlyProperty)); // Copy to the destination the union of the source and destination // properties. In the case of duplicate properties, update the @@ -612,7 +612,7 @@ public: private: TAO_Offer_Modifier (const TAO_Offer_Modifier&); - TAO_Offer_Modifier& operator= (const TAO_Offer_Modifier&); + TAO_Offer_Modifier& operator= (const TAO_Offer_Modifier&); typedef ACE_Hash_Map_Manager < @@ -623,21 +623,21 @@ private: Property_Table; const char* type_; - // The type of the offer. - + // The type of the offer. + Property_Table props_; // The map of properties in the offer. TAO_Typecode_Table prop_types_; // Table of property types. - + TAO_String_Set readonly_, mandatory_; // The set of readonly and mandatory property names in the offer's // type. CosTrading::PropertySeq merge_props_; // Sequence of properties to merge with the original. - + CosTrading::Offer* offer_; // A reference to the offer undergoing change. }; @@ -651,7 +651,7 @@ class TAO_Offer_Filter // The purpose of this class is to ensure that offers that // shouldn't be considered by the TAO_Constraint_Interpreter // aren't. -// +// // = DESCRIPTION // There two classes of reasons why an offer for a correct // type shouldn't be considered: 1) The default parameters of the @@ -660,39 +660,39 @@ class TAO_Offer_Filter // readonly) or dynamic properties. 2) We've exceeded the // default or provided cardinality constraints. TAO_Offer_Filter // ensures that violation of policies doesn't occur. It's the -// enforcer. +// enforcer. { public: - + TAO_Offer_Filter (TAO_Policies& policies, - CORBA::Environment& _env); + CORBA::Environment& _env); // Glean from the TypeStruct and Policy setting the appropriate way // to screen unsuitable offers from consideration. void configure_type (CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct); // Set the offer filter to screen for offers containing properties // that aren't marked as readonly in this TypeStruct. - + CORBA::Boolean ok_to_consider (CosTrading::Offer* offer); // Determine whether the poicies contained in the given policy - // object allow the Lookup interface to consider the offer. That is, + // object allow the Lookup interface to consider the offer. That is, // if use_modifiable_properties is false, and the offer contains // modifiable properties as designated in the type struct, return - // false. If use_dynamic_properties is false, and the offer contains - // dynamic properties, then return false. If the lookup interface is - // safe in considering this offer, return true and subtract from the + // false. If use_dynamic_properties is false, and the offer contains + // dynamic properties, then return false. If the lookup interface is + // safe in considering this offer, return true and subtract from the // search card value. When the search card value falls to zero, // ok_to_consider always returns false. - + CORBA::Boolean ok_to_consider_more (void); // It's ok to consider more offers when lookup hasn't exceeded the // cardinality values for searching and matching offers. void matched_offer (void); - // Signal that the Lookup method has matched an offer; decrement the + // Signal that the Lookup method has matched an offer; decrement the // match_card. - // = Return the limits applied. + // = Return the limits applied. CosTrading::PolicyNameSeq* limits_applied (void); // BEGIN SPEC // If any cardinality or other limits were applied by one or more @@ -701,27 +701,27 @@ public: // which limited the query. The sequence of names returned in // "limits_applied" from any federated or proxy queries must be // concatenated onto the names of limits applied locally and - // returned. + // returned. // END SPEC CORBA::ULong search_card_remaining (void) const; CORBA::ULong match_card_remaining (void) const; // Accessors to retrieve the adjusted cardinalities. - + private: TAO_Offer_Filter (const TAO_Offer_Filter&); TAO_Offer_Filter& operator= (const TAO_Offer_Filter&); - + TAO_String_Set not_mod_props_; // The set of the name of modifiable properties. TAO_String_Set limits_; // Cardinality and property limitations applied. - + CORBA::ULong search_card_, match_card_, return_card_; // Keep track of the cardinalities. - + CORBA::Boolean dp_; CORBA::Boolean mod_; // Keep track of property limitations: modifiable or dynamic ones @@ -737,7 +737,7 @@ class TAO_Property_Filter // // The Ace_Property_Filter copies those properties specified in a // CosTrading::Lookup::SpecifiedProps from a source -// CosTrading::Offer to a destination CosTrading::Offer. +// CosTrading::Offer to a destination CosTrading::Offer. { public: @@ -745,25 +745,25 @@ public: TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {} // An accomplice to g++'s insane lust for copy constructors. - + TAO_Property_Filter (const SPECIFIED_PROPS& desired_props, - CORBA::Environment& env) + CORBA::Environment& env) TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + CosTrading::DuplicatePropertyName)); // Verify that the specified properties are correct. TAO_Property_Filter (const TAO_Property_Filter& prop_filter); TAO_Property_Filter& operator= (const TAO_Property_Filter& prop_filter); - + void filter_offer (CosTrading::Offer* source, CosTrading::Offer& destination); // Copy the desired properties from the source offer to the // destination offer. - + private: typedef ACE_Unbounded_Queue< CosTrading::Property* > Prop_Queue; - + TAO_String_Set props_; CosTrading::Lookup::HowManyProps policy_; }; diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h index 2ca6a91c499..fd8548f6f43 100644 --- a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h +++ b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h @@ -4,12 +4,16 @@ // This file is generated automatically by // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT // ------------------------------ -#if !defined (TAO_ORBSVCS_EXPORT_H) +#ifndef TAO_ORBSVCS_EXPORT_H #define TAO_ORBSVCS_EXPORT_H #include "ace/OS.h" -#if defined (TAO_ORBSVCS_HAS_DLL) +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#if defined (TAO_ORBSVCS_HAS_DLL) # if (TAO_ORBSVCS_HAS_DLL == 1) # if defined (TAO_ORBSVCS_BUILD_DLL) # define TAO_ORBSVCS_Export ACE_Proper_Export_Flag @@ -18,7 +22,7 @@ # define TAO_ORBSVCS_Export ACE_Proper_Import_Flag # define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) # endif /* TAO_ORBSVCS_BUILD_DLL */ -# else +# else # define TAO_ORBSVCS_Export # define TAO_ORBSVCS_SINGLETON_DECLARATION(T) # endif /* ! TAO_ORBSVCS_HAS_DLL == 1 */ |