ChangeLogTag: Wed Jun 25 13:52:13 2003 Gan Deng <gan.deng@vanderbilt.edu>

1 files changed, 37 insertions, 37 deletions

diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 7b54f2e0ea9..ab45f70d402 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -44,8 +44,8 @@ parse_args (int argc, char *argv[])
             ACE_OS::strcmp (data_type, "longlong") != 0)
           return -1;
         break;
-	  
-	  case 's':
+
+          case 's':
         sz = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
@@ -74,8 +74,8 @@ parse_args (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-t <datatype> "
-						   "-s <size> "
-						   "-k <ior> "
+                                                   "-s <size> "
+                                                   "-k <ior> "
                            "-i <niterations> "
                            "-b <burst> "
                            "-x (disable shutdown) "
@@ -114,20 +114,20 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_octet_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("octet_load") <<= ol;
           request[j]->add_in_arg ("send_time") <<= start;
-		  request[j]->set_return_type (CORBA::_tc_ulonglong);
+                  request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -159,7 +159,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -187,20 +187,20 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_long_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("long_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -232,7 +232,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -260,20 +260,20 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_short_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("short_load") <<= sl;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -305,7 +305,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -333,20 +333,20 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_char_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("char_load") <<= cl;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -378,7 +378,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -406,20 +406,20 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_longlong_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("longlong_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -451,7 +451,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -479,20 +479,20 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_double_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("double_load") <<= dl;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -524,7 +524,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -579,7 +579,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-	  Test::octet_load oc;	
+          Test::octet_load oc;
 
       for (int j = 0; j < 100; ++j)
         {
@@ -591,9 +591,9 @@ main (int argc, char *argv[])
         }
 
 
-	  // Test various sequence types
+          // Test various sequence types
 
-	  if (ACE_OS::strcmp (data_type, "octet") == 0 )
+          if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
           test_octet_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;