diff options
Diffstat (limited to 'TAO')
93 files changed, 104 insertions, 160 deletions
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index 71959931447..1094be61992 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -42,7 +42,7 @@ to run TAO on:<P> </tr> <tr valign=top> <td><b>Partially supported, i.e., infrequently tested</b></td> - <td>Solaris 9, FreeBSD, NetBSD, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian) + <td>FreeBSD, NetBSD, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian) </td> </tr> <tr valign=top bgcolor="#AFAFAF"> @@ -53,7 +53,7 @@ to run TAO on:<P> <td><b>Formerly Supported Platforms</b></td> <td> Embarcadero C++ Builder, Sun/C++ 5.1 through 5.4, g++ prior to 2.95.x, HP/UX 10.x, pSoS, Chorus, DEC UNIX, SCO, UnixWare, MVS, - Windows 9x/ME, Chorus, Tandem NS, OpenVMS 8.3 IA64, Windows CE + Windows 9x/ME, Chorus, Tandem NS, OpenVMS 8.3 IA64, Windows CE, Solaris 9, AIX </td> </tr> </table> diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index 2662416ea8f..7c6d234aa88 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -1012,8 +1012,7 @@ having them use the same configurator file. <td>Use this option to cycle through profiles when it has been detected that a connection is closed when reading a server reply and having the server possibly process the reqest more than once - is acceptable. This option currently does not work under FreeBSD, - and Solaris. + is acceptable. This option currently does not work under FreeBSD. The number of retries will not exceed <em>limit</em>. If this option is used then -ORBForwardOnTransientLimit should also be used to avoid a TRANSIENT exception being thrown. @@ -1509,7 +1508,7 @@ thread-pool reactor which is the default.</td> highly scalable replacement for the <code>select()</code> based reactors. The ACE_Dev_Poll_Reactor is currently only supported on - HP-UX, Solaris and Linux. Be aware that dev_poll + Linux. Be aware that dev_poll support is experimental!</td> </tr> </tbody> diff --git a/TAO/docs/interfacerepo/index.html b/TAO/docs/interfacerepo/index.html index 8ad637280d0..3cd1ad69e86 100644 --- a/TAO/docs/interfacerepo/index.html +++ b/TAO/docs/interfacerepo/index.html @@ -132,8 +132,7 @@ ACE_wrappers/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test.</li><p> <li> Code to support multicast discovery of the Interface Repository IOR has been added to TAO. Testing has been done using loopback on NT, -loopback on Solaris, and remotely between these two platforms in both -directions.</li><p> +and remotely between these two platforms in both directions.</li><p> <li> Read/write locking option added to IFR service. This option should be used if the IFR service is started using a service config file that @@ -155,7 +154,7 @@ directory under TAO/tao, taking its place alongside the other satellite librarie that have been created recently.</li><p> <li> IFR has been made compliant with the CORBA 2.4 version of Interface.idl. -Two new IFR object classes have been added, AbstractInterfaceDef and +Two new IFR object classes have been added, AbstractInterfaceDef and LocalInterfaceDef. Some data structures have changed, as well as the signature of some operations.</li><p> @@ -166,7 +165,7 @@ be built and linked if an application does not intend to call those functions. I it does, however, the application should have #include "tao/TypeCodeFactory_Adapter_Impl.h" or something similar in it somewhere, and also link to the TAO_TypeCodeFactory library. This will automatically load the -library if it has been compiled. Please see the example in +library if it has been compiled. Please see the example in ACE_ROOT/TAO/examples/TypeCode_Creation.</li><p> <li> The CORBA::Object::_get_interface() method has been implemented. This method will @@ -204,7 +203,7 @@ tao_ifr -ORBInitRef InterfaceRepository=corbaloc:iiop:[hostname]:[port]/Interfac associated POAs are created at IFR startup and destroyed at shutdown). </li><p> -<li> IFR now supports valuetypes, components, homes and eventtypes. A test +<li> IFR now supports valuetypes, components, homes and eventtypes. A test for this support has been added in TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test. </li><p> diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html index 43c142707db..74194ba2232 100644 --- a/TAO/docs/releasenotes/ec.html +++ b/TAO/docs/releasenotes/ec.html @@ -92,10 +92,6 @@ port number for the <TT>Naming Service</TT> so you can use the <TT>NameService</ environment variable. <P>The script <TT>start_services</TT> in <TT>$TAO_ROOT/orbsvcs/tests</TT> can help with this. -<LI> -If you want real-time behavior on Solaris you may need to run these programs -as root; on the other hand, this particular example really has no priority -inversion, since only one thread runs at a time.</LI> </OL> Another example is <TT>EC_Multiple</TT>, numerous examples on how to run this test can be found in the scripts located in <TT>$TAO_ROOT/orbsvcs/tests/EC_Multiple</TT>. diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index b4d8c117ded..d078fd54502 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -339,8 +339,7 @@ Perfect Hashed Operation Lookup Strategy has been added to the IDL Compiler. -P flag to <tt>tao_idl</tt> enables the perfect hased lookup strategy. This strategy uses <a href="http://www.dre.vanderbilt.edu/~schmidt/PDF/gperf.pdf">GPERF</a>, the GNU's Perfect Hash Function Generator written by Dr.Douglas C. Schmidt. -Right now, GPERF works only on Solaris. Any work on porting GPERF to other -platforms will be highly appreciated.</L1></li> +</L1></li> <li> The <<= and >>= operators for user-defined types are now generated.</li> diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index 23511c46da6..c3d71b297f0 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -72,7 +72,7 @@ Base_Server::try_RT_scheduling () priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp index 4025854a4e9..2bce4d98968 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp +++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp @@ -61,7 +61,7 @@ Client_Task::try_RT_scheduling () priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index c4dcc225ef7..ac19e3863ce 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index 3fa4a1fcd6c..6906f8585d7 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Grid_i.h" -// Solaris and some Windows compilers don't have min in std namespaces +// Some Windows compilers don't have min in std namespaces // moreover on Windows 'min' is a macro, so we have to avoid using it literally. CORBA::UShort Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b) diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 6d85fddce5d..fcce738f501 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -74,7 +74,7 @@ private: typedef ACE_Auto_Array_Ptr<CORBA::Long> GridArray; GridArray array_; - /// Solaris and some Windows compilers don't have min in std namespaces + /// Some Windows compilers don't have min in std namespaces static CORBA::UShort ushort_min (CORBA::UShort, CORBA::UShort); }; diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index d8e9ae08ecd..87feb97e099 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -37,8 +37,6 @@ Time_Client_i::run (const char *name, timedate = static_cast <time_t> (client_->current_time ()); // Print out value - // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly - // under 64-bit solaris. ACE_TCHAR ascii_timedate[64] = ACE_TEXT (""); ACE_OS::ctime_r (&timedate, ascii_timedate, 64); diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 5eaee1f34e9..73eea3a075b 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -1004,7 +1004,7 @@ DualEC_Supplier::get_options (int argc, ACE_TCHAR *argv []) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index b007c81109e..cf5cbd75de7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -93,7 +93,7 @@ private: /** * Set to 1 if priority values increase with increasing priority, - * such as on Solaris and Win32, or 0 if they decrease, such as on + * such as on Win32, or 0 if they decrease, such as on * VxWorks. */ int increasing_priority_; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index de2cf0f85be..508ca8cf8f8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -70,8 +70,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index 22454390add..22fe8819380 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -217,8 +217,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index b6de5b57c68..debd4a3316a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -72,8 +72,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index dd461f6fdae..213e824a89b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -215,7 +215,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index d2a9f33c2a1..8ec3b162ffe 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -90,7 +90,7 @@ Driver::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 66b26fc2ac2..0202dcaee91 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -84,7 +84,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl index a4be43018e0..28afc4f0a1f 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl @@ -27,7 +27,7 @@ ECM_Federation::supplier_types () const ACE_INLINE const char* ECM_Federation::supplier_name (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_)) + if (i < static_cast<CORBA::ULong> (this->supplier_types_)) return this->supplier_names_[i]; return 0; } @@ -35,7 +35,7 @@ ECM_Federation::supplier_name (CORBA::ULong i) const ACE_INLINE CORBA::ULong ECM_Federation::supplier_ipaddr (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_)) + if (i < static_cast<CORBA::ULong> (this->supplier_types_)) return this->supplier_ipaddr_[i]; return 0; } @@ -49,7 +49,7 @@ ECM_Federation::consumer_types () const ACE_INLINE const char* ECM_Federation::consumer_name (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_)) + if (i < static_cast<CORBA::ULong> (this->consumer_types_)) return this->consumer_names_[i]; return 0; } @@ -57,7 +57,7 @@ ECM_Federation::consumer_name (CORBA::ULong i) const ACE_INLINE CORBA::ULong ECM_Federation::consumer_ipaddr (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_)) + if (i < static_cast<CORBA::ULong> (this->consumer_types_)) return this->consumer_ipaddr_[i]; return 0; } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index c0f9d476954..4894a456b24 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -222,7 +222,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index a10cc5b53ad..403a38f8f75 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -93,10 +93,9 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[]) } } - int min_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 4168b9c133c..4dc0053f3b6 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -104,10 +104,9 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[]) } } - int min_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index d2eaa541490..cc1bc13d837 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -136,10 +136,9 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index e467d335503..2837ba34dbb 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -153,8 +153,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) TAO_ECG_UDP_Out_Endpoint endpoint; // need to be explicit about the address type when built with // IPv6 support, otherwise SOCK_DGram::open defaults to ipv6 when - // given a sap_any address. This causes trouble on at least solaris - // and windows, or at most on not-linux. + // given a sap_any address. This causes trouble on at least windows, + // or at most on not-linux. if (endpoint.dgram ().open (ACE_Addr::sap_any, send_addr.get_type()) == -1) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index f3644488f24..b5b82c362ff 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -27,8 +27,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 91415ec499c..4310fd57c57 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -26,8 +26,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index c297a9147e3..b72b31e0d90 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -220,8 +220,8 @@ EC_Driver::move_to_rt_class () + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl index f9cc8fd812f..f45ddef340f 100755 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl @@ -167,9 +167,6 @@ print STDERR "Starting Client: $prog $args\n"; $CL = $test->CreateProcess ("$prog", "$args"); # Some systems may take a very long time to process 100 objects. -# For example, on a Solaris/SPARC system it was found that it took -# 8 seconds to bind 100 objects compared to 0.08 seconds on a -# Linux/Intel computer. So add to the wait time. $client = $CL->SpawnWaitKill ($test->ProcessStartWaitInterval() + 105); if ($client != 0) { diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/README b/TAO/orbsvcs/tests/Miop/McastLocal/README index 89fb093b9c5..1d6d2bc44db 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/README +++ b/TAO/orbsvcs/tests/Miop/McastLocal/README @@ -17,11 +17,6 @@ loopback interface (via its This is testing that these configuartion options are correctly working for MIOP. *********************************** -Note -This test currently fails on Solaris (at least ultra10) -as loopback multicasting seems to have a hardcoded (and unchangeable) SndSock -size of 0. It then throws away all data that is being sent by the client, -therefore the servers will timeout as they won't receive any message. Some other systems (MacOS) also have problems with loopback multicasting issuing errno such as "Network/address unreachable" for each diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index 87e5d3a9e8b..df0df95f20c 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -50,10 +50,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp index e12195d755d..d7a2a43ec3b 100644 --- a/TAO/performance-tests/Callback/server.cpp +++ b/TAO/performance-tests/Callback/server.cpp @@ -18,10 +18,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp index 6d1f4e8b305..46e4e4e960b 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp @@ -17,7 +17,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, ACE_THR_PRI_FIFO_DEF, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp index 5ba42c3f4db..ee6fff88605 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp @@ -23,10 +23,9 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int priority = ACE_THR_PRI_FIFO_DEF; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp index 100120db159..6ddfa802019 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp @@ -76,7 +76,7 @@ int Globals::sched_fifo_init () { #if defined (ACE_HAS_THREADS) - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling # if defined (__APPLE__) || defined (BSD) int scope = ACE_SCOPE_THREAD; # else diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h index 22d87a757b6..33806d6f47c 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h @@ -108,7 +108,7 @@ public: int parse_args (int argc, ACE_TCHAR **argv); /** - * Enables fifo scheduling eg., RT scheduling class on solaris. + * Enables fifo scheduling. * Returns 0 on success, 1 if insufficient permission, or -1 * for other failure. As a side effect, sets thr_create_flags * appropriately. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests index 13150470eb2..99528977530 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests @@ -23,7 +23,7 @@ The percentage of overhead is calculated in the following way: Latency Test ------------------------ -- configuration: - (1) su to root when running Solaris or LynxOS. + (1) su to root when on LynxOS. (2) Make yourself an Administrator in Windows NT on the server side: diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp index cbcd21bd8dc..544bc599f18 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp @@ -61,8 +61,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp index 209c71bf7c3..f92a5fb4eee 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp @@ -41,8 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index fffeb23c96d..997c2687aec 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -52,8 +52,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp index 0951ffe2be9..1ba7876caee 100644 --- a/TAO/performance-tests/Latency/AMI/server.cpp +++ b/TAO/performance-tests/Latency/AMI/server.cpp @@ -47,13 +47,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp index 1b52a033215..ab5360f499d 100644 --- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp +++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp @@ -38,8 +38,7 @@ set_priority() + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index 918af48016c..f7fbd361812 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -62,8 +62,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index c71229731e0..ffe3425aa61 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp index 3f26308a7ca..e3881b066dd 100644 --- a/TAO/performance-tests/Latency/DSI/server.cpp +++ b/TAO/performance-tests/Latency/DSI/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index caefd2ff1a6..5803b9977d3 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -74,7 +74,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp index cbcd21bd8dc..e2e51c13a18 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp @@ -61,7 +61,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index 529769656f1..d9007a77da5 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp index 8d28b314596..b377c69f6dd 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp @@ -54,7 +54,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 529769656f1..d9007a77da5 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp index 8d28b314596..b377c69f6dd 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp @@ -54,7 +54,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index d35b4a08a41..716a84e6042 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 2914991822a..4f6b1de5845 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -53,7 +53,7 @@ set_rt_scheduling () + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index 526edd50312..e8188c08c68 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -57,7 +57,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 091ecb4f5f8..8587cedfeed 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -49,7 +49,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 4cef3ab975f..6badd57f616 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index 5940f002126..5a5677a4ff4 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -119,7 +119,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = ACE_Sched_Params::priority_max (policy); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index d1e5690f65f..2d937ba6028 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = ACE_Sched_Params::priority_max (policy); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index 0e1c3d78eed..3f678aa1b6d 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -118,7 +118,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = ACE_Sched_Params::priority_max (policy); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index 167267759b2..4cc17873754 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -39,7 +39,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_max (policy)); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index 7c0184fc5d9..08b6a53b82e 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -366,7 +366,7 @@ set_rt_mode () (ACE_Sched_Params::priority_min (policy) + ACE_Sched_Params::priority_max (policy)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int result = ACE_OS::sched_params (ACE_Sched_Params (policy, priority, diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index b450e05b3d5..f38ce3b0f29 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -42,7 +42,7 @@ set_rt_mode () (ACE_Sched_Params::priority_min (policy) + ACE_Sched_Params::priority_max (policy)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int result = ACE_OS::sched_params (ACE_Sched_Params (policy, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index 64c44e0d706..cf8de4e49ea 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -341,7 +341,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index d5d1921e003..d47149195b5 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -347,7 +347,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp index 0951ffe2be9..fdaa47719f4 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp @@ -53,7 +53,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp index 8498b310c13..f7813fce894 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp @@ -384,7 +384,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index 54ec9a64dde..44c7a7ba2fe 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -343,7 +343,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp index 3f26308a7ca..e3881b066dd 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index b159411c7d5..2049494d33e 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -517,7 +517,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp index 2b48adf7df4..968ba7c989a 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp @@ -340,7 +340,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index cf5aa69814b..85e878952a3 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp index efe0b8651db..8e896f6c934 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 529769656f1..d9007a77da5 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp index 29a4c32a8a0..96f776e6a87 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp @@ -75,7 +75,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 52c17060905..d3a8e1e97c8 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index dc169d494f8..6e417448509 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -16,10 +16,9 @@ TAO_Condition<MUTEX>::wait (MUTEX &mutex, abstime); } -// Peform an "alertable" timed wait. If the argument ABSTIME == 0 -// then we do a regular cond_wait(), else we do a timed wait for up to -// ABSTIME using the Solaris cond_timedwait() function. - +/// Peform an "alertable" timed wait. If the argument ABSTIME == 0 +/// then we do a regular cond_wait(), else we do a timed wait for up to +/// @a abstime template <class MUTEX> ACE_INLINE int TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime) { diff --git a/TAO/tests/Bug_3315_Regression/main.cpp b/TAO/tests/Bug_3315_Regression/main.cpp index 472ac65e3bf..708fd164aab 100644 --- a/TAO/tests/Bug_3315_Regression/main.cpp +++ b/TAO/tests/Bug_3315_Regression/main.cpp @@ -5,9 +5,6 @@ int result = 0; -#if defined (__SUNPRO_CC) -extern "C" -#endif /* __SUNPRO_CC */ ACE_THR_FUNC_RETURN main_orb(void*) { try diff --git a/TAO/tests/Bug_3321_Regression/main.cpp b/TAO/tests/Bug_3321_Regression/main.cpp index 125ea313226..3441bd1e3a7 100644 --- a/TAO/tests/Bug_3321_Regression/main.cpp +++ b/TAO/tests/Bug_3321_Regression/main.cpp @@ -11,9 +11,6 @@ int result = 0; -#if defined (__SUNPRO_CC) -extern "C" -#endif /* __SUNPRO_CC */ ACE_THR_FUNC_RETURN main_orb(void*) { try diff --git a/TAO/tests/IDL_Test/typeprefix.idl b/TAO/tests/IDL_Test/typeprefix.idl index 5fb34afb825..0e503d5bfa9 100644 --- a/TAO/tests/IDL_Test/typeprefix.idl +++ b/TAO/tests/IDL_Test/typeprefix.idl @@ -1,5 +1,5 @@ // Test a construct with typeprefix which failed when TAO_IDL was build -// with Intel C++ or Sun C++ +// with Intel C++ module A { diff --git a/TAO/tests/IDL_Test/union.idl b/TAO/tests/IDL_Test/union.idl index 0ea237b65e2..fdee107e2cf 100644 --- a/TAO/tests/IDL_Test/union.idl +++ b/TAO/tests/IDL_Test/union.idl @@ -53,10 +53,6 @@ module Necessary }; // Union with negative cases -// At the moment, the SunCC preprocessor separates the negative -// sign from the number. This causes problems for the scanner/lexer -// used by tao_idl. -#if !defined (__SUNPRO_CC) || (__SUNPRO_CC > 0x5140) union foo switch (short) { case -3: @@ -65,7 +61,6 @@ union foo switch (short) default: long foo_iface_member; case 0: long foo_iface_member2; }; -#endif // !__SUNPRO_CC || __SUNPRO_CC > 0x5120 // Make sure that CORBA_Any::to_* is used everywhere. module UnionDiscTest diff --git a/TAO/tests/MProfile/README b/TAO/tests/MProfile/README index c75aa6c0026..252e19f04ba 100644 --- a/TAO/tests/MProfile/README +++ b/TAO/tests/MProfile/README @@ -17,7 +17,7 @@ This is a test to see whether we generate exceptions as per the spec. When we loose connection with a connected server, the ORB would throw a COMM_FAILURE exception. This is platform dependent. One wouldn't see this on NT. The reason for this is the way TCP has been -been implemented on NT & Solaris. I am not going in to the details for +been implemented on NT. I am not going in to the details for this behaviour. TRANSIENT exceptions are thrown when the ORB has tried all the object references it has and is not able to establish connection with any of them (TRANSIENT exceptions are also thrown for diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp index 969d2a7a1ad..f97cd985f0a 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp @@ -25,7 +25,7 @@ file_Service_Config_Test () // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index bd10a07913b..ffbb009c40b 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r deleted file mode 100644 index 2be55e3fa32..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r +++ /dev/null @@ -1 +0,0 @@ -0 10000 20000 30000 diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r deleted file mode 100644 index 795a75037bc..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r +++ /dev/null @@ -1 +0,0 @@ -5000 25000
\ No newline at end of file diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r deleted file mode 100644 index 8274a68e2ae..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r +++ /dev/null @@ -1 +0,0 @@ -0 5000 25000
\ No newline at end of file diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl index 5d6fef3a998..4cfcd847707 100755 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl @@ -30,17 +30,9 @@ my $status = 0; $extra_client_args = "-k file://$client_iorfile -ORBdebuglevel $client_debuglevel -d $client_debug -x"; $extra_server_args = "-ORBdebuglevel $server_debuglevel -d $server_debug"; - -if ($OSNAME eq "solaris") { - $lanes = "lanes_r"; - $bands = "bands_r"; - $inv_prio = "invocation_priorities_r"; -} -else { - $lanes = "lanes"; - $bands = "bands"; - $inv_prio = "invocation_priorities"; -} +$lanes = "lanes"; +$bands = "bands"; +$inv_prio = "invocation_priorities"; sub setup_configurations_2 { diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 8ec4f0bf503..adf1da5926b 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, |