(file) Return to Tracer.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Tracer.cpp between version 1.1.2.8 and 1.38

version 1.1.2.8, 2001/10/24 20:44:37 version 1.38, 2006/08/21 15:31:03
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 23 
Line 31 
 // //
 // Author: Sushma Fernandes, Hewlett-Packard Company (sushma_fernandes@hp.com) // Author: Sushma Fernandes, Hewlett-Packard Company (sushma_fernandes@hp.com)
 // //
 // Modified By:  // Modified By: Jenny Yu, Hewlett-Packard Company (jenny_yu@hp.com)
   //              Amit K Arora, IBM (amita@in.ibm.com) for PEP#101
   //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
   //              Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) for Bug#2498
   //              Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)
   //              David Dillard, Symantec Corp. (david_dillard@symantec.com)
   //              Aruran, IBM (ashanmug@in.ibm.com) for Bug# 4547
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
   #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/Destroyer.h>  #include <Pegasus/Common/Thread.h>
   #include <Pegasus/Common/System.h>
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
Line 43 
Line 59 
 const Uint32 Tracer::LEVEL3 = (1 << 2); const Uint32 Tracer::LEVEL3 = (1 << 2);
 const Uint32 Tracer::LEVEL4 = (1 << 3); const Uint32 Tracer::LEVEL4 = (1 << 3);
  
   // Set the return codes
   const Boolean Tracer::_SUCCESS = 1;
   const Boolean Tracer::_FAILURE = 0;
   
 // Set the Enter and Exit messages // Set the Enter and Exit messages
 const char Tracer::_FUNC_ENTER_MSG[] = "Entering method";  const char Tracer::_METHOD_ENTER_MSG[] = "Entering method";
 const char Tracer::_FUNC_EXIT_MSG[]  = "Exiting method";  const char Tracer::_METHOD_EXIT_MSG[]  = "Exiting method";
  
 // Set Log messages // Set Log messages
 const char Tracer::_LOG_MSG1[] = "LEVEL1 not enabled with Tracer::trace call.";  const char Tracer::_LOG_MSG[] = "LEVEL1 may only be used with trace macros PEG_METHOD_ENTER/PEG_METHOD_EXIT.";
 const char  
       Tracer::_LOG_MSG2[] = "LEVEL1 not enabled with Tracer::traceBuffer call.";  
 const char Tracer::_LOG_MSG3[]="Use trace macros, PEG_FUNC_ENTER/PEG_FUNC_EXIT";  
  
 // Initialize singleton instance of Tracer // Initialize singleton instance of Tracer
 Tracer* Tracer::_tracerInstance = 0; Tracer* Tracer::_tracerInstance = 0;
Line 66 
Line 83 
 // Set the line maximum // Set the line maximum
 const Uint32 Tracer::_STRLEN_MAX_UNSIGNED_INT = 21; const Uint32 Tracer::_STRLEN_MAX_UNSIGNED_INT = 21;
  
   // Set the max PID and Thread ID Length
   const Uint32 Tracer::_STRLEN_MAX_PID_TID = 20;
   
   // Initialize public indicator of trace state
   Boolean Tracer::_traceOn = false;
   
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 // Tracer constructor // Tracer constructor
 // Constructor is private to preclude construction of Tracer objects // Constructor is private to preclude construction of Tracer objects
 // Single Instance of Tracer is maintained for each process. // Single Instance of Tracer is maintained for each process.
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 Tracer::Tracer() Tracer::Tracer()
       : _traceComponentMask(new Boolean[_NUM_COMPONENTS]),
         _traceLevelMask(0),
         _traceHandler(new TraceFileHandler())
 { {
     // Initialize Trace File Handler  
     _traceHandler=new TraceFileHandler();  
     _traceLevelMask=0;  
     _traceComponentMask=new Boolean[_NUM_COMPONENTS];  
   
     // Initialize ComponentMask array to false     // Initialize ComponentMask array to false
     for (int index=0;index < _NUM_COMPONENTS;      for (Uint32 index=0;index < _NUM_COMPONENTS;
         _traceComponentMask[index++]=false);          (_traceComponentMask.get())[index++]=false);
 } }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Line 88 
Line 109 
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 Tracer::~Tracer() Tracer::~Tracer()
 { {
     delete []_traceComponentMask;  
     delete _traceHandler;  
     delete _tracerInstance;     delete _tracerInstance;
 } }
  
Line 105 
Line 124 
 { {
     if ( traceLevel == LEVEL1 )     if ( traceLevel == LEVEL1 )
     {     {
         // ATTN: Setting the Log file type to DEBUG_LOG          trace( traceComponent, Tracer::LEVEL4, "%s", _LOG_MSG );
         // May need to change to an appropriate log file type  
         Logger::put(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,"$0 $1",  
            _LOG_MSG1,_LOG_MSG3);  
     }     }
     else     else
     {     {
Line 134 
Line 150 
  
     if ( traceLevel == LEVEL1 )     if ( traceLevel == LEVEL1 )
     {     {
         Logger::put(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,"$0 $1",          trace( traceComponent, Tracer::LEVEL4, "%s", _LOG_MSG );
            _LOG_MSG1,_LOG_MSG3);  
      }      }
      else      else
      {      {
          if (_isTraceEnabled(traceComponent,traceLevel))          if (_isTraceEnabled(traceComponent,traceLevel))
          {          {
               //
               // Allocate memory for the message string
               // Needs to be updated if additional info is added
               //
             message = new char[ strlen(fileName) +             message = new char[ strlen(fileName) +
                 _STRLEN_MAX_UNSIGNED_INT + 6 ];                  _STRLEN_MAX_UNSIGNED_INT + (_STRLEN_MAX_PID_TID * 2) + 8 ];
             sprintf(message,"[%s:%d]: ",fileName,lineNum);              sprintf(
                  message,
                  "[%d:%s:%s:%u]: ",
                  System::getPID(),
                  Threads::id().buffer,
                  fileName,
                  lineNum);
  
             _trace(traceComponent,message,fmt,argList);             _trace(traceComponent,message,fmt,argList);
             delete []message;             delete []message;
Line 162 
Line 187 
 { {
     if ( traceLevel == LEVEL1 )     if ( traceLevel == LEVEL1 )
     {     {
         Logger::put(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,"$0 $1",          trace( traceComponent, Tracer::LEVEL4, "%s", _LOG_MSG );
            _LOG_MSG2,_LOG_MSG3);  
     }     }
     else     else
     {     {
Line 173 
Line 197 
  
             strncpy( tmpBuf, data, size );             strncpy( tmpBuf, data, size );
             tmpBuf[size] = '\0';             tmpBuf[size] = '\0';
             _trace(traceComponent,"",tmpBuf);              trace(traceComponent,traceLevel,"%s",tmpBuf);
  
             delete []tmpBuf;             delete []tmpBuf;
         }         }
Line 192 
Line 216 
 { {
     if ( traceLevel == LEVEL1 )     if ( traceLevel == LEVEL1 )
     {     {
         Logger::put(Logger::DEBUG_LOG,"Tracer",Logger::WARNING,"$0 $1",          trace( traceComponent, Tracer::LEVEL4, "%s", _LOG_MSG );
            _LOG_MSG2,_LOG_MSG3);  
     }     }
     else     else
     {     {
         if ( _isTraceEnabled( traceComponent, traceLevel ) )         if ( _isTraceEnabled( traceComponent, traceLevel ) )
         {         {
             char* message = new char[ strlen(fileName) +  
                 _STRLEN_MAX_UNSIGNED_INT + 6 ];  
             char* tmpBuf = new char[size+1];             char* tmpBuf = new char[size+1];
  
             sprintf(message,"[%s:%d]: ",fileName,lineNum);  
             strncpy( tmpBuf, data, size );             strncpy( tmpBuf, data, size );
             tmpBuf[size] = '\0';             tmpBuf[size] = '\0';
             _trace(traceComponent,message,tmpBuf);              trace(fileName,lineNum,traceComponent,traceLevel,"%s",tmpBuf);
  
             delete []tmpBuf;             delete []tmpBuf;
             delete []message;          }
       }
   }
   
   ////////////////////////////////////////////////////////////////////////////////
   //Traces the given string
   ////////////////////////////////////////////////////////////////////////////////
   void Tracer::_traceString(
       const Uint32   traceComponent,
       const Uint32   traceLevel,
       const String&  traceString)
   {
       if ( traceLevel == LEVEL1 )
       {
           trace( traceComponent, Tracer::LEVEL4, "%s", _LOG_MSG );
       }
       else
       {
           if (_isTraceEnabled(traceComponent,traceLevel))
           {
               trace(traceComponent,traceLevel,"%s",
                          (const char *)traceString.getCString());
           }
       }
   }
   
   ////////////////////////////////////////////////////////////////////////////////
   //Traces the given string - Overloaded to include the fileName and line number
   //of trace origin.
   ////////////////////////////////////////////////////////////////////////////////
   void Tracer::_traceString(
       const char*   fileName,
       const Uint32  lineNum,
       const Uint32  traceComponent,
       const Uint32  traceLevel,
       const String& traceString)
   {
       if ( traceLevel == LEVEL1 )
       {
           trace( traceComponent, Tracer::LEVEL4, "%s", _LOG_MSG );
       }
       else
       {
           if ( _isTraceEnabled( traceComponent, traceLevel ) )
           {
               trace(fileName,lineNum,traceComponent,traceLevel,"%s",
                        (const char *)traceString.getCString());
           }
       }
   }
   
   ////////////////////////////////////////////////////////////////////////////////
   //Traces the message in the given CIMException object.
   ////////////////////////////////////////////////////////////////////////////////
   void Tracer::_traceCIMException(
       const Uint32 traceComponent,
       const Uint32 traceLevel,
       CIMException cimException)
   {
       if ( traceLevel == LEVEL1 )
       {
           trace( traceComponent, Tracer::LEVEL4, "%s", _LOG_MSG );
       }
       else
       {
           if ( _isTraceEnabled( traceComponent, traceLevel ) )
           {
               // get the CIMException trace message string
               String traceMsg =
                   TraceableCIMException(cimException).getTraceDescription();
   
               // trace the string
               _traceString(traceComponent, traceLevel, traceMsg);
          }          }
      }      }
 } }
Line 229 
Line 321 
  
     if (_isTraceEnabled(traceComponent,LEVEL1))     if (_isTraceEnabled(traceComponent,LEVEL1))
     {     {
   
         va_start(argList,fmt);         va_start(argList,fmt);
  
           //
           // Allocate memory for the message string
           // Needs to be updated if additional info is added
           //
         message = new char[ strlen(fileName) +         message = new char[ strlen(fileName) +
             _STRLEN_MAX_UNSIGNED_INT + 6 ];                              _STRLEN_MAX_UNSIGNED_INT + (_STRLEN_MAX_PID_TID * 2) + 8 ];
         sprintf(message,"[%s:%d]: ",fileName,lineNum);  
           sprintf(
              message,
              "[%d:%s:%s:%u]: ",
              System::getPID(),
              Threads::id().buffer,
              fileName,
              lineNum);
   
         _trace(traceComponent,message,fmt,argList);         _trace(traceComponent,message,fmt,argList);
  
         va_end(argList);         va_end(argList);
Line 258 
Line 363 
     {     {
         va_start(argList,fmt);         va_start(argList,fmt);
  
           //
           // Allocate memory for the message string
           // Needs to be updated if additional info is added
           //
         message = new char[ strlen(fileName) +         message = new char[ strlen(fileName) +
             _STRLEN_MAX_UNSIGNED_INT + 6 ];                              _STRLEN_MAX_UNSIGNED_INT + (_STRLEN_MAX_PID_TID * 2) + 8 ];
         sprintf(message,"[%s:%d]: ",fileName,lineNum);  
           sprintf(
              message,
              "[%d:%s:%s:%u]: ",
              System::getPID(),
              Threads::id().buffer,
              fileName,
              lineNum);
   
         _trace(traceComponent,message,fmt,argList);         _trace(traceComponent,message,fmt,argList);
         va_end(argList);         va_end(argList);
  
Line 275 
Line 392 
     const Uint32 traceLevel)     const Uint32 traceLevel)
 { {
     Tracer* instance = _getInstance();     Tracer* instance = _getInstance();
     if ((traceComponent < 0) || (traceComponent >= _NUM_COMPONENTS ))      if (traceComponent >= _NUM_COMPONENTS)
     {     {
         return false;         return false;
     }     }
     return ((instance->_traceComponentMask[traceComponent]) &&      return (((instance->_traceComponentMask.get())[traceComponent]) &&
             (traceLevel  & instance->_traceLevelMask));             (traceLevel  & instance->_traceLevelMask));
 } }
  
Line 296 
Line 413 
  
     // Get the current system time and prepend to message     // Get the current system time and prepend to message
     String currentTime = System::getCurrentASCIITime();     String currentTime = System::getCurrentASCIITime();
     ArrayDestroyer<char> timeStamp(currentTime.allocateCString());      CString timeStamp = currentTime.getCString();
  
       //
     // Allocate messageHeader.     // Allocate messageHeader.
     msgHeader = new char [strlen(message)      // Needs to be updated if additional info is added
         + strlen(TRACE_COMPONENT_LIST[traceComponent])      //
         + strlen(timeStamp.getPointer()) + 6];  
   
  
     // Construct the message header     // Construct the message header
     // The message header is in the following format     // The message header is in the following format
     // timestamp: <component name> [file name:line number]     // timestamp: <component name> [file name:line number]
     if (strcmp(message,"") != 0)      if (*message != '\0')
     {     {
         sprintf(msgHeader,"%s: %s %s",timeStamp.getPointer(),         // << Wed Jul 16 10:58:40 2003 mdd >> _STRLEN_MAX_PID_TID is not used in this format string
          msgHeader = new char [strlen(message)
                                + strlen(TRACE_COMPONENT_LIST[traceComponent])
                                + strlen(timeStamp) + _STRLEN_MAX_PID_TID + 5];
   
           sprintf(msgHeader,"%s: %s %s",(const char*)timeStamp,
             TRACE_COMPONENT_LIST[traceComponent] ,message);             TRACE_COMPONENT_LIST[traceComponent] ,message);
           //delete [] msgHeader;
     }     }
     else     else
     {     {
         sprintf(msgHeader,"%s: %s ",timeStamp.getPointer(),          //
             TRACE_COMPONENT_LIST[traceComponent] );          // Since the message is blank form a string using the pid and tid
           //
           char*  tmpBuffer;
   
           //
           // Allocate messageHeader.
           // Needs to be updated if additional info is added
           //
           tmpBuffer = new char[_STRLEN_MAX_PID_TID + 6];
           sprintf(tmpBuffer, "[%u:%s]: ", System::getPID(), Threads::id().buffer);
           msgHeader = new char [ strlen(timeStamp) + strlen(TRACE_COMPONENT_LIST[traceComponent]) +
                                  strlen(tmpBuffer) + 1  + 5 ];
   
           sprintf(msgHeader,"%s: %s %s ",(const char*)timeStamp,
               TRACE_COMPONENT_LIST[traceComponent] ,tmpBuffer );
           delete []tmpBuffer;
           //delete [] msgHeader;
   
     }     }
  
     // Call trace file handler to write message     // Call trace file handler to write message
     _getInstance()->_traceHandler->handleMessage(msgHeader,fmt,argList);     _getInstance()->_traceHandler->handleMessage(msgHeader,fmt,argList);
   
     delete []msgHeader;     delete []msgHeader;
 } }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 //Validate the trace file //Validate the trace file
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 Boolean Tracer::isValid(const char* filePath)  Boolean Tracer::isValidFileName(const char* filePath)
   {
       String moduleName = _getInstance()->_moduleName;
       if (moduleName == String::EMPTY)
 { {
     return (_getInstance()->_traceHandler->isValidFilePath(filePath));     return (_getInstance()->_traceHandler->isValidFilePath(filePath));
 } }
       else
       {
           String extendedFilePath = String(filePath) + "." + moduleName;
           return (_getInstance()->_traceHandler->isValidFilePath(
               extendedFilePath.getCString()));
       }
   }
   
   ////////////////////////////////////////////////////////////////////////////////
   //Validate the trace components
   ////////////////////////////////////////////////////////////////////////////////
   Boolean Tracer::isValidComponents(const String& traceComponents)
   {
       String invalidComponents;
       return isValidComponents(traceComponents, invalidComponents);
   }
   
   Boolean Tracer::isValidComponents(
       const String& traceComponents, String& invalidComponents)
   {
       // Validate the trace components and modify the traceComponents argument
       // to reflect the invalid components
   
       Uint32    position=0;
       Uint32    index=0;
       String    componentName = String::EMPTY;
       String    componentStr = String::EMPTY;
       Boolean   validComponent=false;
       Boolean   retCode=true;
   
       componentStr = traceComponents;
       invalidComponents = String::EMPTY;
   
       if (componentStr != String::EMPTY)
       {
           // Check if ALL is specified
           if (String::equalNoCase(componentStr,"ALL"))
           {
               return _SUCCESS;
           }
   
           // Append _COMPONENT_SEPARATOR to the end of the traceComponents
           componentStr.append(_COMPONENT_SEPARATOR);
   
           while (componentStr != String::EMPTY)
           {
               //
               // Get the Component name from traceComponents.
               // Components are separated by _COMPONENT_SEPARATOR
               //
               position = componentStr.find(_COMPONENT_SEPARATOR);
               componentName = componentStr.subString(0,(position));
   
               // Lookup the index for Component name in TRACE_COMPONENT_LIST
               index = 0;
               validComponent = false;
   
               while (index < _NUM_COMPONENTS)
               {
                   if (String::equalNoCase(
                          componentName, TRACE_COMPONENT_LIST[index]))
                   {
                       // Found component, break from the loop
                       validComponent = true;
                       break;
                   }
                   else
                   {
                      index++;
                   }
               }
   
               // Remove the searched componentname from the traceComponents
               componentStr.remove(0,position+1);
   
               if ( !validComponent )
               {
                   invalidComponents.append(componentName);
                   invalidComponents.append(_COMPONENT_SEPARATOR);
               }
           }
       }
       else
       {
           // trace components is empty, it is a valid value so return true
           return _SUCCESS;
       }
       if ( invalidComponents != String::EMPTY )
       {
           retCode = false;
           //
           // Remove the extra ',' at the end
           //
           invalidComponents.remove(
               invalidComponents.reverseFind(_COMPONENT_SEPARATOR));
       }
       return retCode;
   }
   
   ////////////////////////////////////////////////////////////////////////////////
   //Set the name of the module being traced
   ////////////////////////////////////////////////////////////////////////////////
   void Tracer::setModuleName(const String& moduleName)
   {
       _getInstance()->_moduleName = moduleName;
   }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 //Returns the Singleton instance of the Tracer //Returns the Singleton instance of the Tracer
Line 343 
Line 595 
 } }
  
 // PEGASUS_REMOVE_TRACE defines the compile time inclusion of the Trace // PEGASUS_REMOVE_TRACE defines the compile time inclusion of the Trace
 // interfaces. If defined the interfaces map to empty functions  // interfaces. This section defines the trace functions IF the remove
   // trace flag is NOT set.  If it is set, they are defined as empty functions
   // in the header file.
  
 #ifndef PEGASUS_REMOVE_TRACE #ifndef PEGASUS_REMOVE_TRACE
  
Line 352 
Line 606 
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 Uint32 Tracer::setTraceFile(const char* traceFile) Uint32 Tracer::setTraceFile(const char* traceFile)
 { {
       if (*traceFile == 0)
       {
           return 1;
       }
   
       String moduleName = _getInstance()->_moduleName;
       if (moduleName == String::EMPTY)
       {
     return (_getInstance()->_traceHandler->setFileName (traceFile));     return (_getInstance()->_traceHandler->setFileName (traceFile));
 } }
       else
       {
           String extendedTraceFile = String(traceFile) + "." + moduleName;
           return (_getInstance()->_traceHandler->setFileName(
               extendedTraceFile.getCString()));
       }
   }
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 //Set the trace level //Set the trace level
Line 389 
Line 658 
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 //Set components to be traced. //Set components to be traced.
 //The String traceComponents will be updated within the function.  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 void Tracer::setTraceComponents(String traceComponents)  void Tracer::setTraceComponents(const String& traceComponents)
 { {
     Uint32 position=0;     Uint32 position=0;
     Uint32 index=0;     Uint32 index=0;
     String componentName;      String componentName     = String::EMPTY;
       String componentStr      = traceComponents;
       String invalidComponents = String::EMPTY;
  
     if (traceComponents != String::EMPTY)      if (componentStr != String::EMPTY)
     {     {
         // Check if ALL is specified         // Check if ALL is specified
         if (String::equalNoCase(traceComponents,"ALL"))          if (String::equalNoCase(componentStr,"ALL"))
         {         {
             for (int index=0; index < _NUM_COMPONENTS;              for (index=0; index < _NUM_COMPONENTS;
                 _getInstance()->_traceComponentMask[index++] = true);                      (_getInstance()->_traceComponentMask.get())[index++] = true);
               _traceOn = true;
             return;             return;
         }         }
  
         // initialise ComponentMask array to False         // initialise ComponentMask array to False
         for (index = 0;index < _NUM_COMPONENTS;         for (index = 0;index < _NUM_COMPONENTS;
             _getInstance()->_traceComponentMask[index++] = false);                (_getInstance()->_traceComponentMask.get())[index++] = false);
           _traceOn = false;
  
         // Append _COMPONENT_SEPARATOR to the end of the traceComponents         // Append _COMPONENT_SEPARATOR to the end of the traceComponents
         traceComponents += _COMPONENT_SEPARATOR;          componentStr.append(_COMPONENT_SEPARATOR);
  
         while (traceComponents != String::EMPTY)          while (componentStr != String::EMPTY)
         {         {
             // Get the Component name from traceComponents.             // Get the Component name from traceComponents.
             // Components are separated by _COMPONENT_SEPARATOR             // Components are separated by _COMPONENT_SEPARATOR
             position = traceComponents.find(_COMPONENT_SEPARATOR);              position = componentStr.find(_COMPONENT_SEPARATOR);
             componentName = traceComponents.subString(0,(position));              componentName = componentStr.subString(0,(position));
  
             // Lookup the index for Component name in TRACE_COMPONENT_LIST             // Lookup the index for Component name in TRACE_COMPONENT_LIST
             index = 0;             index = 0;
             while (index < _NUM_COMPONENTS)             while (index < _NUM_COMPONENTS)
             {             {
                 if (componentName == TRACE_COMPONENT_LIST[index])                  if (String::equalNoCase(
                       componentName,TRACE_COMPONENT_LIST[index]))
                 {                 {
                     _getInstance()->_traceComponentMask[index]=true;                      (_getInstance()->_traceComponentMask.get())[index]=true;
                       _traceOn = true;
  
                     // Found component, break from the loop                     // Found component, break from the loop
                     break;                     break;
Line 439 
Line 713 
             }             }
  
             // Remove the searched componentname from the traceComponents             // Remove the searched componentname from the traceComponents
             traceComponents.remove(0,position+1);              componentStr.remove(0,position+1);
         }         }
     }     }
     else     else
     {     {
         // initialise ComponentMask array to False         // initialise ComponentMask array to False
         for (int index = 0;index < _NUM_COMPONENTS;          for (Uint32 index = 0;index < _NUM_COMPONENTS;
             _getInstance()->_traceComponentMask[index++] = false);                   (_getInstance()->_traceComponentMask.get())[index++] = false);
           _traceOn = 0;
       }
       return ;
   }
   
   void Tracer::traceEnter(TracerToken& token, Uint32 traceComponent, const char* method)
   {
       if (_traceOn)
       {
           token.component = traceComponent;
           token.method = method;
   
           //Tracer::traceEnter("unknown", 0, component, method);
           _traceEnter( "unknown", 0, traceComponent, "%s %s",
                        _METHOD_ENTER_MSG, method);
       }
   }
   
   void Tracer::traceExit(TracerToken& token)
   {
       if (_traceOn)
   
           // KS Tracer::traceExit("unknown", 0, token.component, token.method);
           _traceExit( "unknown",0, token.component, "%s %s",
               _METHOD_EXIT_MSG, token.method);
   }
   
   void Tracer::traceEnter(
       TracerToken& token,
       const char* file,
       size_t line,
       Uint32 traceComponent,
       const char* method)
   {
       if (_traceOn)
       {
           token.component = traceComponent;
           token.method = method;
   
           //Tracer::traceEnter(file, line, component, method);
           _traceEnter( file, line, traceComponent, "%s %s",
                        _METHOD_ENTER_MSG, method);
       }
   }
   
   void Tracer::traceExit(
       TracerToken& token,
       const char* file,
       size_t line)
   {
       if (_traceOn)
           //Tracer::traceExit(file, line, token.component, token.method);
           _traceExit( file, line, token.component, "%s %s",
                   _METHOD_EXIT_MSG, token.method);
   }
   
   void Tracer::traceBuffer(
       const Uint32 traceComponent,
       const Uint32 traceLevel,
       const char*  data,
       const Uint32 size)
   {
       if (_traceOn)
           _traceBuffer( traceComponent, traceLevel, data, size );
   }
   
   void Tracer::traceBuffer(
       const char*  fileName,
       const Uint32 lineNum,
       const Uint32 traceComponent,
       const Uint32 traceLevel,
       const char*  data,
       const Uint32 size)
   {
       if (_traceOn)
       {
           _traceBuffer( fileName, lineNum,
                         traceComponent, traceLevel, data, size );
       }
     }     }
   
   void Tracer::trace(
       const Uint32 traceComponent,
       const Uint32 traceLevel,
       const char *fmt,
       ...)
   {
       if (_traceOn)
       {
           va_list argList;
   
           va_start(argList,fmt);
           _trace(traceComponent,traceLevel,fmt,argList);
           va_end(argList);
       }
   }
   
   void Tracer::trace(
       const char* fileName,
       const Uint32 lineNum,
       const Uint32 traceComponent,
       const Uint32 traceLevel,
       const char* fmt,
       ...)
   {
       if (_traceOn)
       {
           va_list argList;
   
           va_start(argList,fmt);
           _trace(fileName,lineNum,traceComponent,traceLevel,fmt,argList);
           va_end(argList);
       }
   }
   
   void Tracer::trace(
       const char*   fileName,
       const Uint32  lineNum,
       const Uint32  traceComponent,
       const Uint32  traceLevel,
       const String& traceString)
   {
       if (_traceOn)
       {
           _traceString( fileName, lineNum, traceComponent, traceLevel,
                         traceString );
       }
   }
   
   void Tracer::traceCIMException(
       const Uint32  traceComponent,
       const Uint32  traceLevel,
       CIMException  cimException)
   {
       if (_traceOn)
       {
           _traceCIMException( traceComponent, traceLevel, cimException );
       }
   }
   
   void Tracer::trace(
       const Uint32  traceComponent,
       const Uint32  level,
       const String& string)
   {
       trace("unknown", 0, traceComponent, level, string);
 } }
  
 #endif  #endif /* !PEGASUS_REMOVE_TRACE */
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

Legend:
Removed from v.1.1.2.8  
changed lines
  Added in v.1.38
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2