Return-Path: 
 <axis-cvs-return-2686-apmail-ws-axis-cvs-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org
Received: (qmail 95211 invoked from network); 8 Sep 2004 11:07:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 8 Sep 2004 11:07:09 -0000
Received: (qmail 98483 invoked by uid 500); 8 Sep 2004 11:07:05 -0000
Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org
Received: (qmail 98402 invoked by uid 500); 8 Sep 2004 11:07:04 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
list-post: <mailto:axis-cvs@ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 98389 invoked by uid 99); 8 Sep 2004 11:07:04 -0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_PORT
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 08 Sep 2004 04:07:04 -0700
Received: (qmail 95134 invoked by uid 1876); 8 Sep 2004 11:07:02 -0000
Date: 8 Sep 2004 11:07:02 -0000
Message-ID: <20040908110702.95133.qmail@minotaur.apache.org>
From: hawkeye@apache.org
To: ws-axis-cvs@apache.org
Subject: cvs commit: ws-axis/c/tests/auto_build/testcases/client/cpp
 AxisBenchClient.cpp
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

hawkeye     2004/09/08 04:07:02

  Modified:    c/tests/auto_build/testcases/client/cpp AxisBenchClient.cpp
  Log:
  Added option to speficy an output file rather than just writing to stdout. Work done by Andrew Perry
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.2       +189 -167  ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp
  
  Index: AxisBenchClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AxisBenchClient.cpp	27 Aug 2004 12:08:15 -0000	1.1
  +++ AxisBenchClient.cpp	8 Sep 2004 11:07:02 -0000	1.2
  @@ -1,4 +1,6 @@
   #include "AxisBench.h"
  +#include <iostream>
  +#include <fstream>
   #include <time.h>
   
   #ifndef WIN32
  @@ -13,147 +15,154 @@
   // Prototype
   bool parse_args_for_endpoint(int *argc, char *argv[], char **endpoint);
   void shift_args(int i, int *argc, char *argv[]);
  +void setLogOptions(const char *output_filename);
  +
  +// If we re-direct cout it will be to this ofstream
  +ofstream output_file;
  +
  +#define WSDL_DEFAULT_ENDPOINT "http://localhost:9080/AxisBench/services/AxisBenchSoapImpl"
   
   int main(int argc, char* argv[])
   { 
     AxisBench *ws;
  -  BenchDataType *input;
  -  BenchDataType *output;
  -  xsd__unsignedByte* buffer;
  -  int request = 1;
   
  -  char *endpoint = "http://localhost:9080/AxisBench/services/AxisBenchSoapImpl";
  +  char *endpoint = WSDL_DEFAULT_ENDPOINT;
     bool endpoint_set = false;
  +  int returnValue = 1; // Assume Failure
   
     endpoint_set = parse_args_for_endpoint(&argc, argv, &endpoint);
   
     try {
  -    if(endpoint_set)
  +    if(endpoint_set) {
         ws = new AxisBench(endpoint, APTHTTP);
  -    else
  +      free(endpoint);
  +      endpoint_set = false;
  +    } else
         ws = new AxisBench();
  -  } catch (AxisException &e) {
  -    fprintf(stderr, "%s\n", e.what());
  -    return 1;
  -  }
  -  
  -  input = new BenchDataType();
  -  input->count = 100;
  -  
  -  /* Use hard coded values for ease of setting non-default URI
  -  if ( argc > 1 )
  -    input->count = atoi(argv[1]);
  -  
  -  if ( argc > 2 )
  -    request = atoi(argv[2]);
  -  */
  -  
  -  input->infos.m_Array = new BenchBasicDataType[input->count];
  -  input->infos.m_Size = input->count;
  -  
  -  time_t tim;
  -  tim = 1079010407;
  -  tm* lt = gmtime(&tim);
  -  
  -  buffer = (xsd__unsignedByte*)malloc ( input->count + 1 );
  -  memset (buffer,0,input->count + 1);
  -  
  -  for ( int i = 0; i < input->count ; i++ ) {
  -    BenchBasicDataType *type = new BenchBasicDataType();
  -    type->StringType = "StringType";
  -    type->IntegerType = i;
  -    type->DoubleType = 1.0;
  -    type->BooleanType = true_;
  -    type->DateTimeType = *lt ;
  -    type->TimeType = *lt ;
  -    type->DateType = *lt ;
  -    
  -    type->IntType = i;
  -    type->ByteType = '1';
  -    type->DecimalType = 10;
  -    type->FloatType = i/2;
  -    type->LongType = i*100;
  -    type->QNameType = "toto";
  -    type->ShortType = 1;
  +
  +    BenchDataType *input;
  +    BenchDataType *output;
  +    xsd__unsignedByte* buffer;
  +    int request = 1;
  +      
  +    input = new BenchDataType();
  +    input->count = 100;
  +      
  +    input->infos.m_Array = new BenchBasicDataType[input->count];
  +    input->infos.m_Size = input->count;
  +      
  +    time_t tim;
  +    tim = 1079010407;
  +    tm* lt = gmtime(&tim);
  +      
  +    buffer = (xsd__unsignedByte*)calloc (1, input->count + 1 );
  +
  +    for ( int i = 0; i < input->count ; i++ ) {
  +        BenchBasicDataType *type = new BenchBasicDataType();
  +        type->StringType = "StringType";
  +        type->IntegerType = i;
  +        type->DoubleType = 1.0;
  +        type->BooleanType = true_;
  +        type->DateTimeType = *lt ;
  +        type->TimeType = *lt ;
  +        type->DateType = *lt ;
  +        
  +        type->IntType = i;
  +        type->ByteType = '1';
  +        type->DecimalType = 10;
  +        type->FloatType = i/2;
  +        type->LongType = i*100;
  +        type->QNameType = "toto";
  +        type->ShortType = 1;
  +        type->Base64BinaryType.__size=i;
  +        type->Base64BinaryType.__ptr=buffer;
       /*
  -    type->Base64BinaryType.__size=i;
  -    type->Base64BinaryType.__ptr=buffer;
  -    type->HexBinary.__size=i;
  -    type->HexBinary.__ptr=buffer;
  -    strcat ( (char *)buffer, "A");
  +        type->HexBinary.__size=i;
  +        type->HexBinary.__ptr=buffer;
       */
  -    input->infos.m_Array[i] = *type;
  -    
  -  }
  -  
  -  free(buffer);
  -
  -  int t1,t2;
  +        strcat ( (char *)buffer, "A");
  +        input->infos.m_Array[i] = *type;
  +        
  +    }
  +      
  +    int t1,t2;
   #ifndef WIN32  
  -  struct timeval mstart;
  -  struct timeval mstop;
  -  gettimeofday( &mstart, NULL );
  +    struct timeval mstart;
  +    struct timeval mstop;
  +    gettimeofday( &mstart, NULL );
   #else
  -  struct timeb mstart;
  -  struct timeb mstop;
  -  ftime(&mstart);
  +    struct timeb mstart;
  +    struct timeb mstop;
  +    ftime(&mstart);
   #endif
   
  -  for ( int ii = 0; ii < request ; ii++ ) {
  -    output = ws->doBenchRequest(input);
  -  }
  +    for ( int ii = 0; ii < request ; ii++ ) {
  +      output = ws->doBenchRequest(input);
  +    }
   
  +    free(buffer);
   
   #ifndef WIN32
  -  gettimeofday( &mstop, NULL );
  -  t1 = mstart.tv_sec*1000 + mstart.tv_usec/1000;
  -  t2 = mstop.tv_sec*1000 + mstop.tv_usec/1000;
  +    gettimeofday( &mstop, NULL );
  +    t1 = mstart.tv_sec*1000 + mstart.tv_usec/1000;
  +    t2 = mstop.tv_sec*1000 + mstop.tv_usec/1000;
   #else
  -  ftime(&mstop);
  -  t1 = mstart.time*1000 + mstart.millitm;
  -  t2 = mstop.time*1000 + mstop.millitm;
  +    ftime(&mstop);
  +    t1 = mstart.time*1000 + mstart.millitm;
  +    t2 = mstop.time*1000 + mstop.millitm;
   #endif
   
  -  int total = t2-t1;
  -  
  -  if ( ws->getStatus() == AXIS_FAIL )
  -    printf ("Failed\n");
  -  else 
  -  {
  -    int i = 0;
  -    if ( argc > 1 )
  -      i = output->count -1;
  -    printf ("Count : %d \n", output->count);
  -    for ( ; i < output->count ; i++ ) {
  -      printf (" ----------------------------------------------\n");
  -      printf (" StringType %s \n", output->infos.m_Array[i].StringType);
  -      printf (" IntegerType %d \n", output->infos.m_Array[i].IntegerType);
  -      printf (" DoubleType %f \n", output->infos.m_Array[i].DoubleType);
  -      printf (" BooleanType %d \n", output->infos.m_Array[i].BooleanType);
  -      printf (" DateTimeType %s \n", asctime(&output->infos.m_Array[i].DateTimeType));
  -      printf (" DateType %s \n", asctime(&output->infos.m_Array[i].DateType));
  -      printf (" TimeType %s \n", asctime(&output->infos.m_Array[i].TimeType));
  -      printf (" ByteType %d \n", output->infos.m_Array[i].ByteType);
  -      printf (" DecimalType %f \n", output->infos.m_Array[i].DecimalType);
  -      printf (" FloatType %f \n", output->infos.m_Array[i].FloatType);
  -      printf (" LongType %ld \n", output->infos.m_Array[i].LongType);
  -      printf (" QNameType %s \n", output->infos.m_Array[i].QNameType);
  -      printf (" ShortType %d \n", output->infos.m_Array[i].ShortType);
  -      printf (" Base64BinaryType %d \n", output->infos.m_Array[i].Base64BinaryType.__size);
  -      printf (" Base64BinaryType %s \n", output->infos.m_Array[i].Base64BinaryType.__ptr);
  -      printf (" HexBinaryType %d \n", output->infos.m_Array[i].HexBinary.__size);
  -      printf (" HexBinaryType %s \n", output->infos.m_Array[i].HexBinary.__ptr);
  +    int total = t2-t1;
  +      
  +    if ( ws->getStatus() == AXIS_FAIL )
  +        cout << "Failed" << endl;
  +    else 
  +    {
  +      int i = 0;
  +      if ( argc > 1 )
  +          i = output->count -1;
  +
  +      cout << "Count : " << output->count << endl;
  +      for ( ; i < output->count ; i++ ) {
  +          cout << " ----------------------------------------------" << endl;
  +          cout << " StringType " << output->infos.m_Array[i].StringType << endl;
  +          cout << " IntegerType " << output->infos.m_Array[i].IntegerType << endl;
  +          cout << " DoubleType " << output->infos.m_Array[i].DoubleType << endl;
  +          cout << " BooleanType " << output->infos.m_Array[i].BooleanType << endl;
  +          cout << " DateTimeType " << asctime(&output->infos.m_Array[i].DateTimeType) << endl;
  +          cout << " DateType " << asctime(&output->infos.m_Array[i].DateType) << endl;
  +          cout << " TimeType " << asctime(&output->infos.m_Array[i].TimeType) << endl;
  +          cout << " ByteType " << output->infos.m_Array[i].ByteType << endl;
  +          cout << " DecimalType " << output->infos.m_Array[i].DecimalType << endl;
  +          cout << " FloatType " << output->infos.m_Array[i].FloatType << endl;
  +          cout << " LongType " << output->infos.m_Array[i].LongType << endl;
  +          cout << " QNameType " << output->infos.m_Array[i].QNameType << endl;
  +          cout << " ShortType " << output->infos.m_Array[i].ShortType << endl;
  +          cout << " Base64BinaryType " << output->infos.m_Array[i].Base64BinaryType.__size << endl;
  +          cout << " Base64BinaryType " << output->infos.m_Array[i].Base64BinaryType.__ptr << endl;
  +          cout << " HexBinaryType " << output->infos.m_Array[i].HexBinary.__size << endl;
  +          cout << " HexBinaryType " << output->infos.m_Array[i].HexBinary.__ptr << endl;
  +      }
  +      returnValue = 0; // Success
       }
  -  }
   
  -  if(verbose) {
  -    printf (" ----------------------------------------------\n");
  -    printf ("%d input paramters, and %d requests\n", input->count, request);
  -    printf ("Total time = %d ms\n",  total );
  -    printf ("Average time = %d ms\n", total/request);
  +    if(verbose) {
  +        cout << " ----------------------------------------------" << endl;
  +        cout << input->count << " input paramters, and " << request << " requests" << endl;
  +        cout << "Total time = " << total << " ms" << endl;
  +        cout << "Average time = " << total/request << " ms" << endl;
  +    }
  +  } catch(AxisException &e) {
  +    cerr << e.what() << endl;
  +    if(endpoint_set)
  +      free(endpoint);
  +  } catch(...) {
  +    cerr << "Unknown Exception occured." << endl;
  +    if(endpoint_set)
  +      free(endpoint);
     }
  +  return returnValue;
   
  -  return 0;
   }
   
   /* Spin through args list and check for -e -p and -s options.
  @@ -165,62 +174,75 @@
   */
   bool parse_args_for_endpoint(int *argc, char *argv[], char **endpoint) {
   
  -	// We need at least 2 extra arg after program name
  -	if(*argc < 3)
  -		return false;
  -
  -	char *server = "localhost";
  -	int  port = 80;
  -	bool ep_set = false;
  -	bool server_set = false;
  -	bool port_set = false;
  -
  -	for(int i=1; i<*argc; i++) {
  -		if(*argv[i] == '-') {
  -			switch(*(argv[i]+1)) {
  -			case 'e':
  -				*endpoint = strdup(argv[i+1]);
  -				ep_set = true;
  -				shift_args(i, argc, argv);
  -				i--;
  -				break;
  -			case 's':
  -				server = strdup(argv[i+1]);
  -				server_set = true;
  -				shift_args(i, argc, argv);
  -				i--;
  -				break;
  -			case 'p':
  -				port = atoi(argv[i+1]);
  -				if(port >80) port_set = true;
  -				shift_args(i, argc, argv);
  -				i--;
  -				break;
  -			default:
  -				break;
  -			}
  -		}
  -	}
  -
  -	// use the supplied server and/or port to build the endpoint
  -	if(ep_set == false && (server_set || port_set)) {
  -		// Set p to the location of the first '/' after the http:// (7 chars)
  -		// e.g. from http://localhost:80/axis/base gets /axis/base
  -		char *ep_context = strpbrk(&(*endpoint)[7], "/");
  -
  -		// http://:/ is 9 characters + terminating NULL character so add 10.
  -		// Allow space for port number upto 999999 6 chars
  -		*endpoint = (char *)calloc(1, 10 + strlen(ep_context) + strlen(server) + 6);
  -		sprintf(*endpoint, "http://%s:%d/%s", server, port, ep_context+1);
  -		if(server_set) free(server);
  -		ep_set = true;
  -	}
  +    // We need at least 2 extra arg after program name
  +    if(*argc < 3)
  +        return false;
  +
  +    char *server = "localhost";
  +    int  port = 80;
  +    bool ep_set = false;
  +    bool server_set = false;
  +    bool port_set = false;
  +
  +    for(int i=1; i<*argc; i++) {
  +        if(*argv[i] == '-') {
  +            switch(*(argv[i]+1)) {
  +            case 'e':
  +                *endpoint = strdup(argv[i+1]);
  +                ep_set = true;
  +                shift_args(i, argc, argv);
  +                i--;
  +                break;
  +            case 's':
  +                server = strdup(argv[i+1]);
  +                server_set = true;
  +                shift_args(i, argc, argv);
  +                i--;
  +                break;
  +            case 'p':
  +                port = atoi(argv[i+1]);
  +                if(port >80) port_set = true;
  +                shift_args(i, argc, argv);
  +                i--;
  +                break;
  +            case 'o':
  +                setLogOptions(argv[i+1]);
  +                shift_args(i, argc, argv);
  +                i--;
  +                break;
  +            default:
  +                break;
  +            }
  +        }
  +    }
  +
  +    // use the supplied server and/or port to build the endpoint
  +    if(ep_set == false && (server_set || port_set)) {
  +        // Set p to the location of the first '/' after the http:// (7 chars)
  +        // e.g. from http://localhost:80/axis/base gets /axis/base
  +        char *ep_context = strpbrk(&(*endpoint)[7], "/");
  +
  +        // http://:/ is 9 characters + terminating NULL character so add 10.
  +        // Allow space for port number upto 999999 6 chars
  +        *endpoint = (char *)calloc(1, 10 + strlen(ep_context) + strlen(server) + 6);
  +        sprintf(*endpoint, "http://%s:%d/%s", server, port, ep_context+1);
  +        if(server_set) free(server);
  +        ep_set = true;
  +    }
   
  -	return ep_set;
  +    return ep_set;
   }
   
   void shift_args(int i, int *argc, char *argv[]) {
  -	for(int j=i, k=i+2; j<*(argc)-2; j++, k++)
  -					argv[j]=argv[k];
  -	*argc-=2;
  +    for(int j=i, k=i+2; j<*(argc)-2; j++, k++)
  +        argv[j]=argv[k];
  +    *argc-=2;
   }
  +
  +void setLogOptions(const char *output_filename) {
  +    output_file.open(output_filename, ios::out);
  +    if(output_file.is_open()) {
  +        cout.rdbuf( output_file.rdbuf() );
  +    }
  +}
  +