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

Diff for /pegasus/src/Pegasus/Listener/CIMListener.cpp between version 1.19 and 1.25

version 1.19, 2004/05/21 20:57:00 version 1.25, 2004/10/17 20:39:56
Line 1 
Line 1 
 //%2003////////////////////////////////////////////////////////////////////////  //%2004////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development  // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L. P., IBM Corp., The Open Group, Tivoli Systems.  // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.; // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
 // IBM Corp.; EMC Corporation, The Open Group. // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 26 
Line 28 
 // Author: Dong Xiang, EMC Corporation (xiang_dong@emc.com) // Author: Dong Xiang, EMC Corporation (xiang_dong@emc.com)
 // //
 // Modified By:   Dan Gorey (djgorey@us.ibm.com) // Modified By:   Dan Gorey (djgorey@us.ibm.com)
   //                Amit K Arora, IBM (amita@in.ibm.com) for PEP#183
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 214 
Line 217 
  
         }         }
 } }
   
 void CIMListenerService::runForever() void CIMListenerService::runForever()
 { {
         static int modulator = 0;         static int modulator = 0;
Line 221 
Line 225 
         if(!_dieNow)         if(!_dieNow)
         {         {
     #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT     #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT
     if(false == _monitor->run(100))        if(false == _monitor->run(500000))
     {     {
                         modulator++;                         modulator++;
                         if(!(modulator % 5000) )  
                         {  
                                 try                                 try
                                 {                                 {
                                         //MessageQueueService::_check_idle_flag = 1;                                         //MessageQueueService::_check_idle_flag = 1;
Line 236 
Line 238 
                                 {                                 {
                                 }                                 }
                         }                         }
                 }  
 /* /*
                 if (handleShutdownSignal)                 if (handleShutdownSignal)
                 {                 {
Line 258 
Line 259 
     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::shutdown()");     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::shutdown()");
  
     _dieNow = true;     _dieNow = true;
   #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT
       _monitor->tickle();
   #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 278 
Line 282 
  
     // tell Monitor to stop listening for client connections     // tell Monitor to stop listening for client connections
     #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT     #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT
     _monitor->stopListeningForConnections();      _monitor->stopListeningForConnections(true);
     #else     #else
     _monitor->stop();     _monitor->stop();
     #endif     #endif
Line 293 
Line 297 
     // for the wait here is to make sure that the Monitor entries     // for the wait here is to make sure that the Monitor entries
     // are updated before closing the connection sockets.     // are updated before closing the connection sockets.
     //     //
     pegasus_sleep(150);      // pegasus_sleep(150); Not needed now due to the semaphore in the Monitor
  
     if(_acceptor!=NULL)     if(_acceptor!=NULL)
     _acceptor->closeConnectionSocket();     _acceptor->closeConnectionSocket();
Line 301 
Line 305 
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
   Uint32 CIMListenerService::getOutstandingRequestCount()
   {
       return _acceptor->getOutstandingRequestCount();
   }
  
 CIMListenerIndicationDispatcher* CIMListenerService::getIndicationDispatcher() const CIMListenerIndicationDispatcher* CIMListenerService::getIndicationDispatcher() const
 { {
Line 323 
Line 331 
           #endif           #endif
           svc->runForever();           svc->runForever();
 } }
   
         delete svc;         delete svc;
  
         return 0;         return 0;
Line 354 
Line 363 
         Boolean removeConsumer(CIMIndicationConsumer* consumer);         Boolean removeConsumer(CIMIndicationConsumer* consumer);
  
 private: private:
     Boolean waitForPendingRequests(Uint32 shutdownTimeout);
   
         Uint32                  _portNumber;         Uint32                  _portNumber;
         SSLContext* _sslContext;         SSLContext* _sslContext;
  
   CIMListenerIndicationDispatcher* _dispatcher;   CIMListenerIndicationDispatcher* _dispatcher;
         ThreadPool* _thread_pool;         ThreadPool* _thread_pool;
     CIMListenerService* _svc;
     Semaphore *_listener_sem;
 }; };
  
 CIMListenerRep::CIMListenerRep(Uint32 portNumber, SSLContext* sslContext) CIMListenerRep::CIMListenerRep(Uint32 portNumber, SSLContext* sslContext)
Line 366 
Line 379 
 ,_sslContext(sslContext) ,_sslContext(sslContext)
 ,_dispatcher(new CIMListenerIndicationDispatcher()) ,_dispatcher(new CIMListenerIndicationDispatcher())
 ,_thread_pool(NULL) ,_thread_pool(NULL)
   ,_svc(NULL)
   ,_listener_sem(NULL)
 { {
 } }
 CIMListenerRep::~CIMListenerRep() CIMListenerRep::~CIMListenerRep()
 { {
         // if port is alive, clean up the port         // if port is alive, clean up the port
     if (_thread_pool != NULL)
     {
       // Block incoming export requests and unbind the port
       _svc->stopClientConnection();
   
       // Wait until pending export requests in the server are done.
       waitForPendingRequests(10);
   
       // Shutdown the CIMListenerService
       _svc->shutdown();
     }
   
         if(_sslContext!=NULL)         if(_sslContext!=NULL)
                 delete _sslContext;                 delete _sslContext;
  
Line 379 
Line 406 
  
         if(_thread_pool!=NULL)         if(_thread_pool!=NULL)
                 delete _thread_pool;                 delete _thread_pool;
   
     if(_listener_sem!=NULL)
       delete _listener_sem;
   
     // don't delete _svc, this is deleted by _listener_routine
 } }
  
 Uint32 CIMListenerRep::getPortNumber() const Uint32 CIMListenerRep::getPortNumber() const
Line 420 
Line 452 
                 _thread_pool = new ThreadPool(0, "Listener", 0, 1,                 _thread_pool = new ThreadPool(0, "Listener", 0, 1,
                         create_time, destroy_time, deadlock_time);                         create_time, destroy_time, deadlock_time);
  
                 _thread_pool->allocate_and_awaken(svc,CIMListenerService::_listener_routine);      _listener_sem = new Semaphore(0);
       _thread_pool->allocate_and_awaken(svc,
                                         CIMListenerService::_listener_routine,
                                         _listener_sem);
   
       _svc = svc;
  
                 Logger::put(Logger::STANDARD_LOG,System::CIMLISTENER,                 Logger::put(Logger::STANDARD_LOG,System::CIMLISTENER,
                                               Logger::INFORMATION,                                               Logger::INFORMATION,
Line 433 
Line 470 
 void CIMListenerRep::stop() void CIMListenerRep::stop()
 { {
         if(_thread_pool!=NULL)         if(_thread_pool!=NULL)
         { // stop the thread    {
       //
       // Graceful shutdown of the listener service
       //
   
       // Block incoming export requests and unbind the port
       _svc->stopClientConnection();
   
       // Wait until pending export requests in the server are done.
       waitForPendingRequests(10);
   
       // Shutdown the CIMListenerService
       _svc->shutdown();
   
       // Wait for the _listener_routine thread to exit.
       // The thread could be delivering an export, so give it 3sec.
       // Note that _listener_routine deletes the CIMListenerService,
       // so no need to delete _svc.
       try
       {
         _listener_sem->time_wait(3000);
       }
       catch (TimeOut &)
       {
         // No need to do anything, the thread pool will be deleted below
         // to cancel the _listener_routine thread if it is still running.
       }
   
       delete _listener_sem;
       _listener_sem = NULL;
  
       // Delete the thread pool.  This cancels the listener thread if it is still
       // running.
                 delete _thread_pool;                 delete _thread_pool;
                 _thread_pool = NULL;                 _thread_pool = NULL;
  
Line 458 
Line 526 
         return _dispatcher->removeConsumer(consumer);         return _dispatcher->removeConsumer(consumer);
 } }
  
   Boolean CIMListenerRep::waitForPendingRequests(Uint32 shutdownTimeout)
   {
     // Wait for 10 sec max
     Uint32 reqCount;
     Uint32 countDown = shutdownTimeout * 10;
     for (; countDown > 0; countDown--)
     {
       reqCount = _svc->getOutstandingRequestCount();
       if (reqCount > 0)
         pegasus_sleep(100);
       else
         return true;
     }
   
     return false;
   }
   
 ///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
 // CIMListener // CIMListener
 ///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

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