(file) Return to CMPIProvider.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / CMPI

Diff for /pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp between version 1.15 and 1.16

version 1.15, 2005/02/25 21:44:18 version 1.16, 2005/04/26 16:20:13
Line 131 
Line 131 
         const OperationContext opc;         const OperationContext opc;
         CMPI_ContextOnStack eCtx(opc);         CMPI_ContextOnStack eCtx(opc);
         CMPI_ThreadContext thr(&broker,&eCtx);         CMPI_ThreadContext thr(&broker,&eCtx);
               CMPIStatus rc = {CMPI_RC_OK, NULL};
  
         if (miVector.genericMode) {         if (miVector.genericMode) {
            CString mName=name.getCString();            CString mName=name.getCString();
            if (miVector.miTypes & CMPI_MIType_Instance)            if (miVector.miTypes & CMPI_MIType_Instance)
               miVector.instMI=miVector.createGenInstMI(&broker,&eCtx,mName);                miVector.instMI=miVector.createGenInstMI(&broker,&eCtx,mName, &rc);
            if (miVector.miTypes & CMPI_MIType_Association)            if (miVector.miTypes & CMPI_MIType_Association)
               miVector.assocMI=miVector.createGenAssocMI(&broker,&eCtx,mName);                miVector.assocMI=miVector.createGenAssocMI(&broker,&eCtx,mName, &rc);
            if (miVector.miTypes & CMPI_MIType_Method)            if (miVector.miTypes & CMPI_MIType_Method)
               miVector.methMI=miVector.createGenMethMI(&broker,&eCtx,mName);                miVector.methMI=miVector.createGenMethMI(&broker,&eCtx,mName, &rc);
            if (miVector.miTypes & CMPI_MIType_Property)            if (miVector.miTypes & CMPI_MIType_Property)
               miVector.propMI=miVector.createGenPropMI(&broker,&eCtx,mName);                miVector.propMI=miVector.createGenPropMI(&broker,&eCtx,mName, &rc);
            if (miVector.miTypes & CMPI_MIType_Indication)            if (miVector.miTypes & CMPI_MIType_Indication)
               miVector.indMI=miVector.createGenIndMI(&broker,&eCtx,mName);                miVector.indMI=miVector.createGenIndMI(&broker,&eCtx,mName, &rc);
         }         }
         else {         else {
            if (miVector.miTypes & CMPI_MIType_Instance)            if (miVector.miTypes & CMPI_MIType_Instance)
               miVector.instMI=miVector.createInstMI(&broker,&eCtx);                miVector.instMI=miVector.createInstMI(&broker,&eCtx, &rc);
            if (miVector.miTypes & CMPI_MIType_Association)            if (miVector.miTypes & CMPI_MIType_Association)
               miVector.assocMI=miVector.createAssocMI(&broker,&eCtx);                miVector.assocMI=miVector.createAssocMI(&broker,&eCtx, &rc);
            if (miVector.miTypes & CMPI_MIType_Method)            if (miVector.miTypes & CMPI_MIType_Method)
               miVector.methMI=miVector.createMethMI(&broker,&eCtx);                miVector.methMI=miVector.createMethMI(&broker,&eCtx, &rc);
            if (miVector.miTypes & CMPI_MIType_Property)            if (miVector.miTypes & CMPI_MIType_Property)
               miVector.propMI=miVector.createPropMI(&broker,&eCtx);                miVector.propMI=miVector.createPropMI(&broker,&eCtx, &rc);
            if (miVector.miTypes & CMPI_MIType_Indication)            if (miVector.miTypes & CMPI_MIType_Indication)
               miVector.indMI=miVector.createIndMI(&broker,&eCtx);                miVector.indMI=miVector.createIndMI(&broker,&eCtx, &rc);
         }         }
 } }
  
Line 205 
Line 206 
       try       try
       {       {
         if (noUnload==false) {         if (noUnload==false) {
            terminate();                  // False means that the CIMServer is not shutting down.
              _terminate(false);
            if (noUnload==true) {            if (noUnload==true) {
               _status=savedStatus;               _status=savedStatus;
               return false;               return false;
Line 229 
Line 231 
   return terminated;   return terminated;
 } }
  
 void CMPIProvider::_terminate(void)  void CMPIProvider::_terminate(Boolean terminating)
 { {
     if (broker.clsCache) {     if (broker.clsCache) {
         ClassCache::Iterator i=broker.clsCache->start();         ClassCache::Iterator i=broker.clsCache->start();
Line 243 
Line 245 
     CMPIStatus rc={CMPI_RC_OK,NULL};     CMPIStatus rc={CMPI_RC_OK,NULL};
     CMPI_ContextOnStack eCtx(opc);     CMPI_ContextOnStack eCtx(opc);
     CMPI_ThreadContext thr(&broker,&eCtx);     CMPI_ThreadContext thr(&broker,&eCtx);
       CMPIBoolean term = terminating;
   /*
    @param terminating When true, the terminating argument indicates that the MB is in the process of
        terminating and that cleanup must be done. When set to false, the MI may respond with
        CMPI_IRC_DO_NOT_UNLOAD, or CMPI_IRC_NEVER_UNLOAD, indicating that unload will
        interfere with current MI processing.
        @return Function return status. The following CMPIrc codes shall be recognized:
           CMPI_RC_OK Operation successful.
           CMPI_RC_ERR_FAILED Unspecific error occurred.
           CMPI_RC_DO_NOT_UNLOAD Operation successful - do not unload now.
           CMPI_RC_NEVER_UNLOAD Operation successful - never unload.
   */
     if (miVector.miTypes & CMPI_MIType_Instance) {     if (miVector.miTypes & CMPI_MIType_Instance) {
        rc=miVector.instMI->ft->cleanup(miVector.instMI,&eCtx);         rc=miVector.instMI->ft->cleanup(miVector.instMI,&eCtx, &term);
        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;
              if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true;
     }     }
     if (miVector.miTypes & CMPI_MIType_Association) {     if (miVector.miTypes & CMPI_MIType_Association) {
        rc=miVector.assocMI->ft->cleanup(miVector.assocMI,&eCtx);         rc=miVector.assocMI->ft->cleanup(miVector.assocMI,&eCtx, &term);
        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;
              if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true;
     }     }
     if (miVector.miTypes & CMPI_MIType_Method) {     if (miVector.miTypes & CMPI_MIType_Method) {
        rc=miVector.methMI->ft->cleanup(miVector.methMI,&eCtx);         rc=miVector.methMI->ft->cleanup(miVector.methMI,&eCtx, &term);
        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;
              if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true;
     }     }
     if (miVector.miTypes & CMPI_MIType_Property) {     if (miVector.miTypes & CMPI_MIType_Property) {
        rc=miVector.propMI->ft->cleanup(miVector.propMI,&eCtx);         rc=miVector.propMI->ft->cleanup(miVector.propMI,&eCtx, &term);
        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;
              if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true;
     }     }
     if (miVector.miTypes & CMPI_MIType_Indication) {     if (miVector.miTypes & CMPI_MIType_Indication) {
        rc=miVector.indMI->ft->cleanup(miVector.indMI,&eCtx);         rc=miVector.indMI->ft->cleanup(miVector.indMI,&eCtx, &term);
        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;
              if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true;
     }     }
  
 } }
  
  
 void CMPIProvider::terminate(void)  void CMPIProvider::terminate()
 { {
   Status savedStatus=_status;   Status savedStatus=_status;
   if(_status == INITIALIZED)   if(_status == INITIALIZED)
Line 277 
Line 295 
           pegasus_yield();           pegasus_yield();
           try           try
     {     {
         _terminate();          _terminate(false);
               if (noUnload==true) {               if (noUnload==true) {
             _status=savedStatus;             _status=savedStatus;
                   return;                   return;

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