BUG#: 8686

TITLE: Improve SLP provider starup performance, stage 1
DESCRIPTION: Get the registered profiles only once and properties from ObjectManager instance directly.

diff --git a/src/Providers/slp/SLPProvider.cpp b/src/Providers/slp/SLPProvider.cpp
index aba8471ad61416deecb65c1fe03e4ba14287a268..fcf90455b68aa60377f34729b0313bdc87ce35b7 100644 (file)
--- a/src/Providers/slp/SLPProvider.cpp
+++ b/src/Providers/slp/SLPProvider.cpp
@@ -1072,7 +1072,8 @@ Boolean SLPProvider::populateRegistrationData(
     const String& IPAddress,
     const CIMInstance& instance_ObjMgr,
     const CIMInstance& instance_ObjMgrComm,
-    const CIMClass& commMechClass)
+    const CIMClass& commMechClass,
+    const String &registeredProfiles)
 {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "SLPProvider::populateRegistrationData()");
@@ -1116,34 +1117,25 @@ Boolean SLPProvider::populateRegistrationData(
 
     // get service-hi-name and description from the instance of the
     // objectmanager class
-    for (Uint32 j = 0 ; j < instance_ObjMgr.getPropertyCount() ; j++)
-    {
-        CIMConstProperty p1=instance_ObjMgr.getProperty(j);
-        CIMValue v1=p1.getValue();
-        CIMName propertyName = p1.getName();
-
-        // service-hi-name=string O
-        // # This string is used as a name of the CIM service for human
-        // # interfaces. This attribute MUST be the
-        // # CIM_ObjectManager.ElementName property value.
-        if (propertyName.equal(elementNamePropertyName))
-            populateTemplateField(
-                templateInstance,
-                serviceHiNameAttribute,
-                v1.toString(),
-                serviceHiNameProperty);
-
-        // service-hi-description=string O
-        // # This string is used as a description of the CIM service for
-        // # human interfaces.This attribute MUST be the
-        // # CIM_ObjectManager.Description property value.
-        else if (propertyName.equal(descriptionPropertyName))
-            populateTemplateField(
-                templateInstance,
-                serviceHiDescriptionAttribute,
-                v1.toString(),
-                serviceHiDescriptionProperty);
-    }
+    String elementName = _getPropertyValueString(
+        instance_ObjMgr,
+        elementNamePropertyName);
+
+    populateTemplateField(
+        templateInstance,
+        serviceHiNameAttribute,
+        elementName,
+        serviceHiNameProperty);
+
+    String description = _getPropertyValueString(
+        instance_ObjMgr,
+        descriptionPropertyName);
+
+    populateTemplateField(
+        templateInstance,
+        serviceHiDescriptionAttribute,
+        description,
+        serviceHiDescriptionProperty);
 
     //    templateTypeProperty);
     populateTemplateField(
@@ -1297,7 +1289,7 @@ Boolean SLPProvider::populateRegistrationData(
     // populate the RegisteredProfiles Supported attribute.
 
     populateTemplateField(templateInstance,
-        registeredProfilesSupportedAttribute, getRegisteredProfileList());
+        registeredProfilesSupportedAttribute, registeredProfiles);
 
     //Begin registering the service. Keep this debug.
     CDEBUG("Template:\n" << _currentSLPTemplateString);
@@ -1443,6 +1435,8 @@ Uint32  SLPProvider::populateSLPRegistrations()
                << e.getMessage());
     }
 
+    String registeredProfiles = getRegisteredProfileList();
+
     // get instances of CIM_ObjectManagerCommMechanism and subclasses directly
     Array<CIMInstance> instancesObjMgrComm = _cimomHandle.enumerateInstances(
         OperationContext(),
@@ -1470,7 +1464,8 @@ Uint32  SLPProvider::populateSLPRegistrations()
             IPAddress,
             instancesObjMgr[0],
             instancesObjMgrComm[i],
-            pg_CIMXMLClass))
+            pg_CIMXMLClass,
+            registeredProfiles))
         {
             itemsRegistered++;
         }

diff --git a/src/Providers/slp/SLPProvider.h b/src/Providers/slp/SLPProvider.h
index e2480e12df26328bb39bf4c02ee95eb75289ad8b..d7fa727edf6235d5022c372df9a3159bf547d42b 100644 (file)
--- a/src/Providers/slp/SLPProvider.h
+++ b/src/Providers/slp/SLPProvider.h
@@ -109,7 +109,8 @@ class SLPProvider: public CIMInstanceProvider, public CIMMethodProvider
             const String& IPAddress,
             const CIMInstance& instance_ObjMgr,
             const CIMInstance& instance_ObjMgrComm,
-            const CIMClass& commMechClass);
+            const CIMClass& commMechClass,
+            const String& registeredProfiles);
 
         Boolean issueSLPRegistrations();
         Uint32 populateSLPRegistrations();