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.41 and 1.70

version 1.41, 2003/08/15 21:25:29

version 1.70, 2004/01/30 15:41:28

Line 1

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

//%2003////////////////////////////////////////////////////////////////////////

// The Open Group, Tivoli Systems

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

// IBM Corp.; EMC 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 23

Line 25

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

// Modified By:

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

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

Line 35

Line 37

#include "Socket.h"

#include <Pegasus/Common/Tracer.h>

#include <Pegasus/Common/HTTPConnection.h>

#include <Pegasus/Common/MessageQueueService.h>

#ifdef PEGASUS_OS_TYPE_WINDOWS

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

Line 91

Line 94

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

#define MAX_NUMBER_OF_MONITOR_ENTRIES 32

Monitor::Monitor()

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

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

{

int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;

Socket::initializeInterface();

_rep = 0;

_entries.reserveCapacity(32);

_entries.reserveCapacity(numberOfMonitorEntriesToAllocate);

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

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

{

_MonitorEntry entry(0, 0, 0);

_entries.append(entry);

Line 105

Line 110

}

Monitor::Monitor(Boolean async)

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

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

{

int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;

Socket::initializeInterface();

_rep = 0;

_entries.reserveCapacity(32);

_entries.reserveCapacity(numberOfMonitorEntriesToAllocate);

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

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

{

_MonitorEntry entry(0, 0, 0);

_entries.append(entry);

}

if( _async == true )

{

_thread_pool = new ThreadPool(0,

"Monitor",

create_time,

destroy_time,

deadlock_time);

}

else

_thread_pool = 0;

}

Monitor::~Monitor()

Line 146

Line 140

Socket::uninitializeInterface();

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

"returning from monitor destructor");

if(_async == true)

delete _thread_pool;

}

int Monitor::kill_idle_threads()

{

static struct timeval now, last;

gettimeofday(&now, NULL);

int dead_threads = 0;

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

{

gettimeofday(&last, NULL);

try

{

dead_threads = _thread_pool->kill_dead_threads();

}

catch(IPCException& )

{

}

return dead_threads;

}

Boolean Monitor::run(Uint32 milliseconds)

{

Line 187

Line 156

FD_ZERO(&fdread);

_entry_mut.lock(pegasus_thread_self());

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

if (_stopConnections == 1)

{

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 = _MonitorEntry::DYING;

}

_stopConnections = 0;

}

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

{

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

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

{

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

PEGASUS_ASSERT(q != 0);

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

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

message->dest = o.getQueueId();

// HTTPAcceptor is responsible for closing the connection.

// The lock is released to allow HTTPAcceptor to call

// unsolicitSocketMessages to free the entry.

// Once HTTPAcceptor completes processing of the close

// connection, the lock is re-requested and processing of

// the for loop continues. This is safe with the current

// implementation of the _entries object. Note that the

// loop condition accesses the _entries.size() on each

// iteration, so that a change in size while the mutex is

// unlocked will not result in an ArrayIndexOutOfBounds

// exception.

_entry_mut.unlock();

o.enqueue(message);

_entry_mut.lock(pegasus_thread_self());

}

Uint32 _idleEntries = 0;

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

{

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

{

_idleEntries++;

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

}

// Fixed in monitor_2 but added because Monitor is still the default monitor.

// When _idleEntries is 0 don't immediately return, otherwise this loops out of control

// kicking off kill idle thread threads. E.g. There is nothing to select on when the cimserver

// is shutting down.

if( _idleEntries == 0 )

{

Thread::sleep( milliseconds );

_entry_mut.unlock();

return false;

}

_entry_mut.unlock();

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

_entry_mut.lock(pegasus_thread_self());

#ifdef PEGASUS_OS_TYPE_WINDOWS

if(events && events != SOCKET_ERROR )

if(events == SOCKET_ERROR)

#else

if(events && events != -1 )

if(events == -1)

#endif

{

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

"Monitor::run - errorno = %d has occurred on select.", errno);

// The EBADF error indicates that one or more or the file

// descriptions was not valid. This could indicate that

// the _entries structure has been corrupted or that

// we have a synchronization error.

PEGASUS_ASSERT(errno != EBADF);

}

else if (events)

{

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

"Monitor::run select event received events = %d, monitoring %d idle entries",

events, _idleEntries);

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

{

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

// The Monitor should only look at entries in the table that are IDLE (i.e.,

// owned by the Monitor).

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

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

{

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

if(q == 0)

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

{

"Monitor::run indx = %d, queueId = %d, q = %p",

try

indx, _entries[indx].queueId, q);

{

PEGASUS_ASSERT(q !=0);

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

}

catch(...)

{

}

continue;

}

try

{

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

{

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

"_entries[indx].type for indx = %d is Monitor::CONNECTION", indx);

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

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

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

// If allocate_and_awaken failure, retry on next iteration

if (!MessageQueueService::get_thread_pool()->allocate_and_awaken(

(void *)q, _dispatch))

{

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

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

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

"Monitor::run: Insufficient resources to process request.");

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

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

message->dest = o.getQueueId();

_entry_mut.unlock();

o.enqueue(message);

return true;

}

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

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

}

else

{

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

"Non-connection entry, indx = %d, has been received.", indx);

int events = 0;

events |= SocketMessage::READ;

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

Line 263

Line 315

return(handled_events);

}

void Monitor::stopListeningForConnections()

{

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

_stopConnections = 1;

PEG_METHOD_EXIT();

}

int Monitor::solicitSocketMessages(

Line 274

Line 334

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

int index = -1;

_entry_mut.lock(pegasus_thread_self());

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

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

{

try

{

Line 299

Line 358

}

_entry_mut.unlock();

PEG_METHOD_EXIT();

return index;

return -1;

}

void Monitor::unsolicitSocketMessages(Sint32 socket)

{

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

_entry_mut.lock(pegasus_thread_self());

Line 312

Line 372

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

{

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

_entries[index].socket = -1;

break;

}

Line 322

Line 383

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm)

{

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

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

"Monitor::_dispatch: entering run() for indx = %d, queueId = %d, q = %p",

dst->_entry_index, dst->_monitor->_entries[dst->_entry_index].queueId, dst);

try

{

dst->run(1);

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

}

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

catch (...)

{

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

"Monitor::_dispatch: exception received");

}

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

"Monitor::_dispatch: exited run() for index %d", dst->_entry_index);

PEGASUS_ASSERT(dst->_monitor->_entries[dst->_entry_index]._status.value() == _MonitorEntry::BUSY);

// Once the HTTPConnection thread has set the status value to either

// Monitor::DYING or Monitor::IDLE, it has returned control of the connection

// to the Monitor. It is no longer permissible to access the connection

// or the entry in the _entries table.

if (dst->_connectionClosePending)

{

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

}

else

{

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

}

return 0;

}

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

monitor_2_entry::monitor_2_entry(void)

: type(UNTYPED)

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)

{

}

m2e_rep::~m2e_rep(void)

{

}

m2e_rep::m2e_rep(const m2e_rep& r)

: Base()

{

if(this != &r){

type = r.type;

psock = r.psock;

accept_parm = r.accept_parm;

dispatch_parm = r.dispatch_parm;

state = IDLE;

}

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;

}

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

{

if(this == &r)

return true;

return false;

}

monitor_2_entry::monitor_2_entry(pegasus_socket& _psock, monitor_2_entry_type _type)

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

: type(_type), psock(_psock)

{

if((void*)this == r)

return true;

return false;

}

m2e_rep::operator pegasus_socket() const

{

return psock;

}

monitor_2_entry::monitor_2_entry(void)

{

_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){

psock = e.psock;

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

type = e.type;

}

monitor_2_entry::~monitor_2_entry(void)

{

Dec(_rep);

}

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

{

if(this != &e){

psock = e.psock;

Dec(_rep);

type = e.type;

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

}

return *this;

}

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

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

{

if(this == &me)

return true;

if((Sint32)this->psock == (Sint32)me.psock)

return true;

return false;

}

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

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

{

if((void *)this == k)

return true;

Line 385

Line 544

}

monitor_2_entry::operator pegasus_socket() const

monitor_2_entry_type monitor_2_entry::get_type(void) const

{

return psock;

return _rep->type;

}

void monitor_2_entry::set_type(monitor_2_entry_type t)

{

_rep->type = t;

}

monitor_2_entry_state monitor_2_entry::get_state(void) const

{

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

}

void monitor_2_entry::set_state(monitor_2_entry_state t)

{

_rep->state = t;

}

void* monitor_2_entry::get_accept(void) const

{

return _rep->accept_parm;

}

void monitor_2_entry::set_accept(void* a)

{

_rep->accept_parm = a;

}

void* monitor_2_entry::get_dispatch(void) const

{

return _rep->dispatch_parm;

}

void monitor_2_entry::set_dispatch(void* a)

{

_rep->dispatch_parm = a;

}

pegasus_socket monitor_2_entry::get_sock(void) const

{

return _rep->psock;

}

void monitor_2_entry::set_sock(pegasus_socket& s)

{

_rep->psock = s;

}

//static monitor_2* _m2_instance;

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

monitor_2::monitor_2(void)

: _session_dispatch(0), _listeners(true, 0), _ready(true), _die(0)

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

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

{

try {

Line 404

Line 616

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

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(37)

#endif

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

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(0)

#endif

_tickle_addr.sin_family = PF_INET;

_tickle_addr.sin_port = 0;

Line 420

Line 642

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.psock = tickler;

_tickler.set_sock(tickler);

_tickler.type = INTERNAL;

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

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

_tickle->set_state(BUSY);

_listeners.insert_first(_tickle);

}

Line 443

Line 673

monitor_2::~monitor_2(void)

{

PEGASUS_STD(cout) << "monitor destructor" << PEGASUS_STD(endl);

stop();

try {

monitor_2_entry* temp = _listeners.remove_first();

Line 452

Line 683

temp = _listeners.remove_first();

}

catch(...){ }

try

{

HTTPConnection2* temp = _connections.remove_first();

while(temp)

{

delete temp;

temp = _connections.remove_first();

}

catch(...)

{

}

Line 460

Line 708

{

monitor_2_entry* temp;

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

struct timeval tv = {0, 0};

struct timeval tv_idle = { 60, 0 };

// place all sockets in the select set

FD_ZERO(&rd_fd_set);

Line 468

Line 717

_listeners.lock(pegasus_thread_self());

temp = _listeners.next(0);

while(temp != 0 ){

FD_SET((Sint32)temp->psock, &rd_fd_set);

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

Line 476

Line 738

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.

if(_connections.count() )

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

else

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

if(_die.value())

{

break;

}

try {

_listeners.lock(pegasus_thread_self());

temp = _listeners.next(0);

while(temp != 0 ){

if(FD_ISSET((Sint32)temp->psock, &rd_fd_set)) {

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

FD_CLR((Sint32)temp->psock, &rd_fd_set);

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

monitor_2_entry* entry = new monitor_2_entry(*temp);

temp->set_state(BUSY);

_ready.insert_first((void*)entry);

FD_CLR(fd, &rd_fd_set);

monitor_2_entry* ready = new monitor_2_entry(*temp);

try

{

_ready.insert_first(ready);

}

catch(...)

{

}

_requestCount++;

}

temp = _listeners.next(temp);

}

Line 495

Line 777

catch(...){

return;

}

// now handle the sockets that are ready to read

if(_ready.count())

_dispatch();

else

{

if(_connections.count() == 0 )

_idle_dispatch(_idle_parm);

}

} // while alive

}

int monitor_2::solicitSocketMessages(

Sint32 socket,

Uint32 events,

Uint32 queueId,

int type)

{

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

_entry_mut.lock(pegasus_thread_self());

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

{

try

{

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

{

_entries[index].socket = socket;

//_entries[index].queueId = queueId;

//_entries[index]._type = type;

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

_entry_mut.unlock();

return index;

}

catch(...)

{

}

_entry_mut.unlock();

PEG_METHOD_EXIT();

return -1;

}

void monitor_2::unsolicitSocketMessages(Sint32 socket)

{

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

_entry2_mut.lock(pegasus_thread_self());

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

{

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

{

_entries2[index]._status = monitor_2_entry::EMPTY;

_entries2[index].socket = -1;

break;

}

_entry2_mut.unlock();

PEG_METHOD_EXIT();

}

void* monitor_2::set_session_dispatch(void (*dp)(pegasus_socket&))

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

{

void* old = (void*)_session_dispatch;

_session_dispatch = dp;

return old;

}

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

{

void* old = (void*)_accept_dispatch;

_accept_dispatch = dp;

return old;

}

void* monitor_2::set_idle_dispatch(void (*dp)(void*))

{

void* old = (void*)_idle_dispatch;

_idle_dispatch = dp;

return old;

}

void* monitor_2::set_idle_parm(void* parm)

{

void* old = _idle_parm;

_idle_parm = parm;

return old;

}

//-----------------------------------------------------------------

// Note on deleting the monitor_2_entry nodes:

// Each case: in the switch statement needs to handle the deletion

// of the monitor_2_entry * node differently. A SESSION dispatch

// routine MUST DELETE the entry during its dispatch handling.

// All other dispatch routines MUST NOT delete the entry during the

// dispatch handling, but must allow monitor_2::_dispatch to delete

// the entry.

// The reason is pretty obscure and it is debatable whether or not

// to even bother, but during cimserver shutdown the single monitor_2_entry*

// will leak unless the _session_dispatch routine takes care of deleting it.

// The reason is that a shutdown messages completely stops everything and

// the _session_dispatch routine never returns. So monitor_2::_dispatch is

// never able to do its own cleanup.

// << Mon Oct 13 09:33:33 2003 mdd >>

//-----------------------------------------------------------------

void monitor_2::_dispatch(void)

{

monitor_2_entry* entry = (monitor_2_entry*) _ready.remove_first();

monitor_2_entry* entry;

try

{

entry = _ready.remove_first();

}

catch(...)

{

}

while(entry != 0 ){

switch(entry->type) {

switch(entry->get_type()) {

case INTERNAL:

static char buffer[2];

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

entry->get_sock().disableBlocking();

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

entry->get_sock().enableBlocking();

delete entry;

break;

case LISTEN:

{

static struct sockaddr peer;

static PEGASUS_SOCKLEN_SIZE peer_size = sizeof(peer);

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

entry->get_sock().disableBlocking();

add_entry(connected, SESSION);

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

#ifdef PEGASUS_OS_TYPE_WINDOWS

if((Sint32)connected == SOCKET_ERROR)

#else

if((Sint32)connected == -1 )

#endif

{

delete entry;

break;

}

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

delete entry;

}

break;

case SESSION:

if(_session_dispatch != 0 )

_session_dispatch(entry->psock);

{

// NOTE: _session_dispatch will delete entry - do not do it here

_session_dispatch(entry);

}

else {

static char buffer[4096];

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

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

delete entry;

}

break;

case UNTYPED:

default:

delete entry;

break;

}

delete entry;

_requestCount--;

entry = (monitor_2_entry*) _ready.remove_first();

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.psock.close();

_tickler.get_sock().close();

_listeners.shutdown_queue();

}

Line 564

Line 993

'0','0'

};

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

_tickler.get_sock().disableBlocking();

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

_tickler.get_sock().enableBlocking();

}

Boolean monitor_2::add_entry(pegasus_socket& ps, monitor_2_entry_type type)

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

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

try{

_listeners.insert_first(m2e);

}

catch(...){

delete m2e;

return false;

return 0;

}

tickle();

return true;

return m2e;

}

Boolean monitor_2::remove_entry(Sint32 s)

Line 590

Line 1026

_listeners.try_lock(pegasus_thread_self());

temp = _listeners.next(0);

while(temp != 0){

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

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

temp = _listeners.remove_no_lock(temp);

delete temp;

_listeners.unlock();

Line 605

Line 1041

return false;

}

Uint32 monitor_2::getOutstandingRequestCount(void)

{

return _requestCount.value();

}

HTTPConnection2* monitor_2::remove_connection(Sint32 sock)

{

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(...)

{

}

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.41
changed lines
	Added in v.1.70

No CVS admin address has been configured