Tue May 26 17:09:00 UTC 2009 Carlos O'Ryan <coryan@atdesk.com>

13 files changed, 94 insertions, 66 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d6041517252..933d46b6dfc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Tue May 26 17:09:00 UTC 2009  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tao/Transport.h:
+        * tao/IIOP_Transport.h:
+        * tao/Transport.cpp:
+        * tao/IIOP_Transport.cpp:
+        * tests/Bug_3647_Regression/client.cpp:
+        * tests/Bug_3647_Regression/Middle_Impl.cpp:
+        * tests/Bug_3647_Regression/Middle_Impl.h:
+        * tests/Bug_3647_Regression/middle_server.cpp:
+        * tests/Bug_3647_Regression/Test.idl:
+        * tests/Bug_3647_Regression/Backend_Impl.cpp:
+        * tests/Bug_3647_Regression/run_test.pl:
+        * tests/Bug_3647_Regression/Backend_Impl.h:
+          Fix fuzz problems, tabs, indentation in perl scripts, the Id
+          stuff, etc.
+
 Tue May 26 11:25:03 UTC 2009  Carlos O'Ryan  <coryan@glamdring>
 
         * tao/Transport.h:
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 8d6a0d4854b..9683b4292e2 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -88,7 +88,7 @@ TAO_IIOP_Transport::sendfile (TAO_MMAP_Allocator * allocator,
                               iovec * iov,
                               int iovcnt,
                               size_t &bytes_transferred,
-			      TAO::Transport::Drain_Constraints const & dc)
+                              TAO::Transport::Drain_Constraints const & dc)
 {
   // @@ We should probably set the TCP_CORK socket option to minimize
   //    network operations.  It may also be useful to adjust the
@@ -107,7 +107,7 @@ TAO_IIOP_Transport::sendfile (TAO_MMAP_Allocator * allocator,
     {
       if (-1 == allocator->offset (index->iov_base))
         return this->send (iov, iovcnt, bytes_transferred,
-			   this->io_timeout(dc));
+                           this->io_timeout(dc));
     }
 
   ssize_t retval = -1;
@@ -130,7 +130,7 @@ TAO_IIOP_Transport::sendfile (TAO_MMAP_Allocator * allocator,
         {
           int val = 0;
           if (ACE::enter_send_timedwait (out_fd,
-					 this->io_timeout(dc), val) == -1)
+                                         this->io_timeout(dc), val) == -1)
             return retval;
           else
             {
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 69609044e1d..a908ed36d87 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -84,7 +84,7 @@ protected:
                             iovec * iov,
                             int iovcnt,
                             size_t &bytes_transferred,
-			    TAO::Transport::Drain_Constraints const & dc);
+                            TAO::Transport::Drain_Constraints const & dc);
 #endif  /* TAO_HAS_SENDFILE==1 */
 
 
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 1d8c3c93809..0097d789c8f 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -528,7 +528,7 @@ TAO_Transport::handle_output (TAO::Transport::Drain_Constraints const & dc)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output")
-		  ACE_TEXT (" - block_on_io=%d, timeout=%d.%06d\n"),
+                  ACE_TEXT (" - block_on_io=%d, timeout=%d.%06d\n"),
                   this->id (),
               dc.block_on_io(),
               dc.timeout() ? dc.timeout()->sec() : -1,
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 2fd5dd7d9c4..40ab7fac84e 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -503,7 +503,7 @@ public:
                             iovec * iov,
                             int iovcnt,
                             size_t &bytes_transferred,
-			    TAO::Transport::Drain_Constraints const & dc);
+                            TAO::Transport::Drain_Constraints const & dc);
 #endif  /* TAO_HAS_SENDFILE==1 */
 
 
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
index 213f90b907f..d3752c32b41 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
@@ -1,6 +1,8 @@
 #include "Backend_Impl.h"
 #include "ace/OS.h"
 
+ACE_RCSID(Bug_3647_Regression, Backend_Impl, "$Id$")
+
 Bug_3647_Regression::Backend_Impl::
 Backend_Impl(CORBA::ORB_ptr orb, bool verbose)
   : POA_Bug_3647_Regression::Backend()
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.h b/TAO/tests/Bug_3647_Regression/Backend_Impl.h
index efd8569082e..6a8b08b9f61 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.h
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.h
@@ -1,5 +1,8 @@
 #ifndef Bug_3647_Regression_Backend_Impl_h
 #define Bug_3647_Regression_Backend_Impl_h
+//
+// $Id$
+//
 
 #include "TestS.h"
 
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
index ca62d2563af..016c81d9e7b 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
@@ -1,5 +1,7 @@
 #include "Middle_Impl.h"
 
+ACE_RCSID(Bug_3647_Regression, Middle_Impl, "$Id$")
+
 Bug_3647_Regression::Middle_Impl::
 Middle_Impl(
     Backend_ptr backend,
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.h b/TAO/tests/Bug_3647_Regression/Middle_Impl.h
index 0435f8a3b7d..ef57ed5a1a6 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.h
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.h
@@ -1,5 +1,8 @@
 #ifndef Bug_3647_Regression_Middle_Impl_h
 #define Bug_3647_Regression_Middle_Impl_h
+//
+// $Id$
+//
 
 #include "TestS.h"
 
diff --git a/TAO/tests/Bug_3647_Regression/Test.idl b/TAO/tests/Bug_3647_Regression/Test.idl
index 7ae8286608d..e8fc5efdfdf 100644
--- a/TAO/tests/Bug_3647_Regression/Test.idl
+++ b/TAO/tests/Bug_3647_Regression/Test.idl
@@ -7,6 +7,8 @@
  * Doxygen documentation for all the tests.  Also, it makes it clear as to
  * what types are local vs. coming from the library vs. generated.
  *
+ * $Id$
+ *
  */
 
 module Bug_3647_Regression
diff --git a/TAO/tests/Bug_3647_Regression/client.cpp b/TAO/tests/Bug_3647_Regression/client.cpp
index 830ef6d3ab3..d8ecce9cfb4 100644
--- a/TAO/tests/Bug_3647_Regression/client.cpp
+++ b/TAO/tests/Bug_3647_Regression/client.cpp
@@ -20,13 +20,13 @@ usage(ACE_TCHAR const *cmd,
       ACE_TCHAR const *msg)
 {
   ACE_ERROR ((LM_ERROR,
-	      "usage:  %s "
-	      "-v "
-	      "-k <ior> "
-	      "-t timeout "
-	      "\n"
-	      "        %s\n",
-	      cmd, msg));
+              "usage:  %s "
+              "-v "
+              "-k <ior> "
+              "-t timeout "
+              "\n"
+              "        %s\n",
+              cmd, msg));
 }
 
 int
@@ -53,8 +53,8 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
       case '?':
       default:
-	usage(argv[0], "unknown argument");
-	return -1;
+        usage(argv[0], "unknown argument");
+        return -1;
       }
 
   if (stimeout != 0)
diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp
index a60585ab7eb..f9909a22518 100644
--- a/TAO/tests/Bug_3647_Regression/middle_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp
@@ -26,15 +26,15 @@ usage(ACE_TCHAR const *cmd,
       ACE_TCHAR const *msg)
 {
   ACE_ERROR ((LM_ERROR,
-	      "Usage:  %s "
-	      "-v "
-	      "-k <ior> "
-	      "-o <iorfile> "
-	      "-s <NONE|TRANSPORT|SERVER|TARGET|DELAYED> "
-	      "-t timeout "
-	      "\n"
-	      "        %s\n",
-	      cmd, msg));
+              "Usage:  %s "
+              "-v "
+              "-k <ior> "
+              "-o <iorfile> "
+              "-s <NONE|TRANSPORT|SERVER|TARGET|DELAYED> "
+              "-t timeout "
+              "\n"
+              "        %s\n",
+              cmd, msg));
 }
 
 int
@@ -70,8 +70,8 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
       case '?':
       default:
-	usage(argv[0], "unknown argument");
-	return -1;
+        usage(argv[0], "unknown argument");
+        return -1;
       }
 
   if (ACE_OS::strcmp(sname, "NONE") == 0) {
@@ -94,10 +94,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
       ACE_TCHAR *end;
       long tmp = ACE_OS::strtol(stimeout, &end, 10);
       if (end == 0 || *end != '\0')
-	{
-	  usage(argv[0], "Invalid timeout value");
-	  return -1;
-	}
+        {
+          usage(argv[0], "Invalid timeout value");
+          return -1;
+        }
       timeout = tmp;
     }
 
@@ -174,7 +174,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       using namespace Bug_3647_Regression;
       TAO::Utils::Servant_Var<Middle_Impl> impl(
           new Middle_Impl(backend.in(), orb.in(), verbose,
-			  timeout));
+                          timeout));
 
       PortableServer::ObjectId_var id =
           root_poa->activate_object (impl.in());
diff --git a/TAO/tests/Bug_3647_Regression/run_test.pl b/TAO/tests/Bug_3647_Regression/run_test.pl
index acac010b251..3b544e83599 100755
--- a/TAO/tests/Bug_3647_Regression/run_test.pl
+++ b/TAO/tests/Bug_3647_Regression/run_test.pl
@@ -13,31 +13,31 @@ my $verbose = '';
 my $mode = 'DELAYED';
 
 foreach my $i (@ARGV) {
-  if ($i eq '-verbose') {
-    $verbose = ' -v';
-  } elsif ($i eq '-none') {
-    $mode = 'NONE';
-  } elsif ($i eq '-delayed') {
-    $mode = 'DELAYED';
-  } elsif ($i eq '-transport') {
-    # In this mode, the test is *expected* to fail.  We only run it
-    # like this to verify that the test is a good test (i.e. it
-    # detects failures.)  Same comment applies for SERVER and TARGET
-    # modes.
-    $mode = 'TRANSPORT';
-  } elsif ($i eq '-server') {
-    $mode = 'SERVER';
-  } elsif ($i eq '-target') {
-    $mode = 'TARGET';
-  }
+    if ($i eq '-verbose') {
+        $verbose = ' -v';
+    } elsif ($i eq '-none') {
+        $mode = 'NONE';
+    } elsif ($i eq '-delayed') {
+        $mode = 'DELAYED';
+    } elsif ($i eq '-transport') {
+        # In this mode, the test is *expected* to fail.  We only run it
+        # like this to verify that the test is a good test (i.e. it
+        # detects failures.)  Same comment applies for SERVER and TARGET
+        # modes.
+        $mode = 'TRANSPORT';
+    } elsif ($i eq '-server') {
+        $mode = 'SERVER';
+    } elsif ($i eq '-target') {
+        $mode = 'TARGET';
+    }
 }
 
 my $backend = PerlACE::TestTarget::create_target(1)
-  or die "Create target 1 failed\n";
+    or die "Create target 1 failed\n";
 my $middle = PerlACE::TestTarget::create_target(2)
-  or die "Create target 2 failed\n";
+    or die "Create target 2 failed\n";
 my $client = PerlACE::TestTarget::create_target(3)
-  or die "Create target 3 failed\n";
+    or die "Create target 3 failed\n";
 
 my $backend_ior = "backend.ior";
 my $middle_ior = "middle.ior";
@@ -53,20 +53,19 @@ $middle->DeleteFile($middle_ior);
 $client->DeleteFile($middle_ior);
 
 my $BE =
-  $backend->CreateProcess ("backend_server",
-			   " -o $backend_iorfile"
-			   . $verbose);
+    $backend->CreateProcess ("backend_server",
+                             " -o $backend_iorfile"
+                             . $verbose);
 my $MD =
-  $middle->CreateProcess (#"/usr/bin/strace"," -o md.strace.txt ./middle_server".
-			  "middle_server",
-			  " -s $mode -t 5 "
-			  ." -o $middle_out_iorfile"
-			  . $verbose
-			  . " -k file://$middle_in_iorfile");
+    $middle->CreateProcess ("middle_server",
+                            " -s $mode -t 5 "
+                            ." -o $middle_out_iorfile"
+                            . $verbose
+                            . " -k file://$middle_in_iorfile");
 my $CL = $client->CreateProcess ("client",
-				 " -k file://$client_in_iorfile"
-				 ." -t 1 "
-				 .$verbose);
+                                 " -k file://$client_in_iorfile"
+                                 ." -t 1 "
+                                 .$verbose);
 my $be_status = $BE->Spawn ();
 if ($be_status != 0) {
     print STDERR "ERROR: server returned $be_status\n";
@@ -74,7 +73,7 @@ if ($be_status != 0) {
 }
 
 if ($backend->WaitForFileTimed ($backend_ior,
-				$backend->ProcessStartWaitInterval()) == -1) {
+                                $backend->ProcessStartWaitInterval()) == -1) {
     print STDERR "ERROR: cannot find file <$backend_iorfile>\n";
     $BE->Kill (); $BE->TimedWait (1);
     exit 1;
@@ -100,7 +99,7 @@ if ($md_status != 0) {
 }
 
 if ($middle->WaitForFileTimed ($middle_ior,
-			       $middle->ProcessStartWaitInterval()) == -1) {
+                               $middle->ProcessStartWaitInterval()) == -1) {
     print STDERR "ERROR: cannot find file <$middle_in_iorfile>\n";
     $MD->Kill (); $MD->TimedWait (1);
     $BE->Kill (); $BE->TimedWait (1);
@@ -123,7 +122,7 @@ if ($client->PutFile ($middle_ior) == -1) {
 
 my $status = 0;
 my $client_status =
-  $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+    $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
     $status = 1;