pegasus/src/Pegasus/Listener/CIMListener.cpp - diff

Return to CIMListener.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Listener

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

version 1.25, 2004/10/17 20:39:56

version 1.32, 2005/04/28 21:23:19

Line 1

//%2004////////////////////////////////////////////////////////////////////////

//%2005////////////////////////////////////////////////////////////////////////

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

Line 6

// IBM Corp.; EMC Corporation, The Open Group.

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a copy

// of this software and associated documentation files (the "Software"), to

Line 29

Line 31

// 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)

//%/////////////////////////////////////////////////////////////////////////////

Line 104

Line 109

private:

Uint32 _portNumber;

SSLContext* _sslContext;

#ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT

Monitor* _monitor;

HTTPAcceptor* _acceptor;

#else

monitor_2* _monitor;

pegasus_acceptor* _acceptor;

#endif

Boolean _dieNow;

Line 170

{

PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::init");

#ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT

_monitor = new Monitor();

_monitor = new Monitor(true);

#else

_monitor = new monitor_2();

#endif

//_dispatcher = new CIMListenerIndicationDispatcher();

Line 183

Line 179

_dispatcher,

_responseEncoder->getQueueId());

#ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT

_acceptor = new HTTPAcceptor(

_monitor,

_requestDecoder,

Line 191

Line 186

_portNumber,

_sslContext,

false);

#else

_acceptor = new pegasus_acceptor(_monitor,

_requestDecoder,

false,

_portNumber,

_sslContext);

#endif

bind();

Line 224

Line 212

if(!_dieNow)

{

#ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT

if(false == _monitor->run(500000))

{

modulator++;

Line 232

Line 219

{

//MessageQueueService::_check_idle_flag = 1;

//MessageQueueService::_polling_sem.signal();

MessageQueueService::get_thread_pool()->kill_idle_threads();

MessageQueueService::get_thread_pool()->cleanupIdleThreads();

}

catch(...)

{

Line 248

Line 235

handleShutdownSignal = false;

}

#else

_monitor->run();

#endif

}

Line 259

Line 243

PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::shutdown()");

_dieNow = true;

#ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT

_monitor->tickle();

#endif

PEG_METHOD_EXIT();

}

Line 281

Line 263

PEG_METHOD_ENTER(TRC_LISTENER, "CIMListenerService::stopClientConnection()");

// tell Monitor to stop listening for client connections

#ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT

_monitor->stopListeningForConnections(true);

#else

_monitor->stop();

#endif

// Wait 150 milliseconds to allow time for the Monitor to stop

Line 321

Line 299

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL CIMListenerService::_listener_routine(void *param)

{

CIMListenerService *svc = reinterpret_cast<CIMListenerService *>(param);

AutoPtr<CIMListenerService> svc(reinterpret_cast<CIMListenerService *>(param));

//svc->init(); bug 1394

while(!svc->terminated())

Line 332

Line 310

svc->runForever();

}

delete svc;

return 0;

}

static struct timeval create_time = {0, 1};

static struct timeval destroy_time = {15, 0};

static struct timeval deadlock_time = {0, 0};

/////////////////////////////////////////////////////////////////////////////

// CIMListenerRep

Line 383

Line 356

,_listener_sem(NULL)

{

}

CIMListenerRep::~CIMListenerRep()

{

// if port is alive, clean up the port

if (_thread_pool != NULL)

if (_thread_pool != 0)

{

// Block incoming export requests and unbind the port

_svc->stopClientConnection();

Line 398

Line 372

_svc->shutdown();

}

if(_sslContext!=NULL)

delete _sslContext;

if(_dispatcher!=NULL)

delete _dispatcher;

if(_thread_pool!=NULL)

delete _thread_pool;

if(_listener_sem!=NULL)

delete _listener_sem;

// don't delete _svc, this is deleted by _listener_routine

Line 422

Line 389

{

return _sslContext;

}

void CIMListenerRep::setSSLContext(SSLContext* sslContext)

{

if(_sslContext!=NULL)

delete _sslContext;

_sslContext = sslContext;

}

void CIMListenerRep::start()

{

// 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->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));

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);

_svc = svc.release();

_thread_pool = threadPool.release();

_listener_sem = sem.release();

}

Legend:

Removed from v.1.25
changed lines
	Added in v.1.32

No CVS admin address has been configured