version 1.16, 2004/04/12 19:52:29
|
version 1.20, 2004/08/03 19:05:08
|
|
|
_requestDecoder, | _requestDecoder, |
false, | false, |
_portNumber, | _portNumber, |
_sslContext); |
_sslContext, |
|
false); |
#else | #else |
_acceptor = new pegasus_acceptor(_monitor, | _acceptor = new pegasus_acceptor(_monitor, |
_requestDecoder, | _requestDecoder, |
|
|
| |
} | } |
} | } |
|
|
void CIMListenerService::runForever() | void CIMListenerService::runForever() |
{ | { |
static int modulator = 0; | static int modulator = 0; |
|
|
{ | { |
CIMListenerService *svc = reinterpret_cast<CIMListenerService *>(param); | CIMListenerService *svc = reinterpret_cast<CIMListenerService *>(param); |
| |
svc->init(); |
//svc->init(); bug 1394 |
while(!svc->terminated()) | while(!svc->terminated()) |
{ | { |
|
#if defined(PEGASUS_PLATFORM_DARWIN_PPC_GNU) |
|
pthread_testcancel(); |
|
#endif |
svc->runForever(); | svc->runForever(); |
} | } |
delete svc; | delete svc; |
|
|
| |
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) |
|
|
,_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(); |
|
|
|
// Shutdown the CIMListenerService |
|
_svc->shutdown(); |
|
} |
|
|
if(_sslContext!=NULL) | if(_sslContext!=NULL) |
delete _sslContext; | delete _sslContext; |
| |
|
|
| |
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 |
|
|
// spawn a thread to do this | // spawn a thread to do this |
if(_thread_pool==NULL) | if(_thread_pool==NULL) |
{ | { |
|
CIMListenerService* svc = new CIMListenerService(_portNumber,_sslContext); |
|
try |
|
{ |
|
// Try to initialize the service (bug 1394) |
|
svc->setIndicationDispatcher(_dispatcher); |
|
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, | _thread_pool = new ThreadPool(0, "Listener", 0, 1, |
create_time, destroy_time, deadlock_time); | create_time, destroy_time, deadlock_time); |
| |
CIMListenerService* svc = new CIMListenerService(_portNumber,_sslContext); |
_listener_sem = new Semaphore(0); |
svc->setIndicationDispatcher(_dispatcher); |
_thread_pool->allocate_and_awaken(svc, |
|
CIMListenerService::_listener_routine, |
|
_listener_sem); |
| |
_thread_pool->allocate_and_awaken(svc,CIMListenerService::_listener_routine); |
_svc = svc; |
| |
Logger::put(Logger::STANDARD_LOG,System::CIMLISTENER, | Logger::put(Logger::STANDARD_LOG,System::CIMLISTENER, |
Logger::INFORMATION, | Logger::INFORMATION, |
|
|
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(); |
|
|
|
// 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; |
| |