(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.23 and 1.39

version 1.23, 2004/08/26 17:04:01 version 1.39, 2005/07/22 23:36:07
Line 1 
Line 1 
 //%2003////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // 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.
   // Copyright (c) 2005 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 27 
Line 31 
 // //
 // 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 //                Amit K Arora, IBM (amita@in.ibm.com) for PEP#183
   //                Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
   //                David Dillard, VERITAS Software Corp.
   //                    (david.dillard@veritas.com)
   //                Vijay Eli, IBM (vijay.eli@in.ibm.com) for bug#3425
   //                Aruran, IBM (ashanmug@in.ibm.com) for Bug# 3604
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 37 
Line 46 
 #include <Pegasus/Common/Monitor.h> #include <Pegasus/Common/Monitor.h>
 #include <Pegasus/Common/HTTPAcceptor.h> #include <Pegasus/Common/HTTPAcceptor.h>
 #include <Pegasus/Common/PegasusVersion.h> #include <Pegasus/Common/PegasusVersion.h>
   #include <Pegasus/Common/MessageLoader.h>
  
 #include <Pegasus/ExportServer/CIMExportResponseEncoder.h> #include <Pegasus/ExportServer/CIMExportResponseEncoder.h>
 #include <Pegasus/ExportServer/CIMExportRequestDecoder.h> #include <Pegasus/ExportServer/CIMExportRequestDecoder.h>
Line 76 
Line 86 
  
         /** Return true if the server has shutdown, false otherwise.         /** Return true if the server has shutdown, false otherwise.
         */         */
         Boolean terminated() { return _dieNow; };          Boolean terminated() const { return _dieNow; };
  
         /** Call to resume the sever.         /** Call to resume the sever.
         */         */
Line 97 
Line 107 
          */          */
         void setIndicationDispatcher(CIMListenerIndicationDispatcher* dispatcher);         void setIndicationDispatcher(CIMListenerIndicationDispatcher* dispatcher);
  
           /** Returns the port number being used.
            */
           Uint32 getPortNumber() const;
   
         static PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL _listener_routine(void *param);         static PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL _listener_routine(void *param);
  
 private: private:
         Uint32                  _portNumber;         Uint32                  _portNumber;
         SSLContext* _sslContext;         SSLContext* _sslContext;
   #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT  
         Monitor*                                _monitor;         Monitor*                                _monitor;
   HTTPAcceptor*   _acceptor;   HTTPAcceptor*   _acceptor;
   #else  
         monitor_2*                              _monitor;  
   pegasus_acceptor*   _acceptor;  
   #endif  
  
   Boolean                                       _dieNow;   Boolean                                       _dieNow;
  
Line 145 
Line 154 
 CIMListenerService::~CIMListenerService() CIMListenerService::~CIMListenerService()
 { {
         // if port is alive, clean up the port         // if port is alive, clean up the port
         //if(_sslContext!=NULL)  
         //      delete _sslContext;         //      delete _sslContext;
  
         if(_responseEncoder!=NULL)  
                 delete _responseEncoder;                 delete _responseEncoder;
  
         if(_requestDecoder!=NULL)  
                 delete _requestDecoder;                 delete _requestDecoder;
  
         //if(_dispatcher!=NULL)  
         //      delete _dispatcher;         //      delete _dispatcher;
  
         if(_monitor!=NULL)  
                 delete _monitor;  
   
         if(_acceptor!=NULL)  
                 delete _acceptor;                 delete _acceptor;
   
       delete _monitor;
 } }
  
 void CIMListenerService::init() void CIMListenerService::init()
 { {
         PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::init");         PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::init");
  
   #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT    if(NULL == _monitor) _monitor = new Monitor();
   _monitor = new Monitor(true);  
   #else  
   _monitor = new monitor_2();  
   #endif  
  
         //_dispatcher = new CIMListenerIndicationDispatcher();         //_dispatcher = new CIMListenerIndicationDispatcher();
  
   _responseEncoder = new CIMExportResponseEncoder();    if(NULL == _responseEncoder) _responseEncoder = new CIMExportResponseEncoder();
   _requestDecoder = new CIMExportRequestDecoder(    if(NULL == _requestDecoder) _requestDecoder = new CIMExportRequestDecoder(
                 _dispatcher,                                        _dispatcher,_responseEncoder->getQueueId());
                 _responseEncoder->getQueueId());  
  
   #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT    if(NULL == _acceptor) _acceptor = new HTTPAcceptor(
   _acceptor = new HTTPAcceptor(  
                  _monitor,                  _monitor,
                  _requestDecoder,                  _requestDecoder,
                  false,                  false,
                  _portNumber,                  _portNumber,
                  _sslContext,                  _sslContext,
                  false);                  false);
   #else  
   _acceptor = new pegasus_acceptor(_monitor,  
                    _requestDecoder,  
                    false,  
                    _portNumber,  
                    _sslContext);  
   #endif  
  
   bind();   bind();
  
   PEG_METHOD_EXIT();   PEG_METHOD_EXIT();
 } }
   
 void CIMListenerService::bind() void CIMListenerService::bind()
 { {
   if(_acceptor!=NULL)   if(_acceptor!=NULL)
     { // Bind to the port     { // Bind to the port
       _acceptor->bind();       _acceptor->bind();
  
       PEGASUS_STD(cout) << "Listening on HTTP port " << _portNumber << PEGASUS_STD(endl);  
   
       //listener.addAcceptor(false, portNumberHttp, false);       //listener.addAcceptor(false, portNumberHttp, false);
       Logger::put(Logger::STANDARD_LOG, System::CIMLISTENER, Logger::INFORMATION,       Logger::put(Logger::STANDARD_LOG, System::CIMLISTENER, Logger::INFORMATION,
                         "Listening on HTTP port $0.", _portNumber);                         "Listening on HTTP port $0.", _portNumber);
Line 222 
Line 211 
  
   if(!_dieNow)   if(!_dieNow)
     {     {
 #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT  
       if(false == _monitor->run(500000))       if(false == _monitor->run(500000))
         {         {
           modulator++;           modulator++;
Line 230 
Line 218 
       {       {
              //MessageQueueService::_check_idle_flag = 1;              //MessageQueueService::_check_idle_flag = 1;
                  //MessageQueueService::_polling_sem.signal();                  //MessageQueueService::_polling_sem.signal();
                  MessageQueueService::get_thread_pool()->kill_idle_threads();                   MessageQueueService::get_thread_pool()->cleanupIdleThreads();
       }       }
           catch(...)           catch(...)
       {       {
Line 246 
Line 234 
         handleShutdownSignal = false;         handleShutdownSignal = false;
       }       }
 */ */
 #else  
       _monitor->run();  
 #endif  
     }     }
 } }
  
Line 257 
Line 242 
     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();     _monitor->tickle();
 #endif  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 279 
Line 262 
     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::stopClientConnection()");     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::stopClientConnection()");
  
     // tell Monitor to stop listening for client connections     // tell Monitor to stop listening for client connections
     #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT  
     _monitor->stopListeningForConnections(true);     _monitor->stopListeningForConnections(true);
     #else  
     _monitor->stop();  
     #endif  
  
     //     //
     // Wait 150 milliseconds to allow time for the Monitor to stop     // Wait 150 milliseconds to allow time for the Monitor to stop
Line 312 
Line 291 
 { {
         return _dispatcher;         return _dispatcher;
 } }
   
 void CIMListenerService::setIndicationDispatcher(CIMListenerIndicationDispatcher* dispatcher) void CIMListenerService::setIndicationDispatcher(CIMListenerIndicationDispatcher* dispatcher)
 { {
         _dispatcher = dispatcher;         _dispatcher = dispatcher;
 } }
  
   Uint32 CIMListenerService::getPortNumber() const
   {
   
       Uint32 portNumber = _portNumber;
   
       if (( portNumber == 0 ) && ( _acceptor != 0 ))
       {
           portNumber = _acceptor->getPortNumber();
       }
   
       return(portNumber);
   }
   
 PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL CIMListenerService::_listener_routine(void *param) PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL CIMListenerService::_listener_routine(void *param)
 { {
   CIMListenerService *svc = reinterpret_cast<CIMListenerService *>(param);    try {
       AutoPtr<CIMListenerService> svc(reinterpret_cast<CIMListenerService *>(param));
  
   //svc->init(); bug 1394   //svc->init(); bug 1394
   while(!svc->terminated())   while(!svc->terminated())
Line 329 
Line 323 
 #endif #endif
     svc->runForever();     svc->runForever();
   }   }
     } catch (...)
   delete svc;    {
           Tracer::trace(TRC_SERVER, Tracer::LEVEL2,
                           "Unknown exception thrown in _listener_routine.");
     }
   return 0;   return 0;
 } }
 static struct timeval create_time = {0, 1};  
 static struct timeval destroy_time = {15, 0};  
 static struct timeval deadlock_time = {0, 0};  
  
 ///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
 // CIMListenerRep // CIMListenerRep
Line 381 
Line 374 
 ,_listener_sem(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)      if (_thread_pool != 0)
   {   {
     // Block incoming export requests and unbind the port     // Block incoming export requests and unbind the port
     _svc->stopClientConnection();     _svc->stopClientConnection();
Line 396 
Line 390 
     _svc->shutdown();     _svc->shutdown();
   }   }
  
   if(_sslContext!=NULL)  
     delete _sslContext;     delete _sslContext;
   
   if(_dispatcher!=NULL)  
     delete _dispatcher;     delete _dispatcher;
   
   if(_thread_pool!=NULL)  
     delete _thread_pool;     delete _thread_pool;
   
   if(_listener_sem!=NULL)  
     delete _listener_sem;     delete _listener_sem;
  
   // don't delete _svc, this is deleted by _listener_routine   // don't delete _svc, this is deleted by _listener_routine
Line 413 
Line 400 
  
 Uint32 CIMListenerRep::getPortNumber() const Uint32 CIMListenerRep::getPortNumber() const
 { {
         return _portNumber;      Uint32 portNumber;
   
       if ( _svc == 0 )
       {
           portNumber = _portNumber;
       }
       else portNumber = _svc->getPortNumber();
   
       return portNumber;
 } }
  
 SSLContext* CIMListenerRep::getSSLContext() const SSLContext* CIMListenerRep::getSSLContext() const
 { {
         return _sslContext;         return _sslContext;
 } }
   
 void CIMListenerRep::setSSLContext(SSLContext* sslContext) void CIMListenerRep::setSSLContext(SSLContext* sslContext)
 { {
         if(_sslContext!=NULL)  
                 delete _sslContext;                 delete _sslContext;
   
         _sslContext = sslContext;         _sslContext = sslContext;
 } }
   
 void CIMListenerRep::start() void CIMListenerRep::start()
 { {
   // spawn a thread to do this   // spawn a thread to do this
   if(_thread_pool==NULL)      if(_thread_pool==0)
   {  
     CIMListenerService* svc = new CIMListenerService(_portNumber,_sslContext);  
     try  
     {     {
       // Try to initialize the service (bug 1394)          AutoPtr<CIMListenerService> svc(new CIMListenerService(_portNumber,_sslContext));
   
       svc->setIndicationDispatcher(_dispatcher);       svc->setIndicationDispatcher(_dispatcher);
       svc->init();       svc->init();
     }  
     catch(...)  
     {  
       // Error. Exit without creating the ThreadPool, so that this listener  
       // is not 'alive'  
       delete svc;  
       throw;  
     }  
   
     _thread_pool = new ThreadPool(0, "Listener", 0, 1,  
                                   create_time, destroy_time, deadlock_time);  
   
     _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,          struct timeval deallocateWait = {15, 0};
                 Logger::INFORMATION,          AutoPtr<ThreadPool> threadPool(new ThreadPool(0, "Listener", 0, 1, deallocateWait));
           AutoPtr<Semaphore> sem(new Semaphore(0));
           if (threadPool->allocate_and_awaken(svc.get(), CIMListenerService::_listener_routine, sem.get()) != PEGASUS_THREAD_OK)
           {
               Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE,
                           "Not enough threads to start CIMListernerService.");
   
               Tracer::trace(TRC_SERVER, Tracer::LEVEL2,
                           "Could not allocate thread for CIMListenerService::_listener_routine.");
               throw Exception(MessageLoaderParms("Listener.CIMListener.CANNOT_ALLOCATE_THREAD",
                                   "Could not allocate thread."));
           }
           Logger::put(Logger::STANDARD_LOG,System::CIMLISTENER, Logger::INFORMATION,
                 "CIMListener started");                 "CIMListener started");
  
     PEGASUS_STD(cerr) << "CIMlistener started" << PEGASUS_STD(endl);          _svc = svc.release();
           _thread_pool = threadPool.release();
           _listener_sem = sem.release();
   }   }
 } }
  
Line 477 
Line 466 
     _svc->stopClientConnection();     _svc->stopClientConnection();
  
     // Wait until pending export requests in the server are done.     // Wait until pending export requests in the server are done.
     if (!waitForPendingRequests(10))      waitForPendingRequests(10);
     {  
       // Pendings requests did not finish in time.  
       MessageLoaderParms parms("Listener.CIMListenerRep.SHUTDOWN_TIMEOUT",  
              "The CIMListener could not be stopped after $0 seconds because export requests have not finished.",  
              10);  
       throw Exception(parms);  
     }  
  
     // Shutdown the CIMListenerService     // Shutdown the CIMListenerService
     _svc->shutdown();     _svc->shutdown();
Line 497 
Line 479 
     {     {
       _listener_sem->time_wait(3000);       _listener_sem->time_wait(3000);
     }     }
     catch (TimeOut &)      catch (const TimeOut &)
     {     {
       // No need to do anything, the thread pool will be deleted below       // No need to do anything, the thread pool will be deleted below
       // to cancel the _listener_routine thread if it is still running.       // to cancel the _listener_routine thread if it is still running.
Line 584 
Line 566 
         static_cast<CIMListenerRep*>(_rep)->stop();         static_cast<CIMListenerRep*>(_rep)->stop();
 } }
  
 Boolean CIMListener::isAlive()  Boolean CIMListener::isAlive() const
 { {
         return static_cast<CIMListenerRep*>(_rep)->isAlive();         return static_cast<CIMListenerRep*>(_rep)->isAlive();
 } }

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