From 4f64a248c2dbbdb2a0d09295e88b221de0a6a8ec Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Thu, 21 Jun 2001 07:05:59 +0000 Subject: *** empty log message *** --- TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp | 4 +- TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp | 4 +- TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp | 1 + TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h | 5 +-- TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h | 2 +- TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h | 4 +- TAO/orbsvcs/orbsvcs/LoadBalancing.dsp | 48 +++++++++++++++------ .../LoadBalancing/LB_Balancing_Strategy.cpp | 1 + .../orbsvcs/LoadBalancing/LB_Balancing_Strategy.h | 5 +-- .../orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h | 2 +- .../orbsvcs/LoadBalancing/LB_Pull_Handler.cpp | 6 ++- TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h | 4 +- .../orbsvcs/LoadBalancing/LoadBalancingI.cpp | 38 +++++++--------- TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp | 38 +++++++--------- TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing | 1 + TAO/orbsvcs/tests/LoadBalancing/client.dsp | 48 +++++---------------- TAO/orbsvcs/tests/LoadBalancing/server.cpp | 16 +++---- TAO/orbsvcs/tests/LoadBalancing/server.dsp | 50 +++++++++++++--------- 18 files changed, 135 insertions(+), 142 deletions(-) diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp index 4bc9c2bdb0e..cdc8bf8335d 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp @@ -98,7 +98,9 @@ TAO_LoadBalancer::init (int argc, ACE_NEW (this->balancer_, TAO_LoadBalancing_ReplicationManager_i); - this->balancer_->init (this->root_poa_.in (), ACE_TRY_ENV); + this->balancer_->init (this->orb_.in (), + this->root_poa_.in (), + ACE_TRY_ENV); ACE_CHECK; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp index f526b695e16..bb85aec92a2 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 TAO.lib TAO_PortableServer.lib TAO_LoadBalancing.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" +# ADD LINK32 TAO.lib TAO_PortableServer.lib TAO_LoadBalancing.lib TAO_CosNaming.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" !ELSEIF "$(CFG)" == "LoadBalancer_Service - Win32 Debug" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib TAO_LoadBalancingd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" +# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib TAO_LoadBalancingd.lib TAO_CosNamingd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" !ENDIF diff --git a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp index d891a23ca2c..eca536d8715 100644 --- a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp @@ -7,6 +7,7 @@ ACE_RCSID (orbsvcs, LB_Balancing_Strategy, "$Id$") + TAO_LB_Balancing_Strategy::~TAO_LB_Balancing_Strategy (void) { } diff --git a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h index b793debee65..c704ecc569b 100644 --- a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h @@ -24,7 +24,7 @@ # endif /* ACE_LACKS_PRAGMA_ONCE */ // class TAO_LB_ReplicaProxy; -class TAO_LB_ObjectGroup_Map_Entry; +struct TAO_LB_ObjectGroup_Map_Entry; /** @@ -67,9 +67,6 @@ public: // CORBA::Environment &ACE_TRY_ENV); }; -#if !defined (__ACE_INLINE__) -#include "LoadBalancing_Strategy.i" -#endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h index bb22ff7517a..19a1b50ae33 100644 --- a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h @@ -33,7 +33,7 @@ // Forward declarations // class TAO_LB_ReplicaProxy; -class TAO_LB_ObjectGroup_Map_Entry; +struct TAO_LB_ObjectGroup_Map_Entry; // typedef ACE_Unbounded_Set TAO_LB_ReplicaProxySet; // typedef ACE_Unbounded_Set_Iterator TAO_LB_ReplicaProxySetIterator; diff --git a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h index 897b5b8f2e0..b95d8312a20 100644 --- a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h +++ b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h @@ -25,10 +25,10 @@ #include "orbsvcs/LoadBalancingC.h" -// Forward declarations. +// Fosrward declarations. struct TAO_LB_Location_Map_Entry; -class TAO_LB_ReplicaInfo; +struct TAO_LB_ReplicaInfo; typedef ACE_Unbounded_Set TAO_LB_ReplicaInfo_Set; /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp b/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp index 743a8db48cb..10c05dc22f5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp @@ -56,7 +56,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" +# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" !ELSEIF "$(CFG)" == "LoadBalancing - Win32 Debug" @@ -83,7 +83,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" +# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" # SUBTRACT LINK32 /profile !ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Debug" @@ -112,7 +112,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" # SUBTRACT BASE LINK32 /profile -# ADD LINK32 TAOd.lib aced.lib TAO_PortableServermfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" +# ADD LINK32 TAOd.lib aced.lib TAO_PortableServermfcd.lib TAO_CosNamingmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" # SUBTRACT LINK32 /profile !ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Release" @@ -140,7 +140,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# ADD LINK32 ace.lib TAO.lib TAO_PortableServermfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" +# ADD LINK32 ace.lib TAO.lib TAO_PortableServermfc.lib TAO_CosNamingmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" !ENDIF @@ -207,10 +207,6 @@ SOURCE=.\LoadBalancing\LB_ReplicaLocator.cpp # End Source File # Begin Source File -SOURCE=.\LoadBalancing\LB_Round_Robin_Strategy.cpp -# End Source File -# Begin Source File - SOURCE=.\LoadBalancing\LB_RPMS_Monitor.cpp # End Source File # Begin Source File @@ -223,8 +219,16 @@ SOURCE=.\LoadBalancing\LB_RPMS_Monitor_ORBInitializer.cpp # End Source File # Begin Source File +SOURCE=.\LoadBalancingC.cpp +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LoadBalancingI.cpp # End Source File +# Begin Source File + +SOURCE=.\LoadBalancingS.cpp +# End Source File # End Group # Begin Group "Header Files" @@ -283,10 +287,6 @@ SOURCE=.\LoadBalancing\LB_ReplicaLocator.h # End Source File # Begin Source File -SOURCE=.\LoadBalancing\LB_Round_Robin_Strategy.h -# End Source File -# Begin Source File - SOURCE=.\LoadBalancing\LB_RPMS_Monitor.h # End Source File # Begin Source File @@ -303,8 +303,20 @@ SOURCE=.\LoadBalancing\LoadBalancing_export.h # End Source File # Begin Source File +SOURCE=.\LoadBalancingC.h +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LoadBalancingI.h # End Source File +# Begin Source File + +SOURCE=.\LoadBalancingS.h +# End Source File +# Begin Source File + +SOURCE=.\LoadBalancingS_T.h +# End Source File # End Group # Begin Group "IDL Files" @@ -424,6 +436,18 @@ SOURCE=.\LoadBalancing\LB_ObjectGroup_Map.inl SOURCE=.\LoadBalancing\LB_RPMS_Monitor_Interceptor.inl # End Source File +# Begin Source File + +SOURCE=.\LoadBalancingC.i +# End Source File +# Begin Source File + +SOURCE=.\LoadBalancingS.i +# End Source File +# Begin Source File + +SOURCE=.\LoadBalancingS_T.i +# End Source File # End Group # Begin Group "Template Files" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp index d891a23ca2c..eca536d8715 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp @@ -7,6 +7,7 @@ ACE_RCSID (orbsvcs, LB_Balancing_Strategy, "$Id$") + TAO_LB_Balancing_Strategy::~TAO_LB_Balancing_Strategy (void) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h index b793debee65..c704ecc569b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h @@ -24,7 +24,7 @@ # endif /* ACE_LACKS_PRAGMA_ONCE */ // class TAO_LB_ReplicaProxy; -class TAO_LB_ObjectGroup_Map_Entry; +struct TAO_LB_ObjectGroup_Map_Entry; /** @@ -67,9 +67,6 @@ public: // CORBA::Environment &ACE_TRY_ENV); }; -#if !defined (__ACE_INLINE__) -#include "LoadBalancing_Strategy.i" -#endif /* __ACE_INLINE__ */ #include "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h index bb22ff7517a..19a1b50ae33 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h @@ -33,7 +33,7 @@ // Forward declarations // class TAO_LB_ReplicaProxy; -class TAO_LB_ObjectGroup_Map_Entry; +struct TAO_LB_ObjectGroup_Map_Entry; // typedef ACE_Unbounded_Set TAO_LB_ReplicaProxySet; // typedef ACE_Unbounded_Set_Iterator TAO_LB_ReplicaProxySetIterator; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index 469223613f8..5f459ed8ef9 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -2,6 +2,8 @@ #include "LB_Pull_Handler.h" +#include "tao/debug.h" + ACE_RCSID (LoadBalancing, LB_Pull_Handler, "$Id$") @@ -20,7 +22,7 @@ TAO_LB_Pull_Handler::handle_timeout ( TAO_LB_Location_Map::iterator begin = this->location_map_.begin (); - TAO_LB_Location_Map::iterator begin = + TAO_LB_Location_Map::iterator end = this->location_map_.end (); // Iterate over all registered load monitors. @@ -31,7 +33,7 @@ TAO_LB_Pull_Handler::handle_timeout ( i != end; ++i) { - TAO_LB_Location_Map_Entry *location = i->ext_id_; + TAO_LB_Location_Map_Entry *location = (*i).int_id_; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h index 897b5b8f2e0..b95d8312a20 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h @@ -25,10 +25,10 @@ #include "orbsvcs/LoadBalancingC.h" -// Forward declarations. +// Fosrward declarations. struct TAO_LB_Location_Map_Entry; -class TAO_LB_ReplicaInfo; +struct TAO_LB_ReplicaInfo; typedef ACE_Unbounded_Set TAO_LB_ReplicaInfo_Set; /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp index 738b1bf7dc6..e0e721eec31 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp @@ -154,7 +154,7 @@ TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor ( if (this->location_map_.find (the_location, location_entry) != 0) - ACE_THROW (LoadBalancing::LocationNotFound); + ACE_THROW (LoadBalancing::LocationNotFound ()); (void) location_entry->load_monitor.out (); @@ -175,9 +175,8 @@ TAO_LoadBalancing_ReplicationManager_i::set_default_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.set_default_properties (props, - ACE_TRY_ENV); + this->property_manager_.set_default_properties (props, + ACE_TRY_ENV); } LoadBalancing::Properties * @@ -197,9 +196,8 @@ TAO_LoadBalancing_ReplicationManager_i::remove_default_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.remove_default_properties (props, - ACE_TRY_ENV); + this->property_manager_.remove_default_properties (props, + ACE_TRY_ENV); } void @@ -211,10 +209,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_type_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.set_type_properties (type_id, - overrides, - ACE_TRY_ENV); + this->property_manager_.set_type_properties (type_id, + overrides, + ACE_TRY_ENV); } LoadBalancing::Properties * @@ -237,10 +234,9 @@ TAO_LoadBalancing_ReplicationManager_i::remove_type_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.remove_type_properties (type_id, - props, - ACE_TRY_ENV); + this->property_manager_.remove_type_properties (type_id, + props, + ACE_TRY_ENV); } void @@ -253,10 +249,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_properties_dynamically ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.set_properties_dynamically (object_group, - overrides, - ACE_TRY_ENV); + this->property_manager_.set_properties_dynamically (object_group, + overrides, + ACE_TRY_ENV); } LoadBalancing::Properties * @@ -463,9 +458,8 @@ TAO_LoadBalancing_ReplicationManager_i::delete_object ( ACE_THROW_SPEC ((CORBA::SystemException, LoadBalancing::ObjectNotFound)) { - return - this->generic_factory_.delete_object (factory_creation_id, - ACE_TRY_ENV); + this->generic_factory_.delete_object (factory_creation_id, + ACE_TRY_ENV); } CORBA::Object_ptr diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp index 738b1bf7dc6..e0e721eec31 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp @@ -154,7 +154,7 @@ TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor ( if (this->location_map_.find (the_location, location_entry) != 0) - ACE_THROW (LoadBalancing::LocationNotFound); + ACE_THROW (LoadBalancing::LocationNotFound ()); (void) location_entry->load_monitor.out (); @@ -175,9 +175,8 @@ TAO_LoadBalancing_ReplicationManager_i::set_default_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.set_default_properties (props, - ACE_TRY_ENV); + this->property_manager_.set_default_properties (props, + ACE_TRY_ENV); } LoadBalancing::Properties * @@ -197,9 +196,8 @@ TAO_LoadBalancing_ReplicationManager_i::remove_default_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.remove_default_properties (props, - ACE_TRY_ENV); + this->property_manager_.remove_default_properties (props, + ACE_TRY_ENV); } void @@ -211,10 +209,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_type_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.set_type_properties (type_id, - overrides, - ACE_TRY_ENV); + this->property_manager_.set_type_properties (type_id, + overrides, + ACE_TRY_ENV); } LoadBalancing::Properties * @@ -237,10 +234,9 @@ TAO_LoadBalancing_ReplicationManager_i::remove_type_properties ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.remove_type_properties (type_id, - props, - ACE_TRY_ENV); + this->property_manager_.remove_type_properties (type_id, + props, + ACE_TRY_ENV); } void @@ -253,10 +249,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_properties_dynamically ( LoadBalancing::InvalidProperty, LoadBalancing::UnsupportedProperty)) { - return - this->property_manager_.set_properties_dynamically (object_group, - overrides, - ACE_TRY_ENV); + this->property_manager_.set_properties_dynamically (object_group, + overrides, + ACE_TRY_ENV); } LoadBalancing::Properties * @@ -463,9 +458,8 @@ TAO_LoadBalancing_ReplicationManager_i::delete_object ( ACE_THROW_SPEC ((CORBA::SystemException, LoadBalancing::ObjectNotFound)) { - return - this->generic_factory_.delete_object (factory_creation_id, - ACE_TRY_ENV); + this->generic_factory_.delete_object (factory_creation_id, + ACE_TRY_ENV); } CORBA::Object_ptr diff --git a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing index 71169ac55e1..6c547005eeb 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing +++ b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing @@ -46,6 +46,7 @@ CPP_SRCS += \ LoadBalancing/LB_ObjectGroupManager \ LoadBalancing/LB_ObjectGroup_Map \ LoadBalancing/LB_PropertyManager \ + LoadBalancing/LB_Pull_Handler \ LoadBalancing/LB_RPMS_Monitor \ LoadBalancing/LB_RPMS_Monitor_Interceptor \ LoadBalancing/LB_RPMS_Monitor_ORBInitializer \ diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.dsp b/TAO/orbsvcs/tests/LoadBalancing/client.dsp index dd4d5cf6317..4d1e79fbf1e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/client.dsp +++ b/TAO/orbsvcs/tests/LoadBalancing/client.dsp @@ -93,19 +93,7 @@ SOURCE=.\client.cpp # End Source File # Begin Source File -SOURCE=.\Hash_Replica_i.cpp -# End Source File -# Begin Source File - -SOURCE=.\Hash_ReplicaC.cpp -# End Source File -# Begin Source File - -SOURCE=.\Hash_ReplicaControl.cpp -# End Source File -# Begin Source File - -SOURCE=.\Hash_ReplicaS.cpp +SOURCE=.\HasherC.cpp # End Source File # End Group # Begin Group "Header Files" @@ -113,19 +101,7 @@ SOURCE=.\Hash_ReplicaS.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\Hash_Replica_i.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_ReplicaC.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_ReplicaControl.h -# End Source File -# Begin Source File - -SOURCE=.\Hash_ReplicaS.h +SOURCE=.\HasherC.h # End Source File # End Group # Begin Group "IDL Files" @@ -133,18 +109,18 @@ SOURCE=.\Hash_ReplicaS.h # PROP Default_Filter "idl" # Begin Source File -SOURCE=.\Hash_Replica.idl +SOURCE=.\Hasher.idl !IF "$(CFG)" == "LoadBalancing client - Win32 Release" # PROP Ignore_Default_Tool 1 USERDEP__HASH_="..\..\..\..\bin\Release\tao_idl.exe" # Begin Custom Build -InputPath=.\Hash_Replica.idl -InputName=Hash_Replica +InputPath=.\Hasher.idl +InputName=Hasher BuildCmds= \ - ..\..\..\..\bin\Release\tao_idl -Ge 1 Hash_Replica.idl + ..\..\..\..\bin\Release\tao_idl -Ge 1 Hasher.idl "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -179,11 +155,11 @@ BuildCmds= \ # PROP Ignore_Default_Tool 1 USERDEP__HASH_="..\..\..\..\bin\tao_idl.exe" # Begin Custom Build -InputPath=.\Hash_Replica.idl -InputName=Hash_Replica +InputPath=.\Hasher.idl +InputName=Hasher BuildCmds= \ - ..\..\..\..\bin\tao_idl.exe -Ge 1 Hash_Replica.idl + ..\..\..\..\bin\tao_idl.exe -Ge 1 Hasher.idl "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -222,11 +198,7 @@ BuildCmds= \ # PROP Default_Filter "i" # Begin Source File -SOURCE=.\Hash_ReplicaC.i -# End Source File -# Begin Source File - -SOURCE=.\Hash_ReplicaS.i +SOURCE=.\HasherC.i # End Source File # End Group # End Target diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/server.cpp index 300e220f968..7a66d94723f 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/server.cpp @@ -69,29 +69,29 @@ setup_criteria (HasherFactory &hasher_factory) // Default initial number of replicas LoadBalancing::Property &initial_number_replicas = - criteria[0]; + criteria[CORBA::ULong (0)]; initial_number_replicas.nam.length (1); - initial_number_replicas.nam[0].id = + initial_number_replicas.nam[CORBA::ULong (0)].id = CORBA::string_dup ("InitialNumberReplicas"); initial_number_replicas.val <<= INIT_NUM_REPLICAS; // Default minimum number of replicas LoadBalancing::Property &minimum_number_replicas = - criteria[1] = minimum_number_replicas; + criteria[CORBA::ULong (1)]; minimum_number_replicas.nam.length (1); - minimum_number_replicas.nam[0].id = + minimum_number_replicas.nam[CORBA::ULong (0)].id = CORBA::string_dup ("MinimumNumberReplicas"); minimum_number_replicas.val <<= MIN_NUM_REPLICAS; // Default factories (simulated locations) LoadBalancing::Property &factories = - criteria[2]; + criteria[CORBA::ULong (2)]; factories.nam.length (1); - factories.nam[0].id = CORBA::string_dup ("Factories"); + factories.nam[CORBA::ULong (0)].id = CORBA::string_dup ("Factories"); // Implicitly activate the HasherFactory. CORBA::Object_var obj = @@ -124,9 +124,9 @@ setup_criteria (HasherFactory &hasher_factory) // Create a logical location for each factory. char location[BUFSIZ] = { 0 }; ACE_OS::sprintf (location, "%u", i); - factory_info.the_location[0].id = + factory_info.the_location[CORBA::ULong (0)].id = CORBA::string_dup (location); - factory_info.the_location[0].kind = + factory_info.the_location[CORBA::ULong (0)].kind = CORBA::string_dup ("location number"); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.dsp b/TAO/orbsvcs/tests/LoadBalancing/server.dsp index e1362427374..1efdcbe25d6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/server.dsp +++ b/TAO/orbsvcs/tests/LoadBalancing/server.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 TAO_LoadBalancing.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace" +# ADD LINK32 TAO_CosNaming.lib TAO_LoadBalancing.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace" !ELSEIF "$(CFG)" == "LoadBalancing server - Win32 Debug" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 TAO_LoadBalancingd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace" +# ADD LINK32 TAO_CosNamingd.lib TAO_LoadBalancingd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace" !ENDIF @@ -89,19 +89,19 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\Hash_Replica_i.cpp +SOURCE=.\Hasher_i.cpp # End Source File # Begin Source File -SOURCE=.\Hash_ReplicaC.cpp +SOURCE=.\HasherC.cpp # End Source File # Begin Source File -SOURCE=.\Hash_ReplicaControl.cpp +SOURCE=.\HasherFactory.cpp # End Source File # Begin Source File -SOURCE=.\Hash_ReplicaS.cpp +SOURCE=.\HasherS.cpp # End Source File # Begin Source File @@ -113,19 +113,23 @@ SOURCE=.\server.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\Hash_Replica_i.h +SOURCE=.\Hasher_i.h # End Source File # Begin Source File -SOURCE=.\Hash_ReplicaC.h +SOURCE=.\HasherC.h # End Source File # Begin Source File -SOURCE=.\Hash_ReplicaControl.h +SOURCE=.\HasherFactory.h # End Source File # Begin Source File -SOURCE=.\Hash_ReplicaS.h +SOURCE=.\HasherS.h +# End Source File +# Begin Source File + +SOURCE=.\HasherS_T.h # End Source File # End Group # Begin Group "IDL Files" @@ -133,18 +137,18 @@ SOURCE=.\Hash_ReplicaS.h # PROP Default_Filter "idl" # Begin Source File -SOURCE=.\Hash_Replica.idl +SOURCE=.\Hasher.idl !IF "$(CFG)" == "LoadBalancing server - Win32 Release" # PROP Ignore_Default_Tool 1 -USERDEP__HASH_="..\..\..\..\bin\Release\tao_idl.exe" +USERDEP__HASHE="..\..\..\..\bin\Release\tao_idl.exe" # Begin Custom Build -InputPath=.\Hash_Replica.idl -InputName=Hash_Replica +InputPath=.\Hasher.idl +InputName=Hasher BuildCmds= \ - ..\..\..\..\bin\Release\tao_idl -Ge 1 Hash_Replica.idl + ..\..\..\..\bin\Release\tao_idl -Ge 1 Hasher.idl "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -177,13 +181,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "LoadBalancing server - Win32 Debug" # PROP Ignore_Default_Tool 1 -USERDEP__HASH_="..\..\..\..\bin\tao_idl.exe" +USERDEP__HASHE="..\..\..\..\bin\tao_idl.exe" # Begin Custom Build -InputPath=.\Hash_Replica.idl -InputName=Hash_Replica +InputPath=.\Hasher.idl +InputName=Hasher BuildCmds= \ - ..\..\..\..\bin\tao_idl.exe -Ge 1 Hash_Replica.idl + ..\..\..\..\bin\tao_idl.exe -Ge 1 Hasher.idl "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) @@ -222,11 +226,15 @@ BuildCmds= \ # PROP Default_Filter "i" # Begin Source File -SOURCE=.\Hash_ReplicaC.i +SOURCE=.\HasherC.i +# End Source File +# Begin Source File + +SOURCE=.\HasherS.i # End Source File # Begin Source File -SOURCE=.\Hash_ReplicaS.i +SOURCE=.\HasherS_T.i # End Source File # End Group # End Target -- cgit v1.2.1