diff options
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/docs/Options.html | 5 | ||||
| -rw-r--r-- | TAO/tao/PI/PI_ORBInitializer.h | 1 | ||||
| -rw-r--r-- | TAO/tao/PI_Server/PortableServer_ORBInitializer.h | 1 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/Thread_Pool.cpp | 37 | ||||
| -rw-r--r-- | TAO/tao/RTScheduling/RTScheduler_Initializer.h | 3 | ||||
| -rw-r--r-- | TAO/tao/Thread_Lane_Resources.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/Valuetype_Adapter.h | 9 |
8 files changed, 61 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b4501160ebd..f7d76ba0be2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Mon Apr 28 10:26:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Valuetype_Adapter.h: + * tao/RTScheduling/RTScheduler_Initializer.h: + * tao/PI/PI_ORBInitializer.h: + * tao/PI_Server/PortableServer_ORBInitializer.h: + Layout changes + + * tao/Thread_Lane_Resources.cpp: + No need for intermediate variable + + * tao/RTCORBA/Thread_Pool.cpp: + * docs/Options.html: + Extended the -ORBLaneListenEndpoints commandline option with + support for *, *:* means all pools and all lanes, *:1 means + lane 1 of all pools, 1:* means all lanes for pool 1. This makes + it easier to specify an endpoint in a dynamic system. This + fixes bugzilla 3308 + Mon Apr 28 07:45:00 UTC 2008 Simon Massey <sma at pristmech dot com> * tests/Bug_3299_Regression/Hello.cpp: diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index 8e062823556..d5a24e48890 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -659,7 +659,10 @@ is <code>0</code>. This option is disabled (<code>0</code>) by default.</td> thread pool created by the process and <code>3</code> specifies the third lane of that thread pool. Note that <code>0</code> should be used for the lane when specifying - endpoints for thread pools without lanes. + endpoints for thread pools without lanes. <code>*:*</code> + can be used to specify all pools and lanes, <code>1:*</code> means + all lanes from pool <code>1</code>, and <code>*:1</code> + means lane <code>1</code> from all pools. <p>Sets of endpoints may be specified using multiple <code>-ORBLaneListenEndpoints</code> options or by delimiting diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h index e60d882ffb3..fbdef929347 100644 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ b/TAO/tao/PI/PI_ORBInitializer.h @@ -50,7 +50,6 @@ public: void pre_init (PortableInterceptor::ORBInitInfo_ptr info); void post_init (PortableInterceptor::ORBInitInfo_ptr info); - //@} private: diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index 89b5abcbf43..0a912a54b87 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -42,7 +42,6 @@ public: void pre_init (PortableInterceptor::ORBInitInfo_ptr info); void post_init (PortableInterceptor::ORBInitInfo_ptr info); - //@} private: diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 5331338a540..330b8850ffe 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -287,22 +287,45 @@ TAO_Thread_Lane::open (void) // Validate and map priority. this->validate_and_map_priority (); - // Create a string with the pool:thread id. char pool_lane_id[10]; + TAO_ORB_Parameters *params = + this->pool ().manager ().orb_core ().orb_params (); + TAO_EndpointSet endpoint_set; + + // Create a string just *:* which means all pools all thread id's ACE_OS::sprintf (pool_lane_id, - "%d:%d", - this->pool ().id (), + "*:*"); + + // Get the endpoints for all + params->get_endpoint_set (pool_lane_id, endpoint_set); + + // Create a string with pool:* which means all lanes for this pool + ACE_OS::sprintf (pool_lane_id, + "%d:*", + this->pool ().id ()); + + // Get the endpoints for this pool. + params->get_endpoint_set (pool_lane_id, endpoint_set); + + // Create a string with *:lane which means a lan of all pools + ACE_OS::sprintf (pool_lane_id, + "*:%d", this->id ()); - TAO_ORB_Parameters *params = - this->pool ().manager ().orb_core ().orb_params (); + // Get the endpoints for this lane. + params->get_endpoint_set (pool_lane_id, endpoint_set); - TAO_EndpointSet endpoint_set; - bool ignore_address = false; + // Create a string with the pool:thread id. + ACE_OS::sprintf (pool_lane_id, + "%d:%d", + this->pool ().id (), + this->id ()); // Get the endpoints for this lane. params->get_endpoint_set (pool_lane_id, endpoint_set); + bool ignore_address = false; + if (endpoint_set.is_empty ()) { // If endpoints are not specified for this lane, use the diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h index 399d107ec3c..f599ae2a1e2 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h @@ -46,10 +46,9 @@ public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); -private: +private: TAO_RTScheduler_Current* current_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index 7aaef3345e7..98f26d23e84 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -349,12 +349,10 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoi TAO_Acceptor_Registry &ar = this->acceptor_registry (); // Open it. - int result = ar.open (&this->orb_core_, - this->leader_follower ().reactor (), - endpoint_set, - ignore_address); - - return result; + return ar.open (&this->orb_core_, + this->leader_follower ().reactor (), + endpoint_set, + ignore_address); } TAO_Resource_Factory * diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h index 9f656225bf7..4328567f313 100644 --- a/TAO/tao/Valuetype_Adapter.h +++ b/TAO/tao/Valuetype_Adapter.h @@ -56,16 +56,14 @@ public: virtual ~TAO_Valuetype_Adapter (void); virtual CORBA::Object_ptr abstractbase_to_object ( - CORBA::AbstractBase_ptr p - ) = 0; + CORBA::AbstractBase_ptr p) = 0; virtual CORBA::Boolean stream_to_value (TAO_InputCDR &, CORBA::ValueBase *&) = 0; virtual CORBA::Boolean stream_to_abstract_base ( TAO_InputCDR &, - CORBA::AbstractBase_ptr & - ) = 0; + CORBA::AbstractBase_ptr &) = 0; virtual CORBA::Long type_info_single (void) const = 0; @@ -74,8 +72,7 @@ public: virtual CORBA::Boolean is_type_info_list (CORBA::Long) const = 0; virtual CORBA::Boolean is_value_chunked (CORBA::Long) const = 0; - virtual int vf_map_rebind (const char *, - CORBA::ValueFactory &) = 0; + virtual int vf_map_rebind (const char *, CORBA::ValueFactory &) = 0; virtual int vf_map_unbind (const char *) = 0; |