ChangeLogTag:Mon Jan 5 14:09:34 2004 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

4 files changed, 34 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c84d3715cf..7835aecc4b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Mon Jan  5 14:09:34 2004  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Log_Msg.cpp (log): 
+	* ace/OS_NS_Thread.cpp (to_string): Tandem NSK uses a struct for
+	  pthread_t.   Need changes to existing preprocessor #ifs in
+	  Log_Msg.cpp and OS_NS_Thread.cpp to handle this so they now
+	  read
+  
+          #  elif defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS)
+	  
+	  Thanks to Gary Maxey for this fix, which fixes bugid 1704.
+  
+	* ace/Handle_Set.cpp: The order of bits in the elements of the
+	  fd_set structure for the Tandem NSK platform is left-to-right rather
+	  than right-to-left like most other platforms except pSoS.  Therefore
+	  added 
+	
+  	  #  if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+  
+          to handle this situation.  Thanks to Gary Maxey <gary.maxey@hp.com>
+	  for reporting this and providing the fix.  This fixes bugid 1703.
+
 Mon Jan  5 12:43:01 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* ace/Name_Proxy.cpp:
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp
index 5b65dbf9fd4..7199533f1a5 100644
--- a/ace/Handle_Set.cpp
+++ b/ace/Handle_Set.cpp
@@ -236,8 +236,8 @@ ACE_Handle_Set::set_max (ACE_HANDLE current_max)
            maskp[i] == 0;
            i--)
         continue;
-
-#if defined (ACE_PSOS)
+#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+      // bits are in reverse order, MSB (sign bit) = bit 0.
       this->max_handle_ = ACE_MULT_BY_WORDSIZE (i);
       for (fd_mask val = maskp[i];
            (val & ACE_MSB_MASK) != 0;
@@ -322,7 +322,8 @@ ACE_Handle_Set_Iterator::operator () (void)
       // Increment the iterator and advance to the next bit in this
       // word.
       this->handle_index_++;
-#  if defined (ACE_PSOS)
+#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+      // bits are in reverse order, MSB (sign bit) = bit 0.
       this->word_val_ = (this->word_val_ << 1);
 #  else
       this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
@@ -363,7 +364,8 @@ ACE_Handle_Set_Iterator::operator () (void)
       // represents (this information is used by subsequent calls to
       // <operator()>).
 
-#  if defined (ACE_PSOS) // bits are in reverse order, MSB (sign bit) = bit 0.
+#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+      // bits are in reverse order, MSB (sign bit) = bit 0.
       for (;
            this->word_val_ > 0;
            this->word_val_ = (this->word_val_ << 1))
@@ -482,7 +484,8 @@ ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs)
     // Loop until we get <word_val_> to have its least significant bit
     // enabled, keeping track of which <handle_index> this represents
     // (this information is used by <operator()>).
-#  if defined (ACE_PSOS) // bits are in reverse order, MSB (sign bit) = bit 0.
+#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+    // bits are in reverse order, MSB (sign bit) = bit 0.
     for (this->word_val_ = maskp[this->word_num_];
          this->word_val_ > 0;
          this->word_val_ = (this->word_val_ << 1))
@@ -549,7 +552,8 @@ ACE_Handle_Set_Iterator::reset_state (void)
     // Loop until we get <word_val_> to have its least significant bit
     // enabled, keeping track of which <handle_index> this represents
     // (this information is used by <operator()>).
-#  if defined (ACE_PSOS) // bits are in reverse order, MSB (sign bit) = bit 0.
+#if defined (ACE_PSOS) || defined (ACE_TANDEM_NSK_BIT_ORDER)
+    // bits are in reverse order, MSB (sign bit) = bit 0.
     for (this->word_val_ = maskp[this->word_num_];
          this->word_val_ > 0;
          this->word_val_ = (this->word_val_ << 1))
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 48dc9c97849..0367d483615 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -1618,7 +1618,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   else
                     this_len = ACE_OS::sprintf (bp, format,
                                                 pthread_getunique_np (&t_id));
-#  elif defined (ACE_MVS)
+#  elif defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS)
                   // MVS's pthread_t is a struct... yuck. So use the ACE 5.0
                   // code for it.
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u"));
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index ead5b571151..3e1e3826121 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -169,7 +169,7 @@ ACE_Thread_ID::to_string (char* thr_id)
                   // the one seen in the debugger as well.
                   ACE_OS::sprintf (thr_id, format,
                                    pthread_getunique_np(&t_id));
-#  elif defined (ACE_MVS)
+#  elif defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS)
                   // MVS's pthread_t is a struct... yuck. So use the ACE 5.0
                   // code for it.
                   ACE_OS::strcpy (fp, "u");