ChangeLogTag:Fri Nov 13 12:41:11 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

7 files changed, 55 insertions, 31 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 230fdb7f1de..9b9a7674c67 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,20 @@
+Fri Nov 13 12:41:11 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: 
+	  Fixed problems in CDR extraction operator for Octet sequences
+	  (compiled marshaling).
+
+	* performance-tests/Thruput/TAO/run_client: 
+	* performance-tests/Thruput/TAO/run_test: 
+	  Fixed some problems in the debugging messages.
+
+	* performance-tests/Thruput/TAO/server.cpp: 
+	  The IOR file was created only if debugging was also enabled!
+
+	* performance-tests/Thruput/TAO/utils.cpp: 
+	* performance-tests/Thruput/TAO/client.cpp: 
+	  Fixed minor formating problems in the output.
+
 1998-11-13  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
 	* examples/Simple/chat/README: added explaination
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 0f8764a72d5..c5c6c4250dc 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -256,7 +256,8 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
                 << be_nl
                 << "oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + "
                 << "_tao_seq_len);" << be_nl
-                << "strm.skip_bytes (_tao_seq_len);" << be_uidt_nl
+                << "strm.skip_bytes (_tao_seq_len);" << be_nl
+                << "return 1;" << be_uidt_nl
                 << "}" << be_nl
                 << "else" << be_idt_nl
                 << "return strm.read_octet_array ("
diff --git a/TAO/performance-tests/Thruput/TAO/client.cpp b/TAO/performance-tests/Thruput/TAO/client.cpp
index c8d40806880..760e32f15e0 100644
--- a/TAO/performance-tests/Thruput/TAO/client.cpp
+++ b/TAO/performance-tests/Thruput/TAO/client.cpp
@@ -3,7 +3,8 @@
 // ============================================================================
 //
 // = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
+//    Throughput measurement using the TTCP benchmark adapted to work
+//    using TAO 
 //
 // = FILENAME
 //   client.cpp
@@ -29,7 +30,7 @@ char Usage[] =
      "Usage: client [-options] \n"
      "Common options:\n"
      "-i <ior> Object reference string that the server outputs when started\n"
-     " -f ior_file"
+     "-f ior_file\n"
      "-l ##    length of bufs read from or written to network (default 8192)\n"
      "-v       verbose: print more statistics\n"
      "-d ##    debug level\n"
@@ -294,12 +295,12 @@ read_ior (char *filename)
 {
   ACE_HANDLE f_handle;
   // Open the file for reading.
-  f_handle = ACE_OS::open (filename,0);
+  f_handle = ACE_OS::open (filename, O_RDONLY);
 
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open %s for reading: %p\n",
-                       filename),
+                       filename?filename:"(null filename)"),
                       0);
   ACE_Read_Buffer ior_buffer (f_handle);
   char *data = ior_buffer.read ();
diff --git a/TAO/performance-tests/Thruput/TAO/run_client b/TAO/performance-tests/Thruput/TAO/run_client
index ccb515f75fe..f439dde2444 100755
--- a/TAO/performance-tests/Thruput/TAO/run_client
+++ b/TAO/performance-tests/Thruput/TAO/run_client
@@ -3,7 +3,7 @@
 #
 # Arguments:
 #   $1  <Test_Name> 
-#   $2  <obj_reference_From_Server> 
+#   $2  <ior_file> 
 
 # if ($#argv < 2) then
 # 	echo "Usage: run_client <Test_Name> <obj_reference_From_Server>"
diff --git a/TAO/performance-tests/Thruput/TAO/run_test b/TAO/performance-tests/Thruput/TAO/run_test
index 58cec7bdc1c..e2590581ed4 100755
--- a/TAO/performance-tests/Thruput/TAO/run_test
+++ b/TAO/performance-tests/Thruput/TAO/run_test
@@ -1,10 +1,13 @@
 #!/bin/csh -f
+#
+# $Id$
+#
 
 #   $1  <Total_Data_Size> 
 #   $2  <Max_msg_size_in_Kb?> <-- currently not used? $2 == $argv[2] ??
 #   $3  <Output file name>
 #   $4  <seq_type>
-#   $5  <ior_from_server>
+#   $5  <ior_file>
 
 # e.g. 
 # % run_test 10000 512 mambo\! s iiop:1.0//128.252.165.144:10015/P350892cc000ad963RootPOA/RootPOA_is_BAD/TTCP_IIOP_test
@@ -21,26 +24,26 @@
 #echo $msize 
 	echo "-->"
 	echo "--> ITERATION #" 1 
-	echo "  client -S" $1 "-m m -l" $msize "-L" $3 "-q" $4 "-f ior"
+	echo "  client -S" $1 "-m m -l" $msize "-L" $3 "-q" $4 -f $5
 	echo "-->"
-./client -S $1 -m m -l $msize -L $3 -q $4  -f ior
+./client -S $1 -m m -l $msize -L $3 -q $4 -f $5
 set flag=0
 while ($msize <= $limit)
   if ($flag == 0) goto label
 	echo "-->"
 	echo "--> ITERATION #" 1 
-        echo "  client -S" $1 "-f m -l" $msize "-L" $3 "-q" $4 "-f ior"
+        echo "  client -S" $1 "-m m -l" $msize "-L" $3 "-q" $4 -f $5
 	echo "-->"
-            ./client -S $1 -m m -l $msize -L $3 -q $4  -f ior
+            ./client -S $1 -m m -l $msize -L $3 -q $4  -f $5
  label:
   set flag=1
   sleep 5
   foreach i (2)
 	echo "-->"
 	echo "--> ITERATION #" $i 
-        echo "  client -S" $1 "-f m -l" $msize "-L" $3 "-q" $4 "-f ior"
+        echo "  client -S" $1 "-m m -l" $msize "-L" $3 "-q" $4 -f $5
 	echo "-->"
-	./client -S $1 -m m -l $msize -L $3 -q $4 -f ior
+	./client -S $1 -m m -l $msize -L $3 -q $4 -f $5
   end
 	echo "---------------------------"
 	@ msize = ($msize * 2)
diff --git a/TAO/performance-tests/Thruput/TAO/server.cpp b/TAO/performance-tests/Thruput/TAO/server.cpp
index 82646c034a0..d93e19dc742 100644
--- a/TAO/performance-tests/Thruput/TAO/server.cpp
+++ b/TAO/performance-tests/Thruput/TAO/server.cpp
@@ -3,7 +3,8 @@
 // ============================================================================
 //
 // = TAO tests
-//    Throughput measurement using the TTCP benchmark adapted to work using TAO
+//    Throughput measurement using the TTCP benchmark adapted to work
+//    using TAO 
 //
 // = FILENAME
 //   server.cpp
@@ -197,24 +198,25 @@ main (int argc, char **argv)
       return 1;
     }
 
-  if (TAO_debug_level > 0)
+  // get a stringified representation of the object reference created above
+  str = orb_var->object_to_string (obj_var.in (),
+                                   env);
+  if (env.exception () != 0)
     {
-      // get a stringified representation of the object reference created above
-      str = orb_var->object_to_string (obj_var.in (),
-                                       env);
-      if (env.exception () != 0)
-        {
-          env.print_exception ("object_to_string");
-          return 1;
-        }
+      env.print_exception ("object_to_string");
+      return 1;
+    }
 
+  if (TAO_debug_level > 0)
+    {
       ACE_DEBUG ((LM_DEBUG, "stringified obj reference = %s\n", str));
-      if (ior_file != 0)
-        {
-          // write ior to a file
-          ACE_OS::fprintf (ior_file,"%s",str);
-          ACE_OS::fclose (ior_file);
-        }
+    }
+
+  if (ior_file != 0)
+    {
+      // write ior to a file
+      ACE_OS::fprintf (ior_file,"%s",str);
+      ACE_OS::fclose (ior_file);
     }
 
 #if defined (ACE_HAS_QUANTIFY)
diff --git a/TAO/performance-tests/Thruput/TAO/utils.cpp b/TAO/performance-tests/Thruput/TAO/utils.cpp
index 030e99c034b..3e424afdf2e 100644
--- a/TAO/performance-tests/Thruput/TAO/utils.cpp
+++ b/TAO/performance-tests/Thruput/TAO/utils.cpp
@@ -210,9 +210,9 @@ void PrintStats (void)
         break;
       }
       outFile = fopen (filename, "a+");
-      ACE_OS::fprintf (outFile, "\n%ldk \t", buflen / 1024);
+      ACE_OS::fprintf (outFile, "%ldk \t", buflen / 1024);
       tmp = ((double) nbytes) / realt;
-      ACE_OS::fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0);
+      ACE_OS::fprintf (outFile, "%.2f\n", tmp * 8.0 / 1024.0 / 1024.0);
       fclose (outFile);
     }