pegasus/src/Pegasus/Common/Monitor.cpp - diff

Return to Monitor.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/Monitor.cpp between version 1.20 and 1.49

version 1.20, 2002/06/07 20:52:13

version 1.49, 2003/09/26 19:04:06

Line 23

// Author: Mike Brasher (mbrasher@bmc.com)

// Modified By:

// Modified By: Mike Day (monitor_2) mdday@us.ibm.com

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

#include <Pegasus/Common/Config.h>

#include <cstring>

#include "Monitor.h"

#include "MessageQueue.h"

Line 39

Line 40

# if defined(FD_SETSIZE) && FD_SETSIZE != 1024

# error "FD_SETSIZE was not set to 1024 prior to the last inclusion \

of <winsock.h>. It may have been indirectly included (e.g., by including \

<windows.h>). Find the inclusion of that header which is visible to this \

<windows.h>). Finthe inclusion of that header which is visible to this \

compilation unit and #define FD_SETZIE to 1024 prior to that inclusion; \

otherwise, less than 64 clients (the default) will be able to connect to the \

CIMOM. PLEASE DO NOT SUPPRESS THIS WARNING; PLEASE FIX THE PROBLEM."

Line 54

Line 55

# include <netinet/in.h>

# include <netdb.h>

# include <arpa/inet.h>

# include <unistd.h>

#endif

PEGASUS_USING_STD;

Line 62

PEGASUS_NAMESPACE_BEGIN

static struct timeval create_time = {0, 10};

static AtomicInt _connections = 0;

static struct timeval destroy_time = {5, 0};

static struct timeval deadlock_time = {1000, 0};

static struct timeval create_time = {0, 1};

static struct timeval destroy_time = {300, 0};

static struct timeval deadlock_time = {0, 0};

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

Line 89

Line 92

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

Monitor::Monitor()

: _module_handle(0), _controller(0), _async(false)

: _module_handle(0), _controller(0), _async(false), _stopConnections(0)

{

Socket::initializeInterface();

_rep = new MonitorRep;

_rep = 0;

FD_ZERO(&_rep->rd_fd_set);

_entries.reserveCapacity(32);

FD_ZERO(&_rep->wr_fd_set);

for( int i = 0; i < 32; i++ )

FD_ZERO(&_rep->ex_fd_set);

{

FD_ZERO(&_rep->active_rd_fd_set);

_MonitorEntry entry(0, 0, 0);

FD_ZERO(&_rep->active_wr_fd_set);

_entries.append(entry);

FD_ZERO(&_rep->active_ex_fd_set);

}

Monitor::Monitor(Boolean async)

: _module_handle(0), _controller(0), _async(async)

: _module_handle(0), _controller(0), _async(async), _stopConnections(0)

{

Socket::initializeInterface();

_rep = new MonitorRep;

_rep = 0;

FD_ZERO(&_rep->rd_fd_set);

_entries.reserveCapacity(32);

FD_ZERO(&_rep->wr_fd_set);

for( int i = 0; i < 32; i++ )

FD_ZERO(&_rep->ex_fd_set);

{

FD_ZERO(&_rep->active_rd_fd_set);

_MonitorEntry entry(0, 0, 0);

FD_ZERO(&_rep->active_wr_fd_set);

_entries.append(entry);

FD_ZERO(&_rep->active_ex_fd_set);

}

if( _async == true )

{

_thread_pool = new ThreadPool(0,

"Monitor",

20,

create_time,

destroy_time,

deadlock_time);

Line 139

Line 142

}

Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "deleting rep");

delete _rep;

Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "uninitializing interface");

Socket::uninitializeInterface();

Tracer::trace(TRC_HTTP, Tracer::LEVEL4,

"returning from monitor destructor");

if(_async == false)

if(_async == true)

delete _thread_pool;

}

Line 155

Line 157

gettimeofday(&now, NULL);

int dead_threads = 0;

if( now.tv_sec - last.tv_sec > 0 )

if( now.tv_sec - last.tv_sec > 120 )

{

gettimeofday(&last, NULL);

try

{

dead_threads = _thread_pool->kill_dead_threads();

}

catch(IPCException& )

Line 172

Line 173

}

//<<< Tue May 14 20:38:26 2002 mdd >>>

// register with module controller

// when it is time to enqueue the message,

// use an async_thread_exec call to

// isolate the entire if(events) { enqueue -> fd_clear } block

// let the thread pool grow and shrink according to load.

Boolean Monitor::run(Uint32 milliseconds)

{

#ifdef PEGASUS_OS_TYPE_WINDOWS

Boolean handled_events = false;

int i = 0;

// Windows select() has a strange little bug. It returns immediately if

#if defined(PEGASUS_OS_OS400) || defined(PEGASUS_OS_HPUX)

// there are no descriptors in the set even if the timeout is non-zero.

struct timeval tv = {milliseconds/1000, milliseconds%1000*1000};

// To work around this, we call Sleep() for now:

#else

struct timeval tv = {0, 1};

if (_entries.size() == 0)

Sleep(milliseconds);

#endif

fd_set fdread;

FD_ZERO(&fdread);

_entry_mut.lock(pegasus_thread_self());

// Check for events on the selected file descriptors. Only do this if

// Check the stopConnections flag. If set, clear the Acceptor monitor entries

// there were no undispatched events from last time.

if (_stopConnections == 1)

{

int count = 0;

for ( int indx = 0; indx < (int)_entries.size(); indx++)

{

if (_entries[indx]._type == Monitor::ACCEPTOR)

{

if ( _entries[indx]._status.value() != _MonitorEntry::EMPTY)

{

if ( _entries[indx]._status.value() == _MonitorEntry::IDLE ||

_entries[indx]._status.value() == _MonitorEntry::DYING )

{

// remove the entry

_entries[indx]._status = _MonitorEntry::EMPTY;

}

else

{

// set status to DYING

_entries[indx]._status.value() == _MonitorEntry::DYING;

}

_stopConnections = 0;

}

memcpy(&_rep->active_rd_fd_set, &_rep->rd_fd_set, sizeof(fd_set));

for( int indx = 0; indx < (int)_entries.size(); indx++)

// memcpy(&_rep->active_wr_fd_set, &_rep->wr_fd_set, sizeof(fd_set));

memcpy(&_rep->active_ex_fd_set, &_rep->ex_fd_set, sizeof(fd_set));

const Uint32 SECONDS = milliseconds / 1000;

const Uint32 MICROSECONDS = (milliseconds % 1000) * 1000;

struct timeval tv = { SECONDS, MICROSECONDS };

count = select(

FD_SETSIZE,

&_rep->active_rd_fd_set,

// &_rep->active_wr_fd_set,

NULL,

&_rep->active_ex_fd_set,

&tv);

if(count == 0)

{

return false;

if(_entries[indx]._status.value() == _MonitorEntry::IDLE)

{

FD_SET(_entries[indx].socket, &fdread);

}

int events = select(FD_SETSIZE, &fdread, NULL, NULL, &tv);

#ifdef PEGASUS_OS_TYPE_WINDOWS

else if (count == SOCKET_ERROR)

if(events && events != SOCKET_ERROR )

#else

else if (count == -1)

if(events && events != -1 )

#endif

{

return false;

for( int indx = 0; indx < (int)_entries.size(); indx++)

{

if(FD_ISSET(_entries[indx].socket, &fdread))

{

MessageQueue *q = MessageQueue::lookup(_entries[indx].queueId);

if(q == 0)

{

try

{

_entries[indx]._status = _MonitorEntry::EMPTY;

}

catch(...)

Boolean handled_events = false;

for (Uint32 i = 0, n = _entries.size(); i < _entries.size(); i++)

{

Sint32 socket = _entries[i].socket;

Uint32 events = 0;

if(_entries[i].dying.value() > 0 )

}

continue;

}

try

{

if(_entries[i]._type == Monitor::CONNECTION)

if(_entries[indx]._type == Monitor::CONNECTION)

{

static_cast<HTTPConnection *>(q)->_entry_index = indx;

MessageQueue *q = MessageQueue::lookup(_entries[i].queueId);

if(static_cast<HTTPConnection *>(q)->_dying.value() > 0 )

if(q && static_cast<HTTPConnection *>(q)->is_dying() &&

(0 == static_cast<HTTPConnection *>(q)->refcount.value()))

{

static_cast<HTTPConnection *>(q)->lock_connection();

_entries[indx]._status = _MonitorEntry::DYING;

static_cast<HTTPConnection *>(q)->unlock_connection();

MessageQueue & o = static_cast<HTTPConnection *>(q)->get_owner();

Message* message= new CloseConnectionMessage(static_cast<HTTPConnection *>(q)->getSocket());

Message* message= new CloseConnectionMessage(_entries[indx].socket);

message->dest = o.getQueueId();

_entry_mut.unlock();

o.enqueue(message);

i--;

return true;

n = _entries.size();

}

_entries[indx]._status = _MonitorEntry::BUSY;

_thread_pool->allocate_and_awaken((void *)q, _dispatch);

}

else

{

int events = 0;

events |= SocketMessage::READ;

Message *msg = new SocketMessage(_entries[indx].socket, events);

_entries[indx]._status = _MonitorEntry::BUSY;

_entry_mut.unlock();

q->enqueue(msg);

_entries[indx]._status = _MonitorEntry::IDLE;

return true;

}

catch(...)

{

}

handled_events = true;

}

_entry_mut.unlock();

return(handled_events);

}

if (FD_ISSET(socket, &_rep->active_rd_fd_set))

void Monitor::stopListeningForConnections()

events |= SocketMessage::READ;

{

PEG_METHOD_ENTER(TRC_HTTP, "Monitor::stopListeningForConnections()");

// if (FD_ISSET(socket, &_rep->active_wr_fd_set))

_stopConnections = 1;

// events |= SocketMessage::WRITE;

PEG_METHOD_EXIT();

}

if (FD_ISSET(socket, &_rep->active_ex_fd_set))

events |= SocketMessage::EXCEPTION;

if (events)

int Monitor::solicitSocketMessages(

Sint32 socket,

Uint32 events,

Uint32 queueId,

int type)

{

Tracer::trace(TRC_HTTP, Tracer::LEVEL4,

"Monitor::run - Socket Event Detected events = %d", events);

// if (events & SocketMessage::WRITE)

// {

// FD_CLR(socket, &_rep->active_wr_fd_set);

// Tracer::trace(TRC_HTTP, Tracer::LEVEL4,

// "Monitor::run FD_CLR WRITE");

// }

if (events & SocketMessage::READ)

PEG_METHOD_ENTER(TRC_HTTP, "Monitor::solicitSocketMessages");

int index = -1;

_entry_mut.lock(pegasus_thread_self());

for(index = 0; index < (int)_entries.size(); index++)

{

FD_CLR(socket, &_rep->active_rd_fd_set);

try

Tracer::trace(TRC_HTTP, Tracer::LEVEL4,

{

"Monitor::run FD_CLR READ");

if(_entries[index]._status.value() == _MonitorEntry::EMPTY)

{

_entries[index].socket = socket;

_entries[index].queueId = queueId;

_entries[index]._type = type;

_entries[index]._status = _MonitorEntry::IDLE;

_entry_mut.unlock();

return index;

}

else if (events & SocketMessage::EXCEPTION)

catch(...)

{

FD_CLR(socket, &_rep->active_ex_fd_set);

Tracer::trace(TRC_HTTP, Tracer::LEVEL4,

"Monitor::run FD_CLR EXECEPTION");

}

MessageQueue* queue = MessageQueue::lookup(_entries[i].queueId);

if( ! queue )

}

_entry_mut.unlock();

PEG_METHOD_EXIT();

return index;

}

void Monitor::unsolicitSocketMessages(Sint32 socket)

{

PEG_METHOD_ENTER(TRC_HTTP, "Monitor::unsolicitSocketMessages");

_entry_mut.lock(pegasus_thread_self());

for(int index = 0; index < (int)_entries.size(); index++)

{

unsolicitSocketMessages(socket);

if(_entries[index].socket == socket)

{

_entries[index]._status = _MonitorEntry::EMPTY;

break;

}

_entry_mut.unlock();

PEG_METHOD_EXIT();

}

if(_async == true && _entries[i]._type == Monitor::CONNECTION)

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm)

{

if( static_cast<HTTPConnection *>(queue)->refcount.value() == 0 )

HTTPConnection *dst = reinterpret_cast<HTTPConnection *>(parm);

dst->run(1);

if( dst->_monitor->_entries.size() > (Uint32)dst->_entry_index )

dst->_monitor->_entries[dst->_entry_index]._status = _MonitorEntry::IDLE;

return 0;

}

////************************* monitor 2 *****************************////

m2e_rep::m2e_rep(void)

:Base(), state(IDLE)

{

}

m2e_rep::m2e_rep(monitor_2_entry_type _type,

pegasus_socket _sock,

void* _accept,

void* _dispatch)

: Base(), type(_type), state(IDLE), psock(_sock),

accept_parm(_accept), dispatch_parm(_dispatch)

{

static_cast<HTTPConnection *>(queue)->refcount++;

if( false == static_cast<HTTPConnection *>(queue)->is_dying())

_thread_pool->allocate_and_awaken((void *)queue, _dispatch);

else

static_cast<HTTPConnection *>(queue)->refcount--;

}

m2e_rep::~m2e_rep(void)

{

}

else

m2e_rep::m2e_rep(const m2e_rep& r)

: Base()

{

Message* message = new SocketMessage(socket, events);

if(this != &r){

queue->enqueue(message);

type = r.type;

psock = r.psock;

accept_parm = r.accept_parm;

dispatch_parm = r.dispatch_parm;

state = IDLE;

}

count--;

pegasus_yield();

}

handled_events = true;

m2e_rep& m2e_rep::operator =(const m2e_rep& r)

{

if(this != &r) {

type = r.type;

psock = r.psock;

accept_parm = r.accept_parm;

dispatch_parm = r.dispatch_parm;

state = IDLE;

}

return *this;

}

return(handled_events);

Boolean m2e_rep::operator ==(const m2e_rep& r)

{

if(this == &r)

return true;

return false;

}

Boolean Monitor::solicitSocketMessages(

Boolean m2e_rep::operator ==(void* r)

Sint32 socket,

{

Uint32 events,

if((void*)this == r)

Uint32 queueId,

return true;

int type)

return false;

}

m2e_rep::operator pegasus_socket() const

{

PEG_METHOD_ENTER(TRC_HTTP, "Monitor::solictSocketMessage");

return psock;

}

// See whether a handler is already registered for this one:

Uint32 pos = _findEntry(socket);

if (pos != PEGASUS_NOT_FOUND)

monitor_2_entry::monitor_2_entry(void)

{

PEG_METHOD_EXIT();

_rep = new m2e_rep();

}

monitor_2_entry::monitor_2_entry(pegasus_socket& _psock,

monitor_2_entry_type _type,

void* _accept_parm, void* _dispatch_parm)

{

_rep = new m2e_rep(_type, _psock, _accept_parm, _dispatch_parm);

}

monitor_2_entry::monitor_2_entry(const monitor_2_entry& e)

{

if(this != &e){

Inc(this->_rep = e._rep);

}

monitor_2_entry::~monitor_2_entry(void)

{

Dec(_rep);

}

monitor_2_entry& monitor_2_entry::operator=(const monitor_2_entry& e)

{

if(this != &e){

Dec(_rep);

Inc(this->_rep = e._rep);

}

return *this;

}

Boolean monitor_2_entry::operator ==(const monitor_2_entry& me) const

{

if(this == &me)

return true;

return false;

}

Boolean monitor_2_entry::operator ==(void* k) const

{

if((void *)this == k)

return true;

return false;

}

// Set the events:

if (events & SocketMessage::READ)

monitor_2_entry_type monitor_2_entry::get_type(void) const

FD_SET(socket, &_rep->rd_fd_set);

{

return _rep->type;

}

if (events & SocketMessage::WRITE)

void monitor_2_entry::set_type(monitor_2_entry_type t)

FD_SET(socket, &_rep->wr_fd_set);

{

_rep->type = t;

}

if (events & SocketMessage::EXCEPTION)

FD_SET(socket, &_rep->ex_fd_set);

// Add the entry to the list:

monitor_2_entry_state monitor_2_entry::get_state(void) const

_MonitorEntry entry(socket, queueId, type);

{

_entries.append(entry);

return (monitor_2_entry_state) _rep->state.value();

}

// Success!

void monitor_2_entry::set_state(monitor_2_entry_state t)

{

_rep->state = t;

}

PEG_METHOD_EXIT();

void* monitor_2_entry::get_accept(void) const

return true;

{

return _rep->accept_parm;

}

Boolean Monitor::unsolicitSocketMessages(Sint32 socket)

void monitor_2_entry::set_accept(void* a)

{

PEG_METHOD_ENTER(TRC_HTTP, "Monitor::unsolicitSocketMessage");

_rep->accept_parm = a;

}

// Look for the given entry and remove it:

for (Uint32 i = 0, n = _entries.size(); i < n; i++)

void* monitor_2_entry::get_dispatch(void) const

{

if (_entries[i].socket == socket)

return _rep->dispatch_parm;

}

void monitor_2_entry::set_dispatch(void* a)

{

Sint32 socket = _entries[i].socket;

_rep->dispatch_parm = a;

FD_CLR(socket, &_rep->rd_fd_set);

FD_CLR(socket, &_rep->wr_fd_set);

FD_CLR(socket, &_rep->ex_fd_set);

_entries.remove(i);

// ATTN-RK-P3-20020521: Need "Socket::close(socket);" here?

Socket::close(socket);

PEG_METHOD_EXIT();

return true;

}

pegasus_socket monitor_2_entry::get_sock(void) const

{

return _rep->psock;

}

PEG_METHOD_EXIT();

return false;

void monitor_2_entry::set_sock(pegasus_socket& s)

{

_rep->psock = s;

}

AsyncDQueue<HTTPConnection2> monitor_2::_connections(true, 0);

monitor_2::monitor_2(void)

: _session_dispatch(0), _accept_dispatch(0), _listeners(true, 0),

_ready(true, 0), _die(0), _requestCount(0)

{

try {

bsd_socket_factory _factory;

// set up the listener/acceptor

pegasus_socket temp = pegasus_socket(&_factory);

temp.socket(PF_INET, SOCK_STREAM, 0);

// initialize the address

memset(&_tickle_addr, 0, sizeof(_tickle_addr));

#ifdef PEGASUS_OS_ZOS

_tickle_addr.sin_addr.s_addr = inet_addr_ebcdic("127.0.0.1");

#else

_tickle_addr.sin_addr.s_addr = inet_addr("127.0.0.1");

#endif

_tickle_addr.sin_family = PF_INET;

_tickle_addr.sin_port = 0;

PEGASUS_SOCKLEN_SIZE _addr_size = sizeof(_tickle_addr);

temp.bind((struct sockaddr *)&_tickle_addr, sizeof(_tickle_addr));

temp.listen(3);

temp.getsockname((struct sockaddr*)&_tickle_addr, &_addr_size);

// set up the connector

pegasus_socket tickler = pegasus_socket(&_factory);

tickler.socket(PF_INET, SOCK_STREAM, 0);

struct sockaddr_in _addr;

memset(&_addr, 0, sizeof(_addr));

#ifdef PEGASUS_OS_ZOS

_addr.sin_addr.s_addr = inet_addr_ebcdic("127.0.0.1");

#else

_addr.sin_addr.s_addr = inet_addr("127.0.0.1");

#endif

_addr.sin_family = PF_INET;

_addr.sin_port = 0;

tickler.bind((struct sockaddr*)&_addr, sizeof(_addr));

tickler.connect((struct sockaddr*)&_tickle_addr, sizeof(_tickle_addr));

_tickler.set_sock(tickler);

_tickler.set_type(INTERNAL);

_tickler.set_state(BUSY);

struct sockaddr_in peer;

memset(&peer, 0, sizeof(peer));

PEGASUS_SOCKLEN_SIZE peer_size = sizeof(peer);

pegasus_socket accepted = temp.accept((struct sockaddr*)&peer, &peer_size);

monitor_2_entry* _tickle = new monitor_2_entry(accepted, INTERNAL, 0, 0);

_tickle->set_state(BUSY);

_listeners.insert_first(_tickle);

}

catch(...){ }

}

Uint32 Monitor::_findEntry(Sint32 socket)

monitor_2::~monitor_2(void)

{

for (Uint32 i = 0, n = _entries.size(); i < n; i++)

try {

monitor_2_entry* temp = _listeners.remove_first();

while(temp){

delete temp;

temp = _listeners.remove_first();

}

catch(...){ }

}

void monitor_2::run(void)

{

monitor_2_entry* temp;

while(_die.value() == 0) {

struct timeval tv = {0, 0};

// place all sockets in the select set

FD_ZERO(&rd_fd_set);

try {

_listeners.lock(pegasus_thread_self());

temp = _listeners.next(0);

while(temp != 0 ){

if(temp->get_state() == CLOSED ){

monitor_2_entry* closed = temp;

temp = _listeners.next(closed);

_listeners.remove_no_lock(closed);

HTTPConnection2 *cn = monitor_2::remove_connection((Sint32)(closed->get_sock()));

delete cn;

delete closed;

}

if(temp == 0)

break;

Sint32 fd = (Sint32) temp->get_sock();

if(fd >= 0 )

FD_SET(fd , &rd_fd_set);

temp = _listeners.next(temp);

}

_listeners.unlock();

}

catch(...){

return;

}

// important - the dispatch routine has pointers to all the

// entries that are readable. These entries can be changed but

// the pointer must not be tampered with.

int events = select(FD_SETSIZE, &rd_fd_set, NULL, NULL, NULL);

try {

_listeners.lock(pegasus_thread_self());

temp = _listeners.next(0);

while(temp != 0 ){

Sint32 fd = (Sint32) temp->get_sock();

if(fd >= 0 && FD_ISSET(fd, &rd_fd_set)) {

temp->set_state(BUSY);

FD_CLR(fd, &rd_fd_set);

monitor_2_entry* ready = new monitor_2_entry(*temp);

try

{

_ready.insert_first(ready);

}

catch(...)

{

if (_entries[i].socket == socket)

return i;

}

return PEG_NOT_FOUND;

_requestCount++;

}

temp = _listeners.next(temp);

}

_listeners.unlock();

}

catch(...){

return;

}

// now handle the sockets that are ready to read

_dispatch();

} // while alive

}

void* monitor_2::set_session_dispatch(void (*dp)(monitor_2_entry*))

{

void* old = (void *)_session_dispatch;

_session_dispatch = dp;

return old;

}

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm)

void* monitor_2::set_accept_dispatch(void (*dp)(monitor_2_entry*))

{

HTTPConnection *dst = reinterpret_cast<HTTPConnection *>(parm);

void* old = (void*)_accept_dispatch;

if( true == dst->is_dying())

_accept_dispatch = dp;

return old;

}

// important - the dispatch routine has pointers to all the

// entries that are readable. These entries can be changed but

// the pointer must not be tampered with.

void monitor_2::_dispatch(void)

{

dst->refcount--;

monitor_2_entry* entry;

if(_ready.count() == 0 )

return;

try

{

entry = _ready.remove_first();

}

catch(...)

{

}

while(entry != 0 ) {

switch(entry->get_type()) {

case INTERNAL:

static char buffer[2];

entry->get_sock().disableBlocking();

entry->get_sock().read(&buffer, 2);

entry->get_sock().enableBlocking();

break;

case LISTEN:

{

static struct sockaddr peer;

static PEGASUS_SOCKLEN_SIZE peer_size = sizeof(peer);

entry->get_sock().disableBlocking();

pegasus_socket connected = entry->get_sock().accept(&peer, &peer_size);

entry->get_sock().enableBlocking();

monitor_2_entry *temp = add_entry(connected, SESSION, entry->get_accept(), entry->get_dispatch());

if(temp && _accept_dispatch != 0)

_accept_dispatch(temp);

}

break;

case SESSION:

if(_session_dispatch != 0 )

_session_dispatch(entry);

else {

static char buffer[4096];

int bytes = entry->get_sock().read(&buffer, 4096);

}

break;

case UNTYPED:

default:

break;

}

_requestCount--;

delete entry;

if(_ready.count() == 0 )

break;

try

{

entry = _ready.remove_first();

}

catch(...)

{

}

void monitor_2::stop(void)

{

_die = 1;

tickle();

// shut down the listener list, free the list nodes

_tickler.get_sock().close();

_listeners.shutdown_queue();

}

void monitor_2::tickle(void)

{

static char _buffer[] =

{

'0','0'

};

_tickler.get_sock().write(&_buffer, 2);

}

monitor_2_entry* monitor_2::add_entry(pegasus_socket& ps,

monitor_2_entry_type type,

void* accept_parm,

void* dispatch_parm)

{

monitor_2_entry* m2e = new monitor_2_entry(ps, type, accept_parm, dispatch_parm);

try{

_listeners.insert_first(m2e);

}

catch(...){

delete m2e;

return 0;

}

if( false == dst->is_dying())

tickle();

return m2e;

}

Boolean monitor_2::remove_entry(Sint32 s)

{

monitor_2_entry* temp;

try {

_listeners.try_lock(pegasus_thread_self());

temp = _listeners.next(0);

while(temp != 0){

if(s == (Sint32)temp->_rep->psock ){

temp = _listeners.remove_no_lock(temp);

delete temp;

_listeners.unlock();

return true;

}

temp = _listeners.next(temp);

}

_listeners.unlock();

}

catch(...){

}

return false;

}

Uint32 monitor_2::getOutstandingRequestCount(void)

{

return _requestCount.value();

}

HTTPConnection2* monitor_2::remove_connection(Sint32 sock)

{

if(false == dst->run(1))

pegasus_sleep(1);

HTTPConnection2* temp;

try

{

monitor_2::_connections.lock(pegasus_thread_self());

temp = monitor_2::_connections.next(0);

while(temp != 0 )

{

if(sock == temp->getSocket())

{

temp = monitor_2::_connections.remove_no_lock(temp);

monitor_2::_connections.unlock();

return temp;

}

temp = monitor_2::_connections.next(temp);

}

monitor_2::_connections.unlock();

}

catch(...)

{

}

dst->refcount--;

return 0;

}

Boolean monitor_2::insert_connection(HTTPConnection2* connection)

{

try

{

monitor_2::_connections.insert_first(connection);

}

catch(...)

{

return false;

}

return true;

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.20
changed lines
	Added in v.1.49

No CVS admin address has been configured