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

Diff for /pegasus/src/Pegasus/ProviderManager2/Attic/OOPProviderManagerRouter.cpp between version 1.25.2.9 and 1.26

version 1.25.2.9, 2007/03/09 18:47:03 version 1.26, 2006/02/24 19:16:28
Line 70 
Line 70 
 # include <unistd.h>  // For fork(), exec(), and _exit() # include <unistd.h>  // For fork(), exec(), and _exit()
 # include <errno.h> # include <errno.h>
 # include <sys/types.h> # include <sys/types.h>
 # include <sys/resource.h>  
 # if defined(PEGASUS_HAS_SIGNALS) # if defined(PEGASUS_HAS_SIGNALS)
 #  include <sys/wait.h> #  include <sys/wait.h>
 # endif # endif
Line 98 
Line 97 
 { {
 public: public:
     OutstandingRequestEntry(     OutstandingRequestEntry(
         String originalMessageId_,          String messageId_,
         CIMRequestMessage* requestMessage_,         CIMRequestMessage* requestMessage_,
         CIMResponseMessage*& responseMessage_,         CIMResponseMessage*& responseMessage_,
         Semaphore* responseReady_)         Semaphore* responseReady_)
         : originalMessageId(originalMessageId_),          : messageId(messageId_),
           requestMessage(requestMessage_),           requestMessage(requestMessage_),
           responseMessage(responseMessage_),           responseMessage(responseMessage_),
           responseReady(responseReady_)           responseReady(responseReady_)
     {     {
     }     }
  
     /**      String messageId;
         A unique value is substituted as the request messageId attribute to  
         allow responses to be definitively correllated with requests.  
         The original messageId value is stored here to avoid a race condition  
         between the processing of a response chunk and the resetting of the  
         original messageId in the request message.  
      */  
     String originalMessageId;  
     CIMRequestMessage* requestMessage;     CIMRequestMessage* requestMessage;
     CIMResponseMessage*& responseMessage;     CIMResponseMessage*& responseMessage;
     Semaphore* responseReady;     Semaphore* responseReady;
Line 136 
Line 128 
     ProviderAgentContainer(     ProviderAgentContainer(
         const String & moduleName,         const String & moduleName,
         const String & userName,         const String & userName,
         Uint16 userContext,  
         PEGASUS_INDICATION_CALLBACK_T indicationCallback,         PEGASUS_INDICATION_CALLBACK_T indicationCallback,
         PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback,         PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback,
         PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T providerModuleFailCallback,  
         Boolean subscriptionInitComplete);         Boolean subscriptionInitComplete);
  
     ~ProviderAgentContainer();     ~ProviderAgentContainer();
Line 190 
Line 180 
         The connection is closed and outstanding requests are completed         The connection is closed and outstanding requests are completed
         with an error result.         with an error result.
  
           Note: The caller must lock the _agentMutex.
   
         @param cleanShutdown Indicates whether the provider agent process         @param cleanShutdown Indicates whether the provider agent process
         exited cleanly.  A value of true indicates that responses have been         exited cleanly.  A value of true indicates that responses have been
         sent for all requests that have been processed.  A value of false         sent for all requests that have been processed.  A value of false
Line 233 
Line 225 
     String _userName;     String _userName;
  
     /**     /**
         User Context setting of the provider module served by this Provider  
         Agent.  
      */  
     Uint16 _userContext;  
   
     /**  
         Callback function to which all generated indications are sent for         Callback function to which all generated indications are sent for
         processing.         processing.
      */      */
Line 250 
Line 236 
     PEGASUS_RESPONSE_CHUNK_CALLBACK_T _responseChunkCallback;     PEGASUS_RESPONSE_CHUNK_CALLBACK_T _responseChunkCallback;
  
     /**     /**
         Callback function to be called upon detection of failure of a  
         provider module.  
      */  
     PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T _providerModuleFailCallback;  
   
     /**  
         Indicates whether the Provider Agent is active.         Indicates whether the Provider Agent is active.
      */      */
     Boolean _isInitialized;     Boolean _isInitialized;
Line 345 
Line 325 
 ProviderAgentContainer::ProviderAgentContainer( ProviderAgentContainer::ProviderAgentContainer(
     const String & moduleName,     const String & moduleName,
     const String & userName,     const String & userName,
     Uint16 userContext,  
     PEGASUS_INDICATION_CALLBACK_T indicationCallback,     PEGASUS_INDICATION_CALLBACK_T indicationCallback,
     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback,     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback,
     PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T providerModuleFailCallback,  
     Boolean subscriptionInitComplete)     Boolean subscriptionInitComplete)
     : _moduleName(moduleName),     : _moduleName(moduleName),
       _userName(userName),       _userName(userName),
       _userContext(userContext),  
       _indicationCallback(indicationCallback),       _indicationCallback(indicationCallback),
       _responseChunkCallback(responseChunkCallback),       _responseChunkCallback(responseChunkCallback),
       _providerModuleFailCallback(providerModuleFailCallback),  
       _isInitialized(false),       _isInitialized(false),
       _subscriptionInitComplete(subscriptionInitComplete)       _subscriptionInitComplete(subscriptionInitComplete)
 { {
Line 544 
Line 520 
     }     }
 #elif defined (PEGASUS_OS_OS400) #elif defined (PEGASUS_OS_OS400)
  
     //Out of process provider support for OS400 goes here when needed.      //Out of provider support for OS400 goes here when needed.
  
 #else #else
   
 # ifndef PEGASUS_DISABLE_PROV_USERCTXT  
     // Get and save the effective user name and the uid/gid for the user  
     // context of the agent process  
   
     String effectiveUserName = System::getEffectiveUserName();  
     PEGASUS_UID_T newUid = (PEGASUS_UID_T) -1;  
     PEGASUS_GID_T newGid = (PEGASUS_GID_T) -1;  
     if (_userName != effectiveUserName)  
     {  
         if (!System::lookupUserId(_userName.getCString(), newUid, newGid))  
         {  
             throw PEGASUS_CIM_EXCEPTION_L(  
                 CIM_ERR_FAILED,  
                 MessageLoaderParms(  
                     "ProviderManager.OOPProviderManagerRouter."  
                         "USER_CONTEXT_CHANGE_FAILED",  
                     "Unable to change user context to \"$0\".", _userName));  
         }  
     }  
 # endif  
   
     pid_t pid = fork();     pid_t pid = fork();
     if (pid < 0)     if (pid < 0)
     {     {
Line 606 
Line 560 
  
 # ifndef PEGASUS_DISABLE_PROV_USERCTXT # ifndef PEGASUS_DISABLE_PROV_USERCTXT
             // Set the user context of the Provider Agent process             // Set the user context of the Provider Agent process
             if (_userName != effectiveUserName)              if (_userName != System::getEffectiveUserName())
             {             {
                 if (!System::changeUserContext(newUid, newGid))                  if (!System::changeUserContext(_userName.getCString()))
                 {                 {
                     Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,                     Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
                         "System::changeUserContext() failed.  userName = %s.",                         "System::changeUserContext() failed.  userName = %s.",
Line 623 
Line 577 
             }             }
 # endif # endif
  
             // Close all file descriptors except stdin/stdout/stderr  
             // and the pipe handles needed by the Provider Agent process.  
   
             Uint32 readFd = atoi(readHandle);  
             Uint32 writeFd = atoi(writeHandle);  
             struct rlimit fileLimit;  
   
             if (getrlimit(RLIMIT_NOFILE, &fileLimit) == 0)  
             {  
                 Uint32 maxFd = (Uint32)fileLimit.rlim_cur;  
                 for (Uint32 i = 3; i < maxFd - 1; i++)  
                 {  
                     if ((i != readFd) && (i != writeFd))  
                     {  
                         close(i);  
                     }  
                 }  
             }  
   
             execl(agentCommandPathCString, agentCommandPathCString,             execl(agentCommandPathCString, agentCommandPathCString,
                 readHandle, writeHandle,                 readHandle, writeHandle,
                 (const char*)_moduleName.getCString(), (char*)0);                 (const char*)_moduleName.getCString(), (char*)0);
Line 850 
Line 785 
         if (_isInitialized)         if (_isInitialized)
         {         {
             // Harvest the status of the agent process to prevent a zombie             // Harvest the status of the agent process to prevent a zombie
             pid_t status = 0;              Boolean keepWaiting = false;
             do             do
             {             {
                 status = waitpid(_pid, 0, 0);                  pid_t status = waitpid(_pid, 0, 0);
             } while ((status == -1) && (errno == EINTR));  
   
             if (status == -1)             if (status == -1)
             {             {
                       if (errno == EINTR)
                       {
                           keepWaiting = true;
                       }
                       else
                       {
                 Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,                 Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
                     "ProviderAgentContainer::_initialize(): "                     "ProviderAgentContainer::_initialize(): "
                         "waitpid failed; errno = %d.", errno);                         "waitpid failed; errno = %d.", errno);
             }             }
         }         }
               } while (keepWaiting);
           }
 #endif #endif
  
         _isInitialized = false;         _isInitialized = false;
Line 885 
Line 826 
     return _isInitialized;     return _isInitialized;
 } }
  
   // Note: Caller must lock _agentMutex
 void ProviderAgentContainer::_uninitialize(Boolean cleanShutdown) void ProviderAgentContainer::_uninitialize(Boolean cleanShutdown)
 { {
     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,
         "ProviderAgentContainer::_uninitialize");         "ProviderAgentContainer::_uninitialize");
  
 #if defined(PEGASUS_HAS_SIGNALS)      if (!_isInitialized)
     pid_t pid;      {
 #endif          PEGASUS_ASSERT(0);
           PEG_METHOD_EXIT();
           return;
       }
  
     try     try
     {     {
         AutoMutex lock(_agentMutex);  
   
         PEGASUS_ASSERT(_isInitialized);  
   
         // Close the connection with the Provider Agent         // Close the connection with the Provider Agent
         _pipeFromAgent.reset();         _pipeFromAgent.reset();
         _pipeToAgent.reset();         _pipeToAgent.reset();
Line 912 
Line 853 
         }         }
  
 #if defined(PEGASUS_HAS_SIGNALS) #if defined(PEGASUS_HAS_SIGNALS)
         // Save the _pid so we can use it after we've released the _agentMutex          // Harvest the status of the agent process to prevent a zombie
         pid = _pid;          Boolean keepWaiting = false;
           do
           {
               pid_t status = waitpid(_pid, 0, 0);
               if (status == -1)
               {
                   if (errno == EINTR)
                   {
                       keepWaiting = true;
                   }
                   else
                   {
                       Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
                           "ProviderAgentContainer::_uninitialize(): "
                               "waitpid failed; errno = %d.", errno);
                   }
               }
           } while (keepWaiting);
 #endif #endif
  
         _isInitialized = false;         _isInitialized = false;
Line 933 
Line 891 
                  i != 0; i++)                  i != 0; i++)
             {             {
                 PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL2,                 PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL2,
                     String("Completing messageId \"") + i.key() +                      String("Completing messageId \"") + i.value()->messageId +
                         "\" with a null response.");                         "\" with a null response.");
                 i.value()->responseMessage = response;                 i.value()->responseMessage = response;
                 i.value()->responseReady->signal();                 i.value()->responseReady->signal();
             }             }
  
             _outstandingRequestTable.clear();             _outstandingRequestTable.clear();
   
             //  
             //  If not a clean shutdown, call the provider module failure  
             //  callback  
             //  
             if (!cleanShutdown)  
             {  
                 //  
                 //  Call the provider module failure callback to  
                 //  communicate the failure to the Provider Manager Service  
                 //  Provider Manager Service will inform Indication Service  
                 //  
                 _providerModuleFailCallback (_moduleName, _userName,  
                     _userContext);  
             }  
         }         }
     }     }
     catch (...)     catch (...)
Line 964 
Line 907 
             "Ignoring _uninitialize() exception.");             "Ignoring _uninitialize() exception.");
     }     }
  
 #if defined(PEGASUS_HAS_SIGNALS)  
     // Harvest the status of the agent process to prevent a zombie.  Do not  
     // hold the _agentMutex during this operation.  
     pid_t status = 0;  
     do  
     {  
         status = waitpid(pid, 0, 0);  
     } while ((status == -1) && (errno == EINTR));  
   
     if (status == -1)  
     {  
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,  
             "ProviderAgentContainer::_uninitialize(): "  
                 "waitpid failed; errno = %d.", errno);  
     }  
 #endif  
   
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 1030 
Line 956 
         }         }
     } while (response == _REQUEST_NOT_PROCESSED);     } while (response == _REQUEST_NOT_PROCESSED);
  
     if (request->getType() == CIM_SUBSCRIPTION_INIT_COMPLETE_REQUEST_MESSAGE)  
     {  
         _subscriptionInitComplete = true;  
     }  
   
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return response;     return response;
 } }
Line 1072 
Line 993 
         //         //
         Semaphore waitSemaphore(0);         Semaphore waitSemaphore(0);
         OutstandingRequestEntry outstandingRequestEntry(         OutstandingRequestEntry outstandingRequestEntry(
             originalMessageId, request, response, &waitSemaphore);              uniqueMessageId, request, response, &waitSemaphore);
  
         //         //
         // Lock the Provider Agent Container while initializing the         // Lock the Provider Agent Container while initializing the
Line 1329 
Line 1250 
             if ((readStatus == AnonymousPipe::STATUS_ERROR) ||             if ((readStatus == AnonymousPipe::STATUS_ERROR) ||
                 (readStatus == AnonymousPipe::STATUS_CLOSED))                 (readStatus == AnonymousPipe::STATUS_CLOSED))
             {             {
                   AutoMutex lock(_agentMutex);
                 _uninitialize(false);                 _uninitialize(false);
                 return;                 return;
             }             }
Line 1337 
Line 1259 
             // finished its processing and is ready to exit.             // finished its processing and is ready to exit.
             if (message == 0)             if (message == 0)
             {             {
                   AutoMutex lock(_agentMutex);
                 _uninitialize(true);                 _uninitialize(true);
                 return;                 return;
             }             }
Line 1365 
Line 1288 
  
                 // Put the original message ID into the response                 // Put the original message ID into the response
                 response->messageId =                 response->messageId =
                     _outstandingRequestEntry->originalMessageId;                      _outstandingRequestEntry->requestMessage->messageId;
  
                 // Call the response chunk callback to process the chunk                 // Call the response chunk callback to process the chunk
                 _responseChunkCallback(                 _responseChunkCallback(
Line 1426 
Line 1349 
  
 OOPProviderManagerRouter::OOPProviderManagerRouter( OOPProviderManagerRouter::OOPProviderManagerRouter(
     PEGASUS_INDICATION_CALLBACK_T indicationCallback,     PEGASUS_INDICATION_CALLBACK_T indicationCallback,
     PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback,      PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback)
     PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T providerModuleFailCallback)  
 { {
     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,
         "OOPProviderManagerRouter::OOPProviderManagerRouter");         "OOPProviderManagerRouter::OOPProviderManagerRouter");
  
     _indicationCallback = indicationCallback;     _indicationCallback = indicationCallback;
     _responseChunkCallback = responseChunkCallback;     _responseChunkCallback = responseChunkCallback;
     _providerModuleFailCallback = providerModuleFailCallback;  
     _subscriptionInitComplete = false;     _subscriptionInitComplete = false;
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 1692 
Line 1613 
     }     }
     else     else
     {     {
         //  
         // Look up the Provider Agent for this module instance and requesting  
         // user  
         //  
         ProviderAgentContainer* pa = _lookupProviderAgent(providerModule,  
             request);  
         PEGASUS_ASSERT(pa != 0);  
   
         //  
         // Forward the request to the provider agent  
         //  
         response.reset(pa->processMessage(request));  
     }  
   
     response->syncAttributes(request);  
   
     PEG_METHOD_EXIT();  
     return response.release();  
 }  
   
 ProviderAgentContainer* OOPProviderManagerRouter::_lookupProviderAgent(  
     const CIMInstance& providerModule,  
     CIMRequestMessage* request)  
 {  
     // Retrieve the provider module name     // Retrieve the provider module name
     String moduleName;     String moduleName;
     CIMValue nameValue = providerModule.getProperty(     CIMValue nameValue = providerModule.getProperty(
Line 1738 
Line 1635 
  
     if (userContext == 0)     if (userContext == 0)
     {     {
         userContext = PEGASUS_DEFAULT_PROV_USERCTXT;              userContext = PG_PROVMODULE_USERCTXT_PRIVILEGED;
     }     }
  
     String userName;     String userName;
Line 1752 
Line 1649 
                 request->operationContext.get(IdentityContainer::NAME);                 request->operationContext.get(IdentityContainer::NAME);
             userName = ic.getUserName();             userName = ic.getUserName();
         }         }
         catch (Exception&)              catch (Exception& e)
         {         {
             // If no IdentityContainer is present, default to the CIM             // If no IdentityContainer is present, default to the CIM
             // Server's user context             // Server's user context
Line 1766 
Line 1663 
     }     }
     else if (userContext == PG_PROVMODULE_USERCTXT_DESIGNATED)     else if (userContext == PG_PROVMODULE_USERCTXT_DESIGNATED)
     {     {
         // Retrieve the provider module designated user property value              // Retrieve the provider module name
         providerModule.getProperty(providerModule.findProperty(         providerModule.getProperty(providerModule.findProperty(
             PEGASUS_PROPERTYNAME_MODULE_DESIGNATEDUSER)).getValue().             PEGASUS_PROPERTYNAME_MODULE_DESIGNATEDUSER)).getValue().
             get(userName);             get(userName);
Line 1788 
Line 1685 
     PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL4,     PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL4,
         "User name = " + userName);         "User name = " + userName);
  
           // Look up the Provider Agent for this module and user
           ProviderAgentContainer* pa = _lookupProviderAgent(moduleName, userName);
           PEGASUS_ASSERT(pa != 0);
   
           //
           // Forward the request to the provider agent
           //
           response.reset(pa->processMessage(request));
       }
   
       response->syncAttributes(request);
   
       PEG_METHOD_EXIT();
       return response.release();
   }
   
   ProviderAgentContainer* OOPProviderManagerRouter::_lookupProviderAgent(
       const String& moduleName,
       const String& userName)
   {
     ProviderAgentContainer* pa = 0;     ProviderAgentContainer* pa = 0;
     String key = moduleName + ":" + userName;     String key = moduleName + ":" + userName;
  
Line 1795 
Line 1712 
     if (!_providerAgentTable.lookup(key, pa))     if (!_providerAgentTable.lookup(key, pa))
     {     {
         pa = new ProviderAgentContainer(         pa = new ProviderAgentContainer(
             moduleName, userName, userContext,              moduleName, userName, _indicationCallback, _responseChunkCallback,
             _indicationCallback, _responseChunkCallback,  
             _providerModuleFailCallback,  
             _subscriptionInitComplete);             _subscriptionInitComplete);
         _providerAgentTable.insert(key, pa);         _providerAgentTable.insert(key, pa);
     }     }
Line 1899 
Line 1814 
     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,     PEG_METHOD_ENTER(TRC_PROVIDERMANAGER,
         "OOPProviderManagerRouter::unloadIdleProviders");         "OOPProviderManagerRouter::unloadIdleProviders");
  
     // Get a list of the ProviderAgentContainers.  We need our own array copy  
     // because we cannot hold the _providerAgentTableMutex while calling  
     // ProviderAgentContainer::unloadIdleProviders().  
     Array<ProviderAgentContainer*> paContainerArray;  
     {  
         AutoMutex tableLock(_providerAgentTableMutex);  
         for (ProviderAgentTable::Iterator i = _providerAgentTable.start();  
              i != 0; i++)  
         {  
             paContainerArray.append(i.value());  
         }  
     }  
   
     // Iterate through the _providerAgentTable unloading idle providers     // Iterate through the _providerAgentTable unloading idle providers
     for (Uint32 j = 0; j < paContainerArray.size(); j++)      AutoMutex lock(_providerAgentTableMutex);
       ProviderAgentTable::Iterator i = _providerAgentTable.start();
       for(; i != 0; i++)
     {     {
         paContainerArray[j]->unloadIdleProviders();          i.value()->unloadIdleProviders();
     }     }
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();

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