(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.41 and 1.59

version 1.41, 2006/07/07 14:43:46 version 1.59, 2008/12/16 18:56:47
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // 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
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  // copy of this software and associated documentation files (the "Software"),
 // EMC Corporation; Symantec Corporation; The Open Group.  // to deal in the Software without restriction, including without limitation
 //  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // and/or sell copies of the Software, and to permit persons to whom the
 // of this software and associated documentation files (the "Software"), to  // Software is furnished to do so, subject to the following conditions:
 // deal in the Software without restriction, including without limitation the  //
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // The above copyright notice and this permission notice shall be included
 // sell copies of the Software, and to permit persons to whom the Software is  // in all copies or substantial portions of the Software.
 // furnished to do so, subject to the following conditions:  //
 //  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  //
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  //////////////////////////////////////////////////////////////////////////
 //  
 //==============================================================================  
 //  
 // 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  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 48 
Line 36 
 #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/Common/MessageLoader.h>
   #include <Pegasus/Common/Time.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>
Line 119 
Line 108 
     */     */
     Uint32 getPortNumber() const;     Uint32 getPortNumber() const;
  
     static PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL      static ThreadReturnType PEGASUS_THREAD_CDECL
     _listener_routine(void *param);     _listener_routine(void *param);
  
 private: private:
     Uint32 _portNumber;     Uint32 _portNumber;
     SSLContext *_sslContext;     SSLContext *_sslContext;
       ReadWriteSem _sslContextObjectLock;
     Monitor *_monitor;     Monitor *_monitor;
     Mutex _monitorMutex;     Mutex _monitorMutex;
     HTTPAcceptor *_acceptor;      HTTPAcceptor *_ip6Acceptor;
       HTTPAcceptor *_ip4Acceptor;
     Boolean _dieNow;     Boolean _dieNow;
     CIMListenerIndicationDispatcher *_dispatcher;     CIMListenerIndicationDispatcher *_dispatcher;
     CIMExportResponseEncoder *_responseEncoder;     CIMExportResponseEncoder *_responseEncoder;
Line 141 
Line 132 
     _portNumber(portNumber),     _portNumber(portNumber),
     _sslContext(sslContext),     _sslContext(sslContext),
     _monitor(NULL),     _monitor(NULL),
     _acceptor(NULL),      _ip6Acceptor(NULL),
       _ip4Acceptor(NULL),
     _dieNow(false),     _dieNow(false),
     _dispatcher(NULL),     _dispatcher(NULL),
     _responseEncoder(NULL),     _responseEncoder(NULL),
Line 153 
Line 145 
     _portNumber(svc._portNumber),     _portNumber(svc._portNumber),
     _sslContext(svc._sslContext),     _sslContext(svc._sslContext),
     _monitor(NULL),     _monitor(NULL),
     _acceptor(NULL),      _ip6Acceptor(NULL),
       _ip4Acceptor(NULL),
     _dieNow(svc._dieNow),     _dieNow(svc._dieNow),
     _dispatcher(NULL),     _dispatcher(NULL),
     _responseEncoder(NULL),     _responseEncoder(NULL),
Line 165 
Line 158 
 { {
     delete _responseEncoder;     delete _responseEncoder;
     delete _requestDecoder;     delete _requestDecoder;
     delete _acceptor;      delete _ip6Acceptor;
       delete _ip4Acceptor;
     delete _monitor;     delete _monitor;
 } }
  
Line 186 
Line 180 
         _requestDecoder = new CIMExportRequestDecoder(         _requestDecoder = new CIMExportRequestDecoder(
             _dispatcher, _responseEncoder->getQueueId());             _dispatcher, _responseEncoder->getQueueId());
     }     }
   #ifdef PEGASUS_ENABLE_IPV6
     if (NULL == _acceptor)      if (System::isIPv6StackActive())
       {
           if (NULL == _ip6Acceptor)
     {     {
         _acceptor = new HTTPAcceptor(              if (NULL == _sslContext)
             _monitor, _requestDecoder, false, _portNumber, _sslContext, false);              {
                   _ip6Acceptor = new HTTPAcceptor(
                           _monitor, _requestDecoder,
                           HTTPAcceptor::IPV6_CONNECTION,
                           _portNumber, 0, 0);
               }
               else
               {
                   _ip6Acceptor = new HTTPAcceptor(
                           _monitor, _requestDecoder,
                           HTTPAcceptor::IPV6_CONNECTION,
                           _portNumber, _sslContext, &_sslContextObjectLock);
               }
           }
       }
   #ifndef PEGASUS_OS_TYPE_WINDOWS
       else
   #endif
   #endif
       if (NULL == _ip4Acceptor)
       {
           if (NULL == _sslContext)
           {
               _ip4Acceptor = new HTTPAcceptor(
                       _monitor, _requestDecoder,
                       HTTPAcceptor::IPV4_CONNECTION,
                       _portNumber, 0, 0);
           }
           else
           {
               _ip4Acceptor = new HTTPAcceptor(
                       _monitor, _requestDecoder,
                       HTTPAcceptor::IPV4_CONNECTION,
                       _portNumber, _sslContext, &_sslContextObjectLock);
           }
     }     }
   
     bind();     bind();
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 200 
Line 229 
  
 void CIMListenerService::bind() void CIMListenerService::bind()
 { {
     if (_acceptor != NULL)      if (_ip6Acceptor != NULL)
       {
           _ip6Acceptor->bind();
   
           Logger::put(
               Logger::STANDARD_LOG,
               System::CIMLISTENER,
               Logger::INFORMATION,
               "IPV6, Listening on HTTP port $0.",
               _portNumber);
       }
       if (_ip4Acceptor != NULL)
     {     {
         _acceptor->bind();          _ip4Acceptor->bind();
  
         Logger::put(         Logger::put(
             Logger::STANDARD_LOG,             Logger::STANDARD_LOG,
             System::CIMLISTENER,             System::CIMLISTENER,
             Logger::INFORMATION,             Logger::INFORMATION,
             "Listening on HTTP port $0.",              "IPV4, Listening on HTTP for port $0.",
             _portNumber);             _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;
           Time::gettimeofday(&now);
           if (now.tv_sec - lastIdleCleanupTime.tv_sec > 300)
         {         {
             modulator++;              lastIdleCleanupTime.tv_sec = now.tv_sec;
             try             try
             {             {
                 MessageQueueService::get_thread_pool()->cleanupIdleThreads();                 MessageQueueService::get_thread_pool()->cleanupIdleThreads();
Line 254 
Line 296 
 void CIMListenerService::resume() void CIMListenerService::resume()
 { {
     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::resume()");     PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::resume()");
       if (_ip6Acceptor != NULL)
     if (_acceptor != NULL)      {
         _acceptor->reopenConnectionSocket();          _ip6Acceptor->reopenConnectionSocket();
       }
       if (_ip4Acceptor != NULL)
       {
           _ip4Acceptor->reopenConnectionSocket();
       }
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 269 
Line 315 
  
     // tell Monitor to stop listening for client connections     // tell Monitor to stop listening for client connections
     _monitor->stopListeningForConnections(true);     _monitor->stopListeningForConnections(true);
       if (_ip6Acceptor != NULL)
     if (_acceptor != NULL)      {
         _acceptor->closeConnectionSocket();          _ip6Acceptor->closeConnectionSocket();
       }
       if (_ip4Acceptor != NULL)
       {
           _ip4Acceptor->closeConnectionSocket();
       }
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
 Uint32 CIMListenerService::getOutstandingRequestCount() Uint32 CIMListenerService::getOutstandingRequestCount()
 { {
     return _acceptor->getOutstandingRequestCount();      Uint32 cnt = 0;
   
       if (_ip6Acceptor)
       {
           cnt = _ip6Acceptor->getOutstandingRequestCount();
       }
   
       if (_ip4Acceptor)
       {
           cnt += _ip4Acceptor->getOutstandingRequestCount();
       }
   
       return cnt;
 } }
  
 CIMListenerIndicationDispatcher* CIMListenerIndicationDispatcher*
Line 297 
Line 359 
 { {
     Uint32 portNumber = _portNumber;     Uint32 portNumber = _portNumber;
  
     if ((portNumber == 0) && (_acceptor != 0))      if ((portNumber == 0) && (_ip6Acceptor != 0))
       {
           portNumber = _ip6Acceptor->getPortNumber();
       }
       else if ((portNumber == 0) && (_ip4Acceptor != 0))
     {     {
         portNumber = _acceptor->getPortNumber();          portNumber = _ip4Acceptor->getPortNumber();
     }     }
  
     return (portNumber);     return (portNumber);
 } }
  
 PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL  ThreadReturnType PEGASUS_THREAD_CDECL
 CIMListenerService::_listener_routine(void *param) CIMListenerService::_listener_routine(void *param)
 { {
     CIMListenerService *svc = reinterpret_cast < CIMListenerService * >(param);     CIMListenerService *svc = reinterpret_cast < CIMListenerService * >(param);
Line 315 
Line 381 
         // svc->init(); bug 1394         // svc->init(); bug 1394
         while (!svc->terminated())         while (!svc->terminated())
         {         {
 #if defined(PEGASUS_PLATFORM_DARWIN_PPC_GNU)  #if defined(PEGASUS_OS_DARWIN)
             pthread_testcancel();             pthread_testcancel();
 #endif #endif
             svc->runForever();             svc->runForever();
Line 323 
Line 389 
     }     }
     catch(...)     catch(...)
     {     {
         Tracer::trace(TRC_SERVER, Tracer::LEVEL2,          PEG_TRACE_CSTRING(TRC_SERVER, Tracer::LEVEL1,
                       "Unknown exception thrown in _listener_routine.");                       "Unknown exception thrown in _listener_routine.");
     }     }
  
Line 333 
Line 399 
     // _dieNow to true and called Monitor::tickle(). We must wait until we     // _dieNow to true and called Monitor::tickle(). We must wait until we
     // can obtain the _monitorMutex, indicating that we are no longer inside     // can obtain the _monitorMutex, indicating that we are no longer inside
     // Monitor::tickle().     // Monitor::tickle().
     svc->_monitorMutex.lock(pegasus_thread_self());      svc->_monitorMutex.lock();
     svc->_monitorMutex.unlock();     svc->_monitorMutex.unlock();
     delete svc;     delete svc;
  
Line 392 
Line 458 
  
 CIMListenerRep::~CIMListenerRep() CIMListenerRep::~CIMListenerRep()
 { {
     // if port is alive, clean up the port      stop();
     if (_thread_pool != 0)  
     {  
         // 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();  
     }  
  
     delete _sslContext;     delete _sslContext;
     delete _dispatcher;     delete _dispatcher;
Line 456 
Line 511 
             svc.get(), CIMListenerService::_listener_routine, sem.get())             svc.get(), CIMListenerService::_listener_routine, sem.get())
             != PEGASUS_THREAD_OK)             != PEGASUS_THREAD_OK)
         {         {
             Logger::put(              PEG_TRACE_CSTRING(
                 Logger::STANDARD_LOG, System::CIMSERVER,  
                 Logger::TRACE,  
                 "Not enough threads to start CIMListernerService.");  
   
             Tracer::trace(  
                 TRC_SERVER,                 TRC_SERVER,
                 Tracer::LEVEL2,                  Tracer::LEVEL1,
                 "Could not allocate thread for "                 "Could not allocate thread for "
                 "CIMListenerService::_listener_routine.");                 "CIMListenerService::_listener_routine.");
             throw             throw
Line 505 
Line 555 
         // The thread could be delivering an export, so give it 3sec.         // The thread could be delivering an export, so give it 3sec.
         // Note that _listener_routine deletes the CIMListenerService,         // Note that _listener_routine deletes the CIMListenerService,
         // so no need to delete _svc.         // so no need to delete _svc.
         try          if (!_listener_sem->time_wait(3000))
         {  
             _listener_sem->time_wait(3000);  
         }  
         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 555 
Line 601 
     {     {
         reqCount = _svc->getOutstandingRequestCount();         reqCount = _svc->getOutstandingRequestCount();
         if (reqCount > 0)         if (reqCount > 0)
             pegasus_sleep(100);              Threads::sleep(100);
         else         else
             return true;             return true;
     }     }

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