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

Diff for /pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropProvider.cpp between version 1.64 and 1.65

version 1.64, 2006/11/01 21:51:19 version 1.65, 2006/11/03 19:53:39
Line 59 
Line 59 
 #include <Pegasus/Common/StatisticalData.h> #include <Pegasus/Common/StatisticalData.h>
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
 PEGASUS_NAMESPACE_BEGIN;  PEGASUS_NAMESPACE_BEGIN
  
 /***************************************************************************** /*****************************************************************************
  *  *
Line 75 
Line 75 
 // Constructor for the InteropProvider control provider // Constructor for the InteropProvider control provider
 // //
 InteropProvider::InteropProvider(CIMRepository * rep) : repository(rep), InteropProvider::InteropProvider(CIMRepository * rep) : repository(rep),
     hostName(System::getHostName())//, namespacesInitialized(false)      hostName(System::getHostName()), providerInitialized(false),
       profileIds(Array<String>()), conformingElements(Array<CIMNameArray>()),
       elementNamespaces(Array<CIMNamespaceArray>())
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,"InteropProvider::InteropProvider");     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,"InteropProvider::InteropProvider");
  
     //  #ifndef PEGASUS_DISABLE_PERFINST
     // Initialize the object manager instance for the CIM Server, and retrieve  
     // the object manager's name property. This is retrieved once and stored  
     // for use in constructing other instances requiring its value.  
     //  
     CIMInstance objectManager = getObjectManagerInstance();  
     objectManager.getProperty(objectManager.findProperty(  
         OM_PROPERTY_NAME)).getValue().get(objectManagerName);  
   
     //  
     // Determine whether or not the CIMOM should be gathering statistical data  
     // based on the GatherStatisticalData property in the object manager.  
     //  
     Uint32 gatherDataIndex = objectManager.findProperty(  
         OM_PROPERTY_GATHERSTATISTICALDATA);  
     if(gatherDataIndex != PEG_NOT_FOUND)  
     {  
         CIMConstProperty gatherDataProp =  
             objectManager.getProperty(gatherDataIndex);  
         if (gatherDataProp.getType() == CIMTYPE_BOOLEAN)  
         {  
             CIMValue gatherDataVal  = gatherDataProp.getValue();  
             if (!gatherDataVal.isNull())  
             {  
                 Boolean gatherData;  
                 gatherDataVal.get(gatherData);  
                 if (gatherData == true)  
                 {  
                     StatisticalData* sd = StatisticalData::current();  
                     sd->setCopyGSD(true);  
                 }  
             }  
         }  
     }  
   
     // Cache this class definition for use later.  
     profileCapabilitiesClass = repository->getClass(  
         PEGASUS_NAMESPACENAME_INTEROP,  
         PEGASUS_CLASSNAME_PG_PROVIDERPROFILECAPABILITIES, false, true, false);  
     providerClassifications.append(Uint16(5)); // "Instrumentation"  
   
     //  
     // Initialize the namespaces so that all namespaces with the  
     // CIM_ElementConformsToProfile class also have the  
     // PG_ElementConformsToProfile class. This is needed in order to implement  
     // the cross-namespace ElementConformsToProfile association in both  
     // directions.  
     //  
     //if(!namespacesInitialized)  
     {  
         Array<CIMNamespaceName> namespaceNames =  
             repository->enumerateNameSpaces();  
         CIMClass conformsClass = repository->getClass(  
             PEGASUS_NAMESPACENAME_INTEROP,  
             PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE);  
         CIMClass profileClass = repository->getClass(  
             PEGASUS_NAMESPACENAME_INTEROP,  
             PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE);  
         for(Uint32 i = 0, n = namespaceNames.size(); i < n; ++i)  
         {  
             // Check if the PG_ElementConformsToProfile class is present  
             CIMNamespaceName & currentNamespace = namespaceNames[i];  
   
             CIMClass tmpCimClass;  
             CIMClass tmpPgClass;  
             CIMClass tmpPgProfileClass;  
             try             try
             {             {
                 // Look for these classes in the same try-block since the          initProvider();
                 // second depends on the first  
                 tmpCimClass = repository->getClass(currentNamespace,  
                     PEGASUS_CLASSNAME_CIM_ELEMENTCONFORMSTOPROFILE);  
                 tmpPgClass = repository->getClass(currentNamespace,  
                     PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE);  
             }  
             catch(...)  
             {  
             }  
             try  
             {  
                 tmpPgProfileClass = repository->getClass(currentNamespace,  
                     PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE);  
             }             }
             catch(...)      catch(const Exception & e)
             {             {
                 // Note: if any of the above three classes aren't found,          // Provider initialization may fail if the repository is not
                 // an exception will be thrown, which we can ignore since it's          // populated
                 // an expected case  
                 // TBD: Log trace message?  
             }             }
   #endif
  
             // If the CIM_ElementConformsToProfile class is present, but  
             // the PG_ElementConformsToProfile or PG_RegisteredProfile  
             // class is not, then add it to that namespace.  
             //  
             // Note that we don't have to check for the  
             // CIM_RegisteredProfile class because if the  
             // CIM_ElementConformsToProfile class is present, the  
             // CIM_RegisteredProfile class must also be present.  
             if(!tmpCimClass.isUninitialized())  
             {  
                 if(tmpPgClass.isUninitialized())  
                 {  
                     CIMObjectPath newPath = conformsClass.getPath();  
                     newPath.setNameSpace(currentNamespace);  
                     conformsClass.setPath(newPath);  
                     repository->createClass(currentNamespace,  
                         conformsClass);  
                 }  
                 if(tmpPgProfileClass.isUninitialized())  
                 {  
                     CIMObjectPath newPath = conformsClass.getPath();  
                     newPath.setNameSpace(currentNamespace);  
                     conformsClass.setPath(newPath);  
                     repository->createClass(currentNamespace,  
                         profileClass);  
                 }  
             }  
         }  
   
         //namespacesInitialized = true; - currently unused  
     }  
   
     // Now cache the Registration info used for ElementConformsToProfile assoc  
     cacheProfileRegistrationInfo();  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 781 
Line 670 
         dependencyClass);         dependencyClass);
 } }
  
 PEGASUS_NAMESPACE_END;  void InteropProvider::initProvider()
   {
       if(providerInitialized)
           return;
       // Placed METHOD_ENTER trace statement after checking whether the
       // provider is initialized because this method will be called for every
       // operation through the InteropProvider, and this method is only
       // interesting the first time it is successfully run.
       PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
           "InteropProvider::initProvider()");
   
       AutoMutex lock(interopMut);
       if(!providerInitialized)
       {
           //
           // Initialize the object manager instance for the CIM Server, and
           // retrieve the object manager's name property. This is retrieved once
           // and stored for use in constructing other instances requiring its
           // value.
           //
           CIMInstance objectManager = getObjectManagerInstance();
           objectManager.getProperty(objectManager.findProperty(
               OM_PROPERTY_NAME)).getValue().get(objectManagerName);
   
           //
           // Determine whether or not the CIMOM should be gathering statistical data
           // based on the GatherStatisticalData property in the object manager.
           //
           Uint32 gatherDataIndex = objectManager.findProperty(
               OM_PROPERTY_GATHERSTATISTICALDATA);
           if(gatherDataIndex != PEG_NOT_FOUND)
           {
               CIMConstProperty gatherDataProp =
                   objectManager.getProperty(gatherDataIndex);
               if (gatherDataProp.getType() == CIMTYPE_BOOLEAN)
               {
                   CIMValue gatherDataVal  = gatherDataProp.getValue();
                   if (!gatherDataVal.isNull())
                   {
                       Boolean gatherData;
                       gatherDataVal.get(gatherData);
                       if (gatherData == true)
                       {
                           StatisticalData* sd = StatisticalData::current();
                           sd->setCopyGSD(true);
                       }
                   }
               }
           }
   
           // Cache this class definition for use later.
           profileCapabilitiesClass = repository->getClass(
               PEGASUS_NAMESPACENAME_INTEROP,
               PEGASUS_CLASSNAME_PG_PROVIDERPROFILECAPABILITIES, false, true, false);
           providerClassifications.append(Uint16(5)); // "Instrumentation"
   
           //
           // Initialize the namespaces so that all namespaces with the
           // CIM_ElementConformsToProfile class also have the
           // PG_ElementConformsToProfile class. This is needed in order to implement
           // the cross-namespace ElementConformsToProfile association in both
           // directions.
           //
           Array<CIMNamespaceName> namespaceNames =
               repository->enumerateNameSpaces();
           CIMClass conformsClass = repository->getClass(
               PEGASUS_NAMESPACENAME_INTEROP,
               PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE);
           CIMClass profileClass = repository->getClass(
               PEGASUS_NAMESPACENAME_INTEROP,
               PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE);
           for(Uint32 i = 0, n = namespaceNames.size(); i < n; ++i)
           {
               // Check if the PG_ElementConformsToProfile class is present
               CIMNamespaceName & currentNamespace = namespaceNames[i];
   
               CIMClass tmpCimClass;
               CIMClass tmpPgClass;
               CIMClass tmpPgProfileClass;
               try
               {
                   // Look for these classes in the same try-block since the
                   // second depends on the first
                   tmpCimClass = repository->getClass(currentNamespace,
                       PEGASUS_CLASSNAME_CIM_ELEMENTCONFORMSTOPROFILE);
                   tmpPgClass = repository->getClass(currentNamespace,
                       PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE);
               }
               catch(const Exception &)
               {
               }
               try
               {
                   tmpPgProfileClass = repository->getClass(currentNamespace,
                       PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE);
               }
               catch(const Exception &)
               {
                   // Note: if any of the above three classes aren't found,
                   // an exception will be thrown, which we can ignore since it's
                   // an expected case
                   // TBD: Log trace message?
               }
   
               // If the CIM_ElementConformsToProfile class is present, but
               // the PG_ElementConformsToProfile or PG_RegisteredProfile
               // class is not, then add it to that namespace.
               //
               // Note that we don't have to check for the
               // CIM_RegisteredProfile class because if the
               // CIM_ElementConformsToProfile class is present, the
               // CIM_RegisteredProfile class must also be present.
               if(!tmpCimClass.isUninitialized())
               {
                   if(tmpPgClass.isUninitialized())
                   {
                       CIMObjectPath newPath = conformsClass.getPath();
                       newPath.setNameSpace(currentNamespace);
                       conformsClass.setPath(newPath);
                       repository->createClass(currentNamespace,
                           conformsClass);
                   }
                   if(tmpPgProfileClass.isUninitialized())
                   {
                       CIMObjectPath newPath = conformsClass.getPath();
                       newPath.setNameSpace(currentNamespace);
                       conformsClass.setPath(newPath);
                       repository->createClass(currentNamespace,
                           profileClass);
                   }
               }
           }
   
           // Now cache the Registration info used for ElementConformsToProfile
           cacheProfileRegistrationInfo();
   
           providerInitialized = true;
       }
   
       PEG_METHOD_EXIT();
   }
   
   PEGASUS_NAMESPACE_END
  
 // END OF FILE // END OF FILE

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