ChangeLogTag:Mon Jun 19 17:33:28 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

7 files changed, 99 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 20a8f518d3e..ddc15ae8224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Mon Jun 19 17:33:28 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/OS.h: Removed the special case check for
+  
+          #     if defined (ACE_HAS_IRIX62_THREADS)
+	  #       define THR_SCOPE_SYSTEM        0x00100000
+	  #     else
+  
+          and just used this:
+	  
+	  #       define THR_SCOPE_SYSTEM        THR_BOUND
+  
+          Thanks to John Foresteire <John_J_Foresteire@res.raytheon.com>
+	  for this suggestion.
+
 Mon Jun 19 12:38:58 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/config-all.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 20a8f518d3e..ddc15ae8224 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Mon Jun 19 17:33:28 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/OS.h: Removed the special case check for
+  
+          #     if defined (ACE_HAS_IRIX62_THREADS)
+	  #       define THR_SCOPE_SYSTEM        0x00100000
+	  #     else
+  
+          and just used this:
+	  
+	  #       define THR_SCOPE_SYSTEM        THR_BOUND
+  
+          Thanks to John Foresteire <John_J_Foresteire@res.raytheon.com>
+	  for this suggestion.
+
 Mon Jun 19 12:38:58 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/config-all.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 20a8f518d3e..ddc15ae8224 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Mon Jun 19 17:33:28 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/OS.h: Removed the special case check for
+  
+          #     if defined (ACE_HAS_IRIX62_THREADS)
+	  #       define THR_SCOPE_SYSTEM        0x00100000
+	  #     else
+  
+          and just used this:
+	  
+	  #       define THR_SCOPE_SYSTEM        THR_BOUND
+  
+          Thanks to John Foresteire <John_J_Foresteire@res.raytheon.com>
+	  for this suggestion.
+
 Mon Jun 19 12:38:58 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/config-all.h:
diff --git a/TAO/examples/Load_Balancing_persistent/README b/TAO/examples/Load_Balancing_persistent/README
index dbc704ef933..df36a00bb81 100755
--- a/TAO/examples/Load_Balancing_persistent/README
+++ b/TAO/examples/Load_Balancing_persistent/README
@@ -1,15 +1,16 @@
 AIM:
 ---
+
 This is an extension of the Load_Balancing_Service example in
-$TAO_ROOT/examples/Load_Balancing. The aim of this example is to
-show a methodology to preserve the state of the service.  Here, the
-service stores the object reference of multiple copies of servers
-registered, so that load can be balanced among the registered
-servers. If the load balancing service fails, the references of the
-servers registered, is read from the persistent storage and can be used
-to satisfy the clients request. The core functionality is not much
-different from that of the normal Load_Balancing_Service in 
-$TAO_ROOT/examples/Load_Balancing.   
+$TAO_ROOT/examples/Load_Balancing. The aim of this example is to show
+a methodology to preserve the state of the service.  Here, the service
+stores the object reference of multiple copies of servers registered,
+so that load can be balanced among the registered servers. If the load
+balancing service fails, the references of the servers registered, is
+read from the persistent storage and can be used to satisfy the
+clients request. The core functionality is not much different from
+that of the normal Load_Balancing_Service in
+$TAO_ROOT/examples/Load_Balancing.
 
 Usage:
 -----
diff --git a/TAO/examples/README b/TAO/examples/README
index 01042d25913..15494c690b6 100644
--- a/TAO/examples/README
+++ b/TAO/examples/README
@@ -14,20 +14,61 @@ examples:
           This directory illustrates how to write a Borland C++
           Builder application using ACE+TAO.
 
+        . Buffered _AMI
+
+          This is a simple test for buffered AMI calls.  It invokes
+          multiple AMI calls.  Due to buffering in the ORB, the calls
+          are automatically bunched together instead of being
+          delivered to the server upon every invocation.
+
+        . Buffered _Oneways
+
+          This is a simple test for buffered oneways.  It invokes
+          multiple oneway calls.  Due to buffering in the ORB, the
+          calls are automatically bunched together instead of being
+          delivered to the server upon every invocation.
+
         . Callback_Quoter
 
           Illustrates how to implement distributed callbacks using
           TAO.
 
+        . Content_Server
+        
+          Three examples that illustrate how to program client/server
+          applications for downloading large file content via SMI,
+          AMI, and the Iterator and Observer patterns.
+
         . Event_Comm
 
           Another illustration of how to implement distributed
           callbacks using TAO.
 
+        . Load_Balancing
+
+          A simple CORBA load balancing service that allows clients to
+          treat a group of objects as an equivalence class to improve
+          distributed load balancing.
+
+        . Load_Balancing_persistent
+        
+          A variant of the preceding example that keeps the state of
+          the load balancer persistent.
+
         . Logging 
 
           This example implements a simple logging service using TAO.
 
+        . mfc
+
+          This is an short example to show how to integrate TAO and
+          MFC base GUI applications.
+
+        . OBV
+
+          This is a demonstration of the CORBA 2.3 valuetype feature from
+          the Object-by-Value specification.
+
         . Persistent_Grid
 
           This example shows how to store the state of CORBA servants in
@@ -38,11 +79,6 @@ examples:
           Contains various small examples of POA features based on
           the OMG POA specification.
 
-        . OBV
-
-          This is a demonstration of the CORBA 2.3 valuetype feature from
-          the Object-by-Value specification.
-
         . Quoter
         
           Illustrates how to use the Global POA options with multiple
diff --git a/ace/INET_Addr.i b/ace/INET_Addr.i
index ba218c3a0b4..4bb7dd4d5ae 100644
--- a/ace/INET_Addr.i
+++ b/ace/INET_Addr.i
@@ -55,5 +55,6 @@ ACE_INLINE int
 ACE_INET_Addr::operator < (const ACE_INET_Addr &rhs)
 {
   return this->get_ip_address () < rhs.get_ip_address ()
-    || this->get_port_number () < rhs.get_port_number ();
+    || (this->get_ip_address () == rhs.get_ip_address ()
+        && this->get_port_number () < rhs.get_port_number ());
 }
diff --git a/ace/OS.h b/ace/OS.h
index 22baf2480d1..022958ba018 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -2040,11 +2040,7 @@ typedef pthread_mutex_t ACE_thread_mutex_t;
 #     define THR_SCHED_FIFO          0x00020000
 #     define THR_SCHED_RR            0x00040000
 #     define THR_SCHED_DEFAULT       0x00080000
-#     if defined (ACE_HAS_IRIX62_THREADS)
-#       define THR_SCOPE_SYSTEM        0x00100000
-#     else
-#       define THR_SCOPE_SYSTEM        THR_BOUND
-#     endif /* ACE_HAS_IRIX62_THREADS */
+#     define THR_SCOPE_SYSTEM        THR_BOUND
 #     define THR_SCOPE_PROCESS       0x00200000
 #     define THR_INHERIT_SCHED       0x00400000
 #     define THR_EXPLICIT_SCHED      0x00800000