(file) Return to StressTestControllerMain.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / test / StressTestController

Diff for /pegasus/test/StressTestController/StressTestControllerMain.cpp between version 1.2 and 1.9

version 1.2, 2006/04/27 18:47:13 version 1.9, 2008/12/02 09:03:08
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  //
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  // Permission is hereby granted, free of charge, to any person obtaining a
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  // copy of this software and associated documentation files (the "Software"),
 // EMC Corporation; Symantec Corporation; The Open Group.  // to deal in the Software without restriction, including without limitation
 //  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // and/or sell copies of the Software, and to permit persons to whom the
 // of this software and associated documentation files (the "Software"), to  // Software is furnished to do so, subject to the following conditions:
 // deal in the Software without restriction, including without limitation the  //
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // The above copyright notice and this permission notice shall be included
 // sell copies of the Software, and to permit persons to whom the Software is  // in all copies or substantial portions of the Software.
 // furnished to do so, subject to the following conditions:  //
 //  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  //////////////////////////////////////////////////////////////////////////
 //  
 // Author: John Alex  
 //  
 // Modified By:  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 54 
Line 48 
  // getpid() and others  // getpid() and others
  typedef DWORD pid_t;  typedef DWORD pid_t;
  #include <process.h>  #include <process.h>
 #elif !defined(PEGASUS_OS_OS400)  #else
  #include <unistd.h>  #include <unistd.h>
 #endif #endif
  
Line 69 
Line 63 
    Message resource name    Message resource name
  */  */
  
 static const char REQUIRED_ARGS_MISSING [] =  
                      "Required arguments missing.";  
 static const char REQUIRED_ARGS_MISSING_KEY [] =  
                      "Clients.cimuser.CIMUserCommand.REQUIRED_ARGS_MISSING";  
   
 static const char ERR_OPTION_NOT_SUPPORTED [] = static const char ERR_OPTION_NOT_SUPPORTED [] =
                      "Invalid option. Use '--help' to obtain command syntax.";                      "Invalid option. Use '--help' to obtain command syntax.";
  
 static const char ERR_OPTION_NOT_SUPPORTED_KEY[] =  
                      "Clients.cimuser.CIMUserCommand..ERR_OPTION_NOT_SUPPORTED";  
   
 static const char ERR_USAGE [] = static const char ERR_USAGE [] =
                      "Incorrect usage. Use '--help' to obtain command syntax.";                      "Incorrect usage. Use '--help' to obtain command syntax.";
  
 static const char ERR_USAGE_KEY [] =  
                      "Clients.cimuser.CIMUserCommand..ERR_USAGE";  
   
  
 // //
 // exclude main from the Pegasus Namespace // exclude main from the Pegasus Namespace
Line 99 
Line 82 
     char strTime[256];     char strTime[256];
     struct tm tmTime;     struct tm tmTime;
     int rc;     int rc;
     String fileName = String::EMPTY;      String fileName;
     ofstream log_file;     ofstream log_file;
  
  
     tmTime = getCurrentActualTime();     tmTime = getCurrentActualTime();
     strftime(strTime,256,"%d%m%Y%H%M%S.",&tmTime);     strftime(strTime,256,"%d%m%Y%H%M%S.",&tmTime);
  
     StressTestControllerCommand command=StressTestControllerCommand();      StressTestControllerCommand command;
  
     //     //
     // Generate log files and PID files     // Generate log files and PID files
Line 116 
Line 99 
         cout<<StressTestControllerCommand::COMMAND_NAME\         cout<<StressTestControllerCommand::COMMAND_NAME\
             <<"::Failed to generate required files for tests. "<<endl;             <<"::Failed to generate required files for tests. "<<endl;
         command.removeUnusedFiles();         command.removeUnusedFiles();
         exit (Command::RC_ERROR);          return Command::RC_ERROR;
     }     }
  
     //     //
Line 129 
Line 112 
        log_file.close();        log_file.close();
        cout<<"Cannot get file "<<command.getStressTestLogFile()<<endl;        cout<<"Cannot get file "<<command.getStressTestLogFile()<<endl;
        command.removeUnusedFiles();        command.removeUnusedFiles();
        exit (Command::RC_ERROR);         return Command::RC_ERROR;
     }     }
     strftime(strTime,256,"%d/%m/%Y at %H:%M:%S\n",&tmTime);     strftime(strTime,256,"%d/%m/%Y at %H:%M:%S\n",&tmTime);
     log_file<<StressTestControllerCommand::COMMAND_NAME\     log_file<<StressTestControllerCommand::COMMAND_NAME\
Line 178 
Line 161 
  
         log_file.close();         log_file.close();
         command.removeUnusedFiles();         command.removeUnusedFiles();
         exit (Command::RC_ERROR);          return Command::RC_ERROR;
     }     }
     catch (...)     catch (...)
     {     {
Line 188 
Line 171 
             "::Unknown exception caught when setting commands."<<endl;             "::Unknown exception caught when setting commands."<<endl;
         log_file.close();         log_file.close();
         command.removeUnusedFiles();         command.removeUnusedFiles();
         exit (Command::RC_ERROR);          return Command::RC_ERROR;
     }     }
  
     //     //
Line 204 
Line 187 
         // Log file not required when help or verbose is opted.         // Log file not required when help or verbose is opted.
         //         //
         FileSystem::removeFile(command.getStressTestLogFile());         FileSystem::removeFile(command.getStressTestLogFile());
         exit (rc);          return rc;
     }     }
  
     String filename;     String filename;
Line 226 
Line 209 
             //             //
             // Check for file in default directory as well             // Check for file in default directory as well
             //             //
             fileName = String::EMPTY;              fileName = StressTestControllerCommand::DEFAULT_CFGDIR;
             fileName.append(StressTestControllerCommand::DEFAULT_CFGDIR);  
             fileName.append(filename);             fileName.append(filename);
  
             if (!FileSystem::exists(fileName))             if (!FileSystem::exists(fileName))
Line 237 
Line 219 
                 cerr << "\" does not exist."<<endl;                 cerr << "\" does not exist."<<endl;
                 log_file.close();                 log_file.close();
                 command.removeUnusedFiles();                 command.removeUnusedFiles();
                 exit (Command::RC_ERROR);                  return Command::RC_ERROR;
             }             }
             log_file<<StressTestControllerCommand::COMMAND_NAME<<             log_file<<StressTestControllerCommand::COMMAND_NAME<<
                 "::Using config file: "<<fileName<<endl;                 "::Using config file: "<<fileName<<endl;
Line 257 
Line 239 
         //         //
         // Use default file in default dir.         // Use default file in default dir.
         //         //
         fileName = String::EMPTY;          fileName = StressTestControllerCommand::DEFAULT_CFGDIR;
         fileName.append(StressTestControllerCommand::DEFAULT_CFGDIR);  
         fileName.append(StressTestControllerCommand::FILENAME);         fileName.append(StressTestControllerCommand::FILENAME);
         //         //
         // Use hard coded default configuration values if default conf. file         // Use hard coded default configuration values if default conf. file
Line 317 
Line 298 
             ": " << msg <<  endl;             ": " << msg <<  endl;
         log_file.close();         log_file.close();
         command.removeUnusedFiles();         command.removeUnusedFiles();
         exit (Command::RC_ERROR);          return Command::RC_ERROR;
   
     }     }
     catch (Exception& e )     catch (Exception& e )
     {     {
Line 331 
Line 311 
         cerr << msg <<  endl;         cerr << msg <<  endl;
         log_file.close();         log_file.close();
         command.removeUnusedFiles();         command.removeUnusedFiles();
         exit (Command::RC_ERROR);          return Command::RC_ERROR;
     }     }
     catch (...)     catch (...)
     {     {
Line 341 
Line 321 
             "::Unknown exception caught when acquiring configuration."<<endl;             "::Unknown exception caught when acquiring configuration."<<endl;
         log_file.close();         log_file.close();
         command.removeUnusedFiles();         command.removeUnusedFiles();
         exit (Command::RC_ERROR);          return Command::RC_ERROR;
     }     }
  
     log_file << StressTestControllerCommand::COMMAND_NAME <<     log_file << StressTestControllerCommand::COMMAND_NAME <<
Line 372 
Line 352 
             "::Failed to Generate Client Commands."<<  endl;             "::Failed to Generate Client Commands."<<  endl;
         log_file.close();         log_file.close();
         command.removeUnusedFiles();         command.removeUnusedFiles();
         exit (Command::RC_ERROR);          return Command::RC_ERROR;
     }     }
  
     //     //
Line 424 
Line 404 
     cout <<" Client log:     "<<     cout <<" Client log:     "<<
         FileSystem::extractFileName(command.getStressClientLogFile())<<endl;         FileSystem::extractFileName(command.getStressClientLogFile())<<endl;
     log_file.close();     log_file.close();
     exit (rc);  
     return rc;     return rc;
 } /* main */ } /* main */


Legend:
Removed from v.1.2  
changed lines
  Added in v.1.9

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2