ChangeLogTag:Mon Oct 25 00:24:16 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

9 files changed, 139 insertions, 147 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index fd9a82e7a37..06e75b14959 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -4,17 +4,17 @@
 // ============================================================================
 //
 // = LIBRARY
-//	TAO/tests/Cubit/TAO/DII_Cubit
+//      TAO/tests/Cubit/TAO/DII_Cubit
 //
 // = FILENAME
-//	client.cpp
+//      client.cpp
 //
 // = DESCRIPTION
 //      This class implements a simple CORBA client of the Cubit
 //      interface using DII functionality.
 //
 // = AUTHOR
-//	Jeff Parsons <parsons@cs.wustl.edu>
+//      Jeff Parsons <parsons@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -39,7 +39,7 @@ const int SMALL_LONG_SEQ_LENGTH = 4;
 const int LARGE_LONG_SEQ_LENGTH = 1024;
 const int NUMBER_OF_TESTS = 10;
 
-class DII_Cubit_Client 
+class DII_Cubit_Client
 {
   // = TITLE
   //    Defines a class that encapsulates behaviour of a Cubit client
@@ -216,15 +216,14 @@ DII_Cubit_Client::init (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Get a Cubit object with a DII request on the Cubit factory.
-      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit", 
+      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit",
                                                                ACE_TRY_ENV));
 
       ACE_TRY_CHECK;
 
       // make_cubit takes a char* arg that it doesn't use, but we must
       // still include it in the request.
-      CORBA::String dummy = ACE_const_cast (char *,
-                                            "");
+      const char * dummy = "";
 
       mc_req->add_in_arg () <<= dummy;
 
@@ -269,10 +268,10 @@ DII_Cubit_Client::parse_args (void)
       case 'd':   // debug flag
         TAO_debug_level++;
         break;
-      case 'n':	  // loop count
+      case 'n':   // loop count
         this->loop_count_ = ACE_OS::atoi (opts.optarg);
         break;
-      case 'i':	  // Get the IOR from the command line.
+      case 'i':   // Get the IOR from the command line.
         this->factory_IOR_ = opts.optarg;
         break;
       case 'f':   // Read the IOR from the file.
@@ -406,7 +405,7 @@ DII_Cubit_Client::cube_short_dii (void)
 
       req->return_value () >>= ret_short;
 
-      if (ret_short != arg_short * arg_short * arg_short) 
+      if (ret_short != arg_short * arg_short * arg_short)
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_short_dii -- bad results\n"));
@@ -451,7 +450,7 @@ DII_Cubit_Client::cube_long_dii (void)
 
       req->return_value () >>= ret_long;
 
-      if (ret_long != arg_long * arg_long * arg_long) 
+      if (ret_long != arg_long * arg_long * arg_long)
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_long_dii -- bad results\n"));
@@ -499,7 +498,7 @@ DII_Cubit_Client::cube_octet_dii (void)
       CORBA::Any::to_octet to_ret_octet (ret_octet);
       req->return_value () >>= to_ret_octet;
 
-      if (ret_octet != arg_octet * arg_octet * arg_octet) 
+      if (ret_octet != arg_octet * arg_octet * arg_octet)
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_octet_dii -- bad results\n"));
@@ -519,7 +518,7 @@ DII_Cubit_Client::cube_octet_dii (void)
 
 void
 DII_Cubit_Client::cube_union_dii (void)
-{ 
+{
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
@@ -552,15 +551,15 @@ DII_Cubit_Client::cube_union_dii (void)
       Cubit::oneof* ret_ptr;
       req->return_value () >>= ret_ptr;
 
-      if (ret_ptr->cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l 
-          || ret_ptr->cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s 
-          || ret_ptr->cm ().o != arg_union.cm ().o * arg_union.cm ().o * arg_union.cm ().o) 
+      if (ret_ptr->cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l
+          || ret_ptr->cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s
+          || ret_ptr->cm ().o != arg_union.cm ().o * arg_union.cm ().o * arg_union.cm ().o)
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_union_dii -- bad results\n"));
 
           this->error_count_++;
-        } 
+        }
     }
   ACE_CATCHANY
     {
@@ -604,9 +603,9 @@ DII_Cubit_Client::cube_struct_dii (void)
 
       req->return_value () >>= ret_struct_ptr;
 
-      if (ret_struct_ptr->l != arg_struct.l * arg_struct.l * arg_struct.l 
-          || ret_struct_ptr->s != arg_struct.s * arg_struct.s * arg_struct.s 
-          || ret_struct_ptr->o != arg_struct.o * arg_struct.o * arg_struct.o) 
+      if (ret_struct_ptr->l != arg_struct.l * arg_struct.l * arg_struct.l
+          || ret_struct_ptr->s != arg_struct.s * arg_struct.s * arg_struct.s
+          || ret_struct_ptr->o != arg_struct.o * arg_struct.o * arg_struct.o)
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_struct_dii -- bad results\n"));
@@ -639,7 +638,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
       // Return value holder is set to a different length to test resizing.
       Cubit::octet_seq arg_octet_seq (length), *ret_octet_seq_ptr;
       arg_octet_seq.length (length);
-      arg_octet_seq[0] = 4;  
+      arg_octet_seq[0] = 4;
 
       // Add octet sequence to the request arg list
 
@@ -658,7 +657,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
       req->return_value () >>= ret_octet_seq_ptr;
 
       // Check for correct length.
-      if (ret_octet_seq_ptr->length () != arg_octet_seq.length ()) 
+      if (ret_octet_seq_ptr->length () != arg_octet_seq.length ())
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_octet_seq_dii -- bad length\n"));
@@ -667,7 +666,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
         }
 
       // Check for correct value(s).
-      if ((*ret_octet_seq_ptr)[0] != arg_octet_seq[0] * arg_octet_seq[0] * arg_octet_seq[0]) 
+      if ((*ret_octet_seq_ptr)[0] != arg_octet_seq[0] * arg_octet_seq[0] * arg_octet_seq[0])
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_octet_seq_dii -- bad results\n"));
@@ -706,7 +705,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
 
       // Add the long_seq to the request arg list.
       req->add_in_arg () <<= arg_long_seq;
-  
+
       req->set_return_type (Cubit::_tc_long_seq);
 
       // Invoke, check for an exception and verify the result.
@@ -720,7 +719,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
       req->return_value () >>= ret_long_seq_ptr;
 
       // Check for correct length.
-      if (ret_long_seq_ptr->length () != arg_long_seq.length ()) 
+      if (ret_long_seq_ptr->length () != arg_long_seq.length ())
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_long_seq_dii -- bad length\n"));
@@ -729,7 +728,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
         }
 
       // Check for correct value(s).
-      if ((*ret_long_seq_ptr)[0] != arg_long_seq[0] * arg_long_seq[0] * arg_long_seq[0]) 
+      if ((*ret_long_seq_ptr)[0] != arg_long_seq[0] * arg_long_seq[0] * arg_long_seq[0])
         {
           ACE_ERROR ((LM_ERROR,
                       "cube_long_seq_dii -- bad results\n"));
@@ -811,7 +810,7 @@ DII_Cubit_Client::run (void)
 
       dii_timer.elapsed_time (dii_elapsed_time);
 
-      this->print_stats (this->stats_messages_[j], 
+      this->print_stats (this->stats_messages_[j],
                          dii_elapsed_time);
     }
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 921ef3474e3..44a8419de32 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -154,7 +154,7 @@ Cubit_Task::initialize_orb (void)
   return 0;
 }
 
-CORBA::String
+char*
 Cubit_Task::get_servant_ior (u_int index)
 {
   if (index >= num_of_objs_)
@@ -185,7 +185,7 @@ Cubit_Task::create_servants (void)
 
       // Create the array of strings.
       ACE_NEW_RETURN (this->servants_iors_,
-                      CORBA::String [this->num_of_objs_],
+                      char* [this->num_of_objs_],
                       -1);
 
       char *buffer;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 51071c0ce3a..1094e02c6db 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -43,7 +43,7 @@ public:
   virtual int svc (void);
   // Active Object entry point.
 
-  CORBA::String get_servant_ior (u_int index);
+  char* get_servant_ior (u_int index);
   // Gets the ior of the cubit servant in this task.
 
 protected:
@@ -75,7 +75,7 @@ private:
   Cubit_i **servants_;
   // Array to hold the servants.
 
-  CORBA::String *servants_iors_;
+  char **servants_iors_;
   // IOR strings of the servants.
 
   u_int task_id_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 99405a0534a..ad2f4679a71 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -127,7 +127,7 @@ Server::write_iors (void)
 
   // By this time the num of objs should be set properly.
   ACE_NEW_RETURN (this->cubits_,
-                  CORBA::String [GLOBALS::instance ()->num_of_objs],
+                  char* [GLOBALS::instance ()->num_of_objs],
                   -1);
 
   this->cubits_[0] = ACE_OS::strdup (this->high_priority_task_->get_servant_ior (0));
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
index 9a2432155c9..8e0ba662466 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -99,7 +99,7 @@ private:
   char **argv_;
   // Arguments for the ORB.
 
-  CORBA::String *cubits_;
+  char * *cubits_;
   // Array to hold pointers to the Cubit objects.
 
   Cubit_Task *high_priority_task_;
@@ -143,10 +143,3 @@ private:
 };
 
 #endif /* SERVER_H */
-
-
-
-
-
-
-
diff --git a/TAO/performance-tests/Thruput/TAO/client.cpp b/TAO/performance-tests/Thruput/TAO/client.cpp
index a2e599fd155..5098c471fd7 100644
--- a/TAO/performance-tests/Thruput/TAO/client.cpp
+++ b/TAO/performance-tests/Thruput/TAO/client.cpp
@@ -53,7 +53,7 @@ CORBA::Long verbose = 0;        // 0=print basic info, 1=print cpu
 CORBA::Char fmt = 'K';          // output
                                 // format:k=kilobits,K=kilobytes, m = megabits,
                                 // M = megabytes, g = gigabits, G = gigabytes
-CORBA::String title = 0;        // title of file to gather statistics
+char* title = 0;        // title of file to gather statistics
 char stats[128];                // gathering the statistics
 unsigned long srcDataSize;      // Total amount of source data
 unsigned long nbytes;           // bytes on net
@@ -86,59 +86,59 @@ main (int argc, char *argv[])
   while ((c = get_opt ()) != -1)
     {
       switch (c)
-	{
-	case 'i':
-	  ior = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'L':
-	  title = ACE_OS::strdup (get_opt.optarg);
-	  break;
-	case 'd':
-	  TAO_debug_level = ACE_OS::atoi (get_opt.optarg);
-	  if (TAO_debug_level > 10)
-	    TAO_debug_level = 10;
-	  break;
-	case 'l':
-	  buflen = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'm':
-	  fmt = *get_opt.optarg;
-	  break;
-	case 'S':       /* total source data to send. */
-	  srcDataSize = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'q':       /* Send sequence of desired data type */
-	  switch(*get_opt.optarg){
-	  case 's':
-	    dt = SEND_SHORT;
-	    break;
-	  case 'l':
-	    dt = SEND_LONG;
-	    break;
-	  case 'd':
-	    dt = SEND_DOUBLE;
-	    break;
-	  case 'c':
-	    dt = SEND_CHAR;
-	    break;
-	  case 'o':
-	    dt = SEND_OCTET;
-	    break;
-	  case 'S':
-	    dt = SEND_STRUCT;
-	    break;
-	  case 'C':
-	    dt = SEND_COMPOSITE;
-	    break;
-	  }
-	  break;
+        {
+        case 'i':
+          ior = ACE_OS::strdup (get_opt.optarg);
+          break;
+        case 'L':
+          title = ACE_OS::strdup (get_opt.optarg);
+          break;
+        case 'd':
+          TAO_debug_level = ACE_OS::atoi (get_opt.optarg);
+          if (TAO_debug_level > 10)
+            TAO_debug_level = 10;
+          break;
+        case 'l':
+          buflen = ACE_OS::atoi (get_opt.optarg);
+          break;
+        case 'v':
+          verbose = 1;
+          break;
+        case 'm':
+          fmt = *get_opt.optarg;
+          break;
+        case 'S':       /* total source data to send. */
+          srcDataSize = ACE_OS::atoi (get_opt.optarg);
+          break;
+        case 'q':       /* Send sequence of desired data type */
+          switch(*get_opt.optarg){
+          case 's':
+            dt = SEND_SHORT;
+            break;
+          case 'l':
+            dt = SEND_LONG;
+            break;
+          case 'd':
+            dt = SEND_DOUBLE;
+            break;
+          case 'c':
+            dt = SEND_CHAR;
+            break;
+          case 'o':
+            dt = SEND_OCTET;
+            break;
+          case 'S':
+            dt = SEND_STRUCT;
+            break;
+          case 'C':
+            dt = SEND_COMPOSITE;
+            break;
+          }
+          break;
         case 'f':
           ior = read_ior (get_opt.optarg);
           break;
-	default:
+        default:
           return print_usage ();
         }
     }
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
       //
       // Transmitter
       //
-      
+
       // get a handle to the ORB
       orb_ptr = CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -163,7 +163,7 @@ main (int argc, char *argv[])
       if (!CORBA::is_nil (objref))
         {
           // if it is a valid obj ref, narrow it to a ttcp_sequence
-          // CORBA object 
+          // CORBA object
           ttcp_seq = ttcp_sequence::_narrow (objref, ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
@@ -179,7 +179,7 @@ main (int argc, char *argv[])
               // Prepare the Message to be sent
               //
 
-              
+
               // first allocate a buffer of the desired size and alignment
               errno = 0;
               if ((buf = (char *) ACE_OS::malloc (buflen)) == (char *) NULL)
diff --git a/TAO/performance-tests/Thruput/TAO/server.cpp b/TAO/performance-tests/Thruput/TAO/server.cpp
index 62f593b0683..7c7fa6ba0c5 100644
--- a/TAO/performance-tests/Thruput/TAO/server.cpp
+++ b/TAO/performance-tests/Thruput/TAO/server.cpp
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   CORBA::Object_var obj_var;
   const char *oa_name = "RootPOA"; // name of our OA
   const char *orb_name = "internet"; // name of our ORB
-  CORBA::String      str; // for stringified representation of the object reference
+  char* str; // for stringified representation of the object reference
   FILE *ior_file = 0;
 
   // initialize the underlying ORB and get a handle to it
@@ -146,7 +146,7 @@ main (int argc, char **argv)
               break;
             }
         }
-      
+
       //
       // Receiver
       //
@@ -177,7 +177,7 @@ main (int argc, char **argv)
         {
           ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str));
         }
-      
+
       if (ior_file != 0)
         {
           // write ior to a file
@@ -190,7 +190,7 @@ main (int argc, char **argv)
       quantify_clear_data();
       quantify_start_recording_data();
 #endif /* ACE_HAS_QUANTIFY */
-      
+
       // Handle requests for this object until we're killed, or one of the
       // methods asks us to exit.
       if (orb_var->run () == -1)
diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_decl.h b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
index 8271e8111c7..d0eeba8cc79 100644
--- a/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
+++ b/TAO/performance-tests/Thruput/TAO/ttcp_decl.h
@@ -32,7 +32,7 @@
 ***************/
 int err (const char *s);
 void mes (const char *s);
-CORBA::String outfmt (CORBA::Double b);
+char* outfmt (CORBA::Double b);
 void prep_timer (void);
 CORBA::Double read_timer (CORBA::Char *str, CORBA::Long len);
 void prusage (CORBA::Char *outp);
diff --git a/TAO/performance-tests/Thruput/TAO/utils.cpp b/TAO/performance-tests/Thruput/TAO/utils.cpp
index b88157fcd22..28f71d9c856 100644
--- a/TAO/performance-tests/Thruput/TAO/utils.cpp
+++ b/TAO/performance-tests/Thruput/TAO/utils.cpp
@@ -41,7 +41,7 @@ void mes (const char* s)
 
 // does the formatting for the desired units in which the result is to be
 // displayed
-CORBA::String
+char*
 outfmt (CORBA::Double b)
 {
   static CORBA::Char obuf[50];
@@ -175,34 +175,34 @@ FillPattern (register CORBA::Char *cp, register CORBA::Long bufLen, CORBA::ULong
        SeqPtr [i].msgs.length (numUpdates);
 
        for (int j = 0; j < numUpdates; ++j)
-	 {
-	   SeqPtr [i].msgs[j].oumh (RtiObjectUpdateMessageHeader ());
-	   RtiObjectUpdateMessageHeader & oumh = SeqPtr [i].msgs[j].oumh ();
-	   oumh.updateLength = 2001; // redundant
-	   oumh.updateTag = 2002;
-	   oumh.objectHandle = 2003;
-	   oumh.timestamp = 3.14159;
-	   oumh.eventRetractionHandle = 2004;
-	   oumh.classHandle = 2005;
-	   oumh.sendingFederateHandle = 2006;
-	   oumh.userTag = CORBA::string_dup ("beefcake!");
-	   oumh.regionData.length(0);
-	   oumh.transportationHandle = 1;
-	   oumh.orderingHandle = 1;
-	   oumh.messagePayload.length (numAttrs);
-
-	   for (int k = 0; k < numAttrs; ++k)
-	     {
-	       oumh.messagePayload[k] = HandleValuePair ();
-	       HandleValuePair &hvp = oumh.messagePayload[k];
-	       hvp.handle = k * k;
-	       char *d1 = "somedata";
-	       hvp.data.length (ACE_OS::strlen (d1)+1);
-	       ACE_OS::strcpy ((char *) hvp.data.get_buffer (), d1);
-	     }
-	   num -= sizeof (SeqPtr [i]);
-	   printf ("SIZE OF RTIPACKET IS %d", sizeof (SeqPtr [i]));
-	 }
+         {
+           SeqPtr [i].msgs[j].oumh (RtiObjectUpdateMessageHeader ());
+           RtiObjectUpdateMessageHeader & oumh = SeqPtr [i].msgs[j].oumh ();
+           oumh.updateLength = 2001; // redundant
+           oumh.updateTag = 2002;
+           oumh.objectHandle = 2003;
+           oumh.timestamp = 3.14159;
+           oumh.eventRetractionHandle = 2004;
+           oumh.classHandle = 2005;
+           oumh.sendingFederateHandle = 2006;
+           oumh.userTag = CORBA::string_dup ("beefcake!");
+           oumh.regionData.length(0);
+           oumh.transportationHandle = 1;
+           oumh.orderingHandle = 1;
+           oumh.messagePayload.length (numAttrs);
+
+           for (int k = 0; k < numAttrs; ++k)
+             {
+               oumh.messagePayload[k] = HandleValuePair ();
+               HandleValuePair &hvp = oumh.messagePayload[k];
+               hvp.handle = k * k;
+               char *d1 = "somedata";
+               hvp.data.length (ACE_OS::strlen (d1)+1);
+               ACE_OS::strcpy ((char *) hvp.data.get_buffer (), d1);
+             }
+           num -= sizeof (SeqPtr [i]);
+           printf ("SIZE OF RTIPACKET IS %d", sizeof (SeqPtr [i]));
+         }
 
        fill in the RtiPacket
      }
@@ -396,7 +396,7 @@ prusage (char *outp)
             break;
 
           case 'S':
-	    ACE_OS::sprintf (outp, "%f ", et.system_time);
+            ACE_OS::sprintf (outp, "%f ", et.system_time);
             END (outp);
             break;
 
@@ -406,11 +406,11 @@ prusage (char *outp)
             break;
 
           case 'P':
-	    ACE_OS::sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
-	    END (outp);
+            ACE_OS::sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
+            END (outp);
             break;
 
-	    /*possible thing to add in is the equivalent for case X, D, K, M, F, and R for prusage_t*/
+            /*possible thing to add in is the equivalent for case X, D, K, M, F, and R for prusage_t*/
 #if !defined(SYSV)
 #   if defined (ACE_HAS_PRUSAGE_T)
           case 'W':
@@ -420,7 +420,7 @@ prusage (char *outp)
             break;
 
           case 'X':
-	    // ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (rusage.ru_ixrss) / t);
+            // ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (rusage.ru_ixrss) / t);
             //END (outp);
             break;
 
@@ -432,23 +432,23 @@ prusage (char *outp)
 
           case 'K':
             //ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-	    //        (rusage.ru_ixrss + rusage.ru_isrss + rusage.ru_idrss) / t);
+            //        (rusage.ru_ixrss + rusage.ru_isrss + rusage.ru_idrss) / t);
             //END (outp);
             break;
 
           case 'M':
-	    /* ACE_OS::sprintf (outp, "%d", rusage.ru_maxrss / 2);
+            /* ACE_OS::sprintf (outp, "%d", rusage.ru_maxrss / 2);
             END (outp);*/
             break;
 
           case 'F':
-	    /*
+            /*
             ACE_OS::sprintf (outp, "%d", rusage.ru_majflt);
-	    END (outp);*/
+            END (outp);*/
             break;
 
           case 'R':
-	    /*ACE_OS::sprintf (outp, "%d", rusage.ru_minflt);
+            /*ACE_OS::sprintf (outp, "%d", rusage.ru_minflt);
             END (outp);*/
             break;
 
@@ -462,18 +462,18 @@ prusage (char *outp)
             END (outp);
             break;
           case 'C':
-	    ACE_OS::sprintf (outp, "%d+%d", rusage.pr_vctx, rusage.pr_ictx);
+            ACE_OS::sprintf (outp, "%d+%d", rusage.pr_vctx, rusage.pr_ictx);
             END (outp);
             break;
 #   elif defined (ACE_HAS_GETRUSAGE)
-	  case 'W':
+          case 'W':
             i = rusage.ru_nswap;;
             ACE_OS::sprintf (outp, "%d", i);
             END (outp);
             break;
 
           case 'X':
-	    ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (int) ((rusage.ru_ixrss) / t));
+            ACE_OS::sprintf (outp, "%d", t == 0 ? 0 : (int) ((rusage.ru_ixrss) / t));
             END (outp);
             break;
 
@@ -485,22 +485,22 @@ prusage (char *outp)
 
           case 'K':
             ACE_OS::sprintf (outp, "%d", t == 0 ? 0 :
-	            (int) ((rusage.ru_ixrss + rusage.ru_isrss + rusage.ru_idrss) / t));
+                    (int) ((rusage.ru_ixrss + rusage.ru_isrss + rusage.ru_idrss) / t));
             END (outp);
             break;
 
           case 'M':
-	    ACE_OS::sprintf (outp, "%ld", rusage.ru_maxrss / 2);
+            ACE_OS::sprintf (outp, "%ld", rusage.ru_maxrss / 2);
             END (outp);
             break;
 
           case 'F':
             ACE_OS::sprintf (outp, "%ld", rusage.ru_majflt);
-	    END (outp);
+            END (outp);
             break;
 
           case 'R':
-	    ACE_OS::sprintf (outp, "%ld", rusage.ru_minflt);
+            ACE_OS::sprintf (outp, "%ld", rusage.ru_minflt);
             END (outp);
             break;
 
@@ -514,8 +514,8 @@ prusage (char *outp)
             END (outp);
             break;
 
-	  case 'C':
-	    ACE_OS::sprintf (outp, "%ld+%ld",
+          case 'C':
+            ACE_OS::sprintf (outp, "%ld+%ld",
                              rusage.ru_nvcsw, rusage.ru_nivcsw);
             END (outp);
             break;