(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.5 and 1.25.2.9

version 1.25.2.5, 2006/05/23 18:23:40 version 1.25.2.9, 2007/03/09 18:47:03
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 189 
Line 190 
         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 624 
Line 623 
             }             }
 # 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 832 
Line 850 
         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
             Boolean keepWaiting = false;              pid_t status = 0;
             do             do
             {             {
                 pid_t status = waitpid(_pid, 0, 0);                  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 873 
Line 885 
     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 (!_isInitialized)  #if defined(PEGASUS_HAS_SIGNALS)
     {      pid_t pid;
         PEGASUS_ASSERT(0);  #endif
         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 900 
Line 912 
         }         }
  
 #if defined(PEGASUS_HAS_SIGNALS) #if defined(PEGASUS_HAS_SIGNALS)
         // Harvest the status of the agent process to prevent a zombie          // Save the _pid so we can use it after we've released the _agentMutex
         Boolean keepWaiting = false;          pid = _pid;
         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 969 
Line 964 
             "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 1018 
Line 1030 
         }         }
     } 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 1312 
Line 1329 
             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 1321 
Line 1337 
             // 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 1884 
Line 1899 
     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
     AutoMutex lock(_providerAgentTableMutex);      for (Uint32 j = 0; j < paContainerArray.size(); j++)
     ProviderAgentTable::Iterator i = _providerAgentTable.start();  
     for(; i != 0; i++)  
     {     {
         i.value()->unloadIdleProviders();          paContainerArray[j]->unloadIdleProviders();
     }     }
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();

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