(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.36 and 1.43

version 1.36, 2005/05/28 02:02:59 version 1.43, 2006/09/13 20:57:40
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // 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.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec 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 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Dong Xiang, EMC Corporation (xiang_dong@emc.com)  
 //  
 // Modified By:   Dan Gorey (djgorey@us.ibm.com)  
 //                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  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include "CIMListener.h" #include "CIMListener.h"
   
 #include <Pegasus/Common/Exception.h> #include <Pegasus/Common/Exception.h>
 #include <Pegasus/Common/SSLContext.h> #include <Pegasus/Common/SSLContext.h>
 #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>
   
 #include <Pegasus/Consumer/CIMIndicationConsumer.h> #include <Pegasus/Consumer/CIMIndicationConsumer.h>
 #include <Pegasus/Listener/CIMListenerIndicationDispatcher.h> #include <Pegasus/Listener/CIMListenerIndicationDispatcher.h>
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
 /////////////////////////////////////////////////////////////////////////////  
   ////////////////////////////////////////////////////////////////////////////////
   //
 // CIMListenerService // CIMListenerService
 /////////////////////////////////////////////////////////////////////////////  //
   ////////////////////////////////////////////////////////////////////////////////
   
 class CIMListenerService class CIMListenerService
 { {
 public: public:
Line 65 
Line 59 
   ~CIMListenerService();   ~CIMListenerService();
  
         void                            init();         void                            init();
   
         /** bind to the port         /** bind to the port
         */         */
         void                            bind();         void                            bind();
   
         /** runForever Main runloop for the server.         /** runForever Main runloop for the server.
         */         */
         void runForever();         void runForever();
Line 85 
Line 81 
  
         /** Return true if the server has shutdown, false otherwise.         /** Return true if the server has shutdown, false otherwise.
         */         */
         Boolean terminated() const { return _dieNow; };      Boolean terminated() const
       {
           return _dieNow;
       };
  
         /** Call to resume the sever.         /** Call to resume the sever.
         */         */
Line 110 
Line 109 
          */          */
         Uint32 getPortNumber() const;         Uint32 getPortNumber() const;
  
         static PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL _listener_routine(void *param);      static ThreadReturnType PEGASUS_THREAD_CDECL
       _listener_routine(void *param);
  
 private: private:
         Uint32 _portNumber;         Uint32 _portNumber;
         SSLContext* _sslContext;         SSLContext* _sslContext;
         Monitor* _monitor;         Monitor* _monitor;
       Mutex _monitorMutex;
         HTTPAcceptor* _acceptor;         HTTPAcceptor* _acceptor;
   
   Boolean                                       _dieNow;   Boolean                                       _dieNow;
   
   CIMListenerIndicationDispatcher* _dispatcher;   CIMListenerIndicationDispatcher* _dispatcher;
   
   CIMExportResponseEncoder* _responseEncoder;   CIMExportResponseEncoder* _responseEncoder;
   CIMExportRequestDecoder*  _requestDecoder;   CIMExportRequestDecoder*  _requestDecoder;
   
 }; };
  
 CIMListenerService::CIMListenerService(Uint32 portNumber, SSLContext* sslContext)  CIMListenerService::CIMListenerService(
 :_portNumber(portNumber)      Uint32 portNumber,
 ,_sslContext(sslContext)      SSLContext * sslContext)
 ,_monitor(NULL)      :
 ,_acceptor(NULL)      _portNumber(portNumber),
 ,_dieNow(false)      _sslContext(sslContext),
 ,_dispatcher(NULL)      _monitor(NULL),
 ,_responseEncoder(NULL)      _acceptor(NULL),
 ,_requestDecoder(NULL)      _dieNow(false),
       _dispatcher(NULL),
       _responseEncoder(NULL),
       _requestDecoder(NULL)
 { {
 } }
  
 CIMListenerService::CIMListenerService(CIMListenerService& svc)  CIMListenerService::CIMListenerService(CIMListenerService & svc) :
 :_portNumber(svc._portNumber)      _portNumber(svc._portNumber),
 ,_sslContext(svc._sslContext)      _sslContext(svc._sslContext),
 ,_monitor(NULL)      _monitor(NULL),
 ,_acceptor(NULL)      _acceptor(NULL),
 ,_dieNow(svc._dieNow)      _dieNow(svc._dieNow),
 ,_dispatcher(NULL)      _dispatcher(NULL),
 ,_responseEncoder(NULL)      _responseEncoder(NULL),
 ,_requestDecoder(NULL)      _requestDecoder(NULL)
 { {
 } }
   
 CIMListenerService::~CIMListenerService() CIMListenerService::~CIMListenerService()
 { {
     // if port is alive, clean up the port  
     //delete _sslContext;  
   
     delete _responseEncoder;     delete _responseEncoder;
   
     delete _requestDecoder;     delete _requestDecoder;
   
     //delete _dispatcher;  
   
     delete _acceptor;     delete _acceptor;
   
     delete _monitor;     delete _monitor;
 } }
  
Line 170 
Line 163 
 { {
         PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::init");         PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::init");
  
   if(NULL == _monitor) _monitor = new Monitor();      if (NULL == _monitor)
           _monitor = new Monitor();
  
         //_dispatcher = new CIMListenerIndicationDispatcher();         //_dispatcher = new CIMListenerIndicationDispatcher();
  
   if(NULL == _responseEncoder) _responseEncoder = new CIMExportResponseEncoder();      if (NULL == _responseEncoder)
   if(NULL == _requestDecoder) _requestDecoder = new CIMExportRequestDecoder(          _responseEncoder = new CIMExportResponseEncoder();
   
       if (NULL == _requestDecoder)
       {
           _requestDecoder = new CIMExportRequestDecoder(
                                       _dispatcher,_responseEncoder->getQueueId());                                       _dispatcher,_responseEncoder->getQueueId());
       }
  
   if(NULL == _acceptor) _acceptor = new HTTPAcceptor(      if (NULL == _acceptor)
                  _monitor,      {
                  _requestDecoder,          _acceptor = new HTTPAcceptor(
                  false,              _monitor, _requestDecoder, false, _portNumber, _sslContext, false);
                  _portNumber,      }
                  _sslContext,  
                  false);  
  
   bind();   bind();
  
Line 194 
Line 191 
 void CIMListenerService::bind() void CIMListenerService::bind()
 { {
   if(_acceptor!=NULL)   if(_acceptor!=NULL)
     { // Bind to the port      {
       _acceptor->bind();       _acceptor->bind();
  
       PEGASUS_STD(cout) << "Listening on HTTP port " << _portNumber << PEGASUS_STD(endl);          Logger::put(
               Logger::STANDARD_LOG,
       //listener.addAcceptor(false, portNumberHttp, false);              System::CIMLISTENER,
       Logger::put(Logger::STANDARD_LOG, System::CIMLISTENER, Logger::INFORMATION,              Logger::INFORMATION,
                         "Listening on HTTP port $0.", _portNumber);              "Listening on HTTP port $0.",
               _portNumber);
     }     }
 } }
  
 void CIMListenerService::runForever() void CIMListenerService::runForever()
 { {
   static int modulator = 0;  
   
   if(!_dieNow)   if(!_dieNow)
     {     {
       if(false == _monitor->run(500000))          _monitor->run(500000);
           static struct timeval lastIdleCleanupTime = {0, 0};
           struct timeval now;
           gettimeofday(&now, 0);
           if (now.tv_sec - lastIdleCleanupTime.tv_sec > 300)
         {         {
           modulator++;              lastIdleCleanupTime.tv_sec = now.tv_sec;
       try       try
       {       {
              //MessageQueueService::_check_idle_flag = 1;  
                  //MessageQueueService::_polling_sem.signal();  
                  MessageQueueService::get_thread_pool()->cleanupIdleThreads();                  MessageQueueService::get_thread_pool()->cleanupIdleThreads();
       }       }
           catch(...)           catch(...)
       {       {
                   // Ignore!
       }       }
         }         }
 /*  
       if (handleShutdownSignal)  
       {  
         Tracer::trace(TRC_SERVER, Tracer::LEVEL3,  
         "CIMServer::runForever - signal received.  Shutting down.");  
   
         ShutdownService::getInstance(this)->shutdown(true, 10, false);  
         handleShutdownSignal = false;  
       }  
 */  
     }     }
 } }
  
Line 242 
Line 230 
 { {
     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::shutdown()");     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::shutdown()");
  
       // This logic signals the thread currently executing _listener_routine()
       // to exit. That function deletes this instance of CIMListenerService,
       // which deletes the _monitor member. We use a mutex to keep it from
       // deleting the monitor until after tickle has been called.
       {
           AutoMutex am(_monitorMutex);
     _dieNow = true;     _dieNow = true;
     _monitor->tickle();     _monitor->tickle();
       }
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 260 
Line 255 
  
 void CIMListenerService::stopClientConnection() void CIMListenerService::stopClientConnection()
 { {
     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
     _monitor->stopListeningForConnections(true);     _monitor->stopListeningForConnections(true);
  
     //  
     // Wait 150 milliseconds to allow time for the Monitor to stop  
     // listening for client connections.  
     //  
     // This wait time is the timeout value for the select() call  
     // in the Monitor's run() method (currently set to 100  
     // milliseconds) plus a delta of 50 milliseconds.  The reason  
     // for the wait here is to make sure that the Monitor entries  
     // are updated before closing the connection sockets.  
     //  
     // pegasus_sleep(150); Not needed now due to the semaphore in the Monitor  
   
     if(_acceptor!=NULL)     if(_acceptor!=NULL)
     _acceptor->closeConnectionSocket();     _acceptor->closeConnectionSocket();
  
Line 288 
Line 273 
     return _acceptor->getOutstandingRequestCount();     return _acceptor->getOutstandingRequestCount();
 } }
  
 CIMListenerIndicationDispatcher* CIMListenerService::getIndicationDispatcher() const  CIMListenerIndicationDispatcher*
   CIMListenerService::getIndicationDispatcher() const
 { {
     return _dispatcher;     return _dispatcher;
 } }
  
 void CIMListenerService::setIndicationDispatcher(CIMListenerIndicationDispatcher* dispatcher)  void CIMListenerService::setIndicationDispatcher(
       CIMListenerIndicationDispatcher* dispatcher)
 { {
     _dispatcher = dispatcher;     _dispatcher = dispatcher;
 } }
  
 Uint32 CIMListenerService::getPortNumber() const Uint32 CIMListenerService::getPortNumber() const
 { {
   
     Uint32 portNumber = _portNumber;     Uint32 portNumber = _portNumber;
  
     if (( portNumber == 0 ) && ( _acceptor != 0 ))     if (( portNumber == 0 ) && ( _acceptor != 0 ))
Line 311 
Line 297 
     return(portNumber);     return(portNumber);
 } }
  
 PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL CIMListenerService::_listener_routine(void *param)  ThreadReturnType PEGASUS_THREAD_CDECL
   CIMListenerService::_listener_routine(void *param)
 { {
     AutoPtr<CIMListenerService> svc(reinterpret_cast<CIMListenerService *>(param));      CIMListenerService *svc = reinterpret_cast < CIMListenerService * >(param);
  
       try
       {
     //svc->init(); bug 1394     //svc->init(); bug 1394
     while(!svc->terminated())     while(!svc->terminated())
     {     {
Line 323 
Line 312 
 #endif #endif
         svc->runForever();         svc->runForever();
     }     }
       }
       catch(...)
       {
           Tracer::trace(TRC_SERVER, Tracer::LEVEL2,
                         "Unknown exception thrown in _listener_routine.");
       }
   
       // CAUTION: deleting the service also deletes the monitor whose tickle()
       // method may still be executing in another thread. This line of code was
       // most likely reached when the CIMListenerService::shutdown() method set
       // _dieNow to true and called Monitor::tickle(). We must wait until we
       // can obtain the _monitorMutex, indicating that we are no longer inside
       // Monitor::tickle().
       svc->_monitorMutex.lock();
       svc->_monitorMutex.unlock();
       delete svc;
  
     return 0;     return 0;
 } }
  
 /////////////////////////////////////////////////////////////////////////////  ////////////////////////////////////////////////////////////////////////////////
   //
 // CIMListenerRep // CIMListenerRep
 /////////////////////////////////////////////////////////////////////////////  //
   ////////////////////////////////////////////////////////////////////////////////
   
 class CIMListenerRep class CIMListenerRep
 { {
 public: public:
Line 361 
Line 369 
   Semaphore *_listener_sem;   Semaphore *_listener_sem;
 }; };
  
 CIMListenerRep::CIMListenerRep(Uint32 portNumber, SSLContext* sslContext)  CIMListenerRep::CIMListenerRep(
 :_portNumber(portNumber)      Uint32 portNumber,
 ,_sslContext(sslContext)      SSLContext * sslContext)
 ,_dispatcher(new CIMListenerIndicationDispatcher())      :
 ,_thread_pool(NULL)      _portNumber(portNumber),
 ,_svc(NULL)      _sslContext(sslContext),
 ,_listener_sem(NULL)      _dispatcher(new CIMListenerIndicationDispatcher()),
       _thread_pool(NULL),
       _svc(NULL),
       _listener_sem(NULL)
 { {
 } }
  
Line 399 
Line 410 
     Uint32 portNumber;     Uint32 portNumber;
  
     if ( _svc == 0 )     if ( _svc == 0 )
     {  
         portNumber = _portNumber;         portNumber = _portNumber;
     }      else
     else portNumber = _svc->getPortNumber();          portNumber = _svc->getPortNumber();
  
     return portNumber;     return portNumber;
 } }
Line 423 
Line 433 
     // spawn a thread to do this     // spawn a thread to do this
     if(_thread_pool==0)     if(_thread_pool==0)
     {     {
         AutoPtr<CIMListenerService> svc(new CIMListenerService(_portNumber,_sslContext));          AutoPtr < CIMListenerService >
               svc(new CIMListenerService(_portNumber, _sslContext));
  
         svc->setIndicationDispatcher(_dispatcher);         svc->setIndicationDispatcher(_dispatcher);
         svc->init();         svc->init();
  
         struct timeval deallocateWait = {15, 0};         struct timeval deallocateWait = {15, 0};
         AutoPtr<ThreadPool> threadPool(new ThreadPool(0, "Listener", 0, 1, deallocateWait));          AutoPtr < ThreadPool >
               threadPool(new ThreadPool(0, "Listener", 0, 1, deallocateWait));
         AutoPtr<Semaphore> sem(new Semaphore(0));         AutoPtr<Semaphore> sem(new Semaphore(0));
         threadPool->allocate_and_awaken(svc.get(), CIMListenerService::_listener_routine, sem.get());  
         Logger::put(Logger::STANDARD_LOG,System::CIMLISTENER, Logger::INFORMATION,  
                         "CIMListener started");  
  
         PEGASUS_STD(cerr) << "CIMlistener started" << PEGASUS_STD(endl);          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");
  
         _svc = svc.release();         _svc = svc.release();
         _thread_pool = threadPool.release();         _thread_pool = threadPool.release();
Line 477 
Line 510 
     delete _listener_sem;     delete _listener_sem;
     _listener_sem = NULL;     _listener_sem = NULL;
  
     // Delete the thread pool.  This cancels the listener thread if it is still          // Delete the thread pool.  This cancels the listener thread if it is
           // still
     // running.     // running.
     delete _thread_pool;     delete _thread_pool;
     _thread_pool = NULL;     _thread_pool = NULL;
  
     Logger::put(Logger::STANDARD_LOG,System::CIMLISTENER,          Logger::put(
                 Logger::INFORMATION,              Logger::STANDARD_LOG, System::CIMLISTENER,
                 "CIMListener stopped");              Logger::INFORMATION, "CIMListener stopped");
   }   }
 } }
  
Line 497 
Line 531 
 { {
         return _dispatcher->addConsumer(consumer);         return _dispatcher->addConsumer(consumer);
 } }
   
 Boolean CIMListenerRep::removeConsumer(CIMIndicationConsumer* consumer) Boolean CIMListenerRep::removeConsumer(CIMIndicationConsumer* consumer)
 { {
         return _dispatcher->removeConsumer(consumer);         return _dispatcher->removeConsumer(consumer);
Line 507 
Line 542 
   // Wait for 10 sec max   // Wait for 10 sec max
   Uint32 reqCount;   Uint32 reqCount;
   Uint32 countDown = shutdownTimeout * 10;   Uint32 countDown = shutdownTimeout * 10;
   
   for (; countDown > 0; countDown--)   for (; countDown > 0; countDown--)
   {   {
     reqCount = _svc->getOutstandingRequestCount();     reqCount = _svc->getOutstandingRequestCount();
     if (reqCount > 0)     if (reqCount > 0)
       pegasus_sleep(100);              Threads::sleep(100);
     else     else
       return true;       return true;
   }   }
Line 520 
Line 556 
 } }
  
 ///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
   //
 // CIMListener // CIMListener
   //
 ///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
 CIMListener::CIMListener(Uint32 portNumber, SSLContext* sslContext)  
 :_rep(new CIMListenerRep(portNumber,sslContext))  CIMListener::CIMListener(
       Uint32 portNumber,
       SSLContext * sslContext)
       :
       _rep(new CIMListenerRep(portNumber, sslContext))
 { {
 } }
   
 CIMListener::~CIMListener() CIMListener::~CIMListener()
 { {
         if(_rep!=NULL)         if(_rep!=NULL)
Line 542 
Line 585 
 { {
         return static_cast<CIMListenerRep*>(_rep)->getSSLContext();         return static_cast<CIMListenerRep*>(_rep)->getSSLContext();
 } }
   
 void CIMListener::setSSLContext(SSLContext* sslContext) void CIMListener::setSSLContext(SSLContext* sslContext)
 { {
         static_cast<CIMListenerRep*>(_rep)->setSSLContext(sslContext);         static_cast<CIMListenerRep*>(_rep)->setSSLContext(sslContext);
 } }
   
 void CIMListener::start() void CIMListener::start()
 { {
         static_cast<CIMListenerRep*>(_rep)->start();         static_cast<CIMListenerRep*>(_rep)->start();
 } }
   
 void CIMListener::stop() void CIMListener::stop()
 { {
         static_cast<CIMListenerRep*>(_rep)->stop();         static_cast<CIMListenerRep*>(_rep)->stop();
Line 564 
Line 610 
 { {
         return static_cast<CIMListenerRep*>(_rep)->addConsumer(consumer);         return static_cast<CIMListenerRep*>(_rep)->addConsumer(consumer);
 } }
   
 Boolean CIMListener::removeConsumer(CIMIndicationConsumer* consumer) Boolean CIMListener::removeConsumer(CIMIndicationConsumer* consumer)
 { {
         return static_cast<CIMListenerRep*>(_rep)->removeConsumer(consumer);         return static_cast<CIMListenerRep*>(_rep)->removeConsumer(consumer);

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