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.70 and 1.82

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

version 1.82, 2004/12/15 14:12:42

Line 1

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

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

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

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

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

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

Line 28

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

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

// Amit K Arora (Bug#1153) amita@in.ibm.com

// Alagaraja Ramasubramanian (alags_raj@in.ibm.com) for Bug#1090

// Sushma Fernandes (sushma@hp.com) for Bug#2057

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

Line 38

Line 43

#include <Pegasus/Common/Tracer.h>

#include <Pegasus/Common/HTTPConnection.h>

#include <Pegasus/Common/MessageQueueService.h>

#include <Pegasus/Common/Exception.h>

#ifdef PEGASUS_OS_TYPE_WINDOWS

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

Line 67

Line 73

static AtomicInt _connections = 0;

static struct timeval create_time = {0, 1};

static struct timeval destroy_time = {300, 0};

static struct timeval deadlock_time = {0, 0};

Line 96

Line 101

#define MAX_NUMBER_OF_MONITOR_ENTRIES 32

Monitor::Monitor()

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

: _module_handle(0),

_controller(0),

_async(false),

_stopConnections(0),

_stopConnectionsSem(0),

_solicitSocketCount(0),

_tickle_client_socket(-1),

_tickle_server_socket(-1),

_tickle_peer_socket(-1)

{

int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;

Socket::initializeInterface();

_rep = 0;

_entries.reserveCapacity(numberOfMonitorEntriesToAllocate);

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

// setup the tickler

initializeTickler();

// Start the count at 1 because initilizeTickler()

// has added an entry in the first position of the

// _entries array

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

{

_MonitorEntry entry(0, 0, 0);

_entries.append(entry);

Line 110

Line 130

}

Monitor::Monitor(Boolean async)

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

: _module_handle(0),

_controller(0),

_async(async),

_stopConnections(0),

_stopConnectionsSem(0),

_solicitSocketCount(0),

_tickle_client_socket(-1),

_tickle_server_socket(-1),

_tickle_peer_socket(-1)

{

int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;

Socket::initializeInterface();

_rep = 0;

_entries.reserveCapacity(numberOfMonitorEntriesToAllocate);

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

// setup the tickler

initializeTickler();

// Start the count at 1 because initilizeTickler()

// has added an entry in the first position of the

// _entries array

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

{

_MonitorEntry entry(0, 0, 0);

_entries.append(entry);

Line 137

Line 172

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

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

try{

if(_tickle_peer_socket >= 0)

{

Socket::close(_tickle_peer_socket);

}

if(_tickle_client_socket >= 0)

{

Socket::close(_tickle_client_socket);

}

if(_tickle_server_socket >= 0)

{

Socket::close(_tickle_server_socket);

}

catch(...)

{

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

"Failed to close tickle sockets");

}

Socket::uninitializeInterface();

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

"returning from monitor destructor");

}

void Monitor::initializeTickler(){

NOTE: On any errors trying to

setup out tickle connection,

throw an exception/end the server

/* setup the tickle server/listener */

// get a socket for the server side

if((_tickle_server_socket = ::socket(PF_INET, SOCK_STREAM, 0)) < 0){

//handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_CREATE",

"Received error number $0 while creating the internal socket.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// initialize the address

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

#ifdef PEGASUS_OS_ZOS

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

#else

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(37)

#endif

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

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(0)

#endif

_tickle_server_addr.sin_family = PF_INET;

_tickle_server_addr.sin_port = 0;

PEGASUS_SOCKLEN_SIZE _addr_size = sizeof(_tickle_server_addr);

// bind server side to socket

if((::bind(_tickle_server_socket,

(struct sockaddr *)&_tickle_server_addr,

sizeof(_tickle_server_addr))) < 0){

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_BIND",

"Received error number $0 while binding the internal socket.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// tell the kernel we are a server

if((::listen(_tickle_server_socket,3)) < 0){

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_LISTEN",

"Received error number $0 while listening to the internal socket.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// make sure we have the correct socket for our server

int sock = ::getsockname(_tickle_server_socket,

(struct sockaddr*)&_tickle_server_addr,

&_addr_size);

if(sock < 0){

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_SOCKNAME",

"Received error number $0 while getting the internal socket name.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

/* set up the tickle client/connector */

// get a socket for our tickle client

if((_tickle_client_socket = ::socket(PF_INET, SOCK_STREAM, 0)) < 0){

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_CLIENT_CREATE",

"Received error number $0 while creating the internal client socket.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// setup the address of the client

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

#ifdef PEGASUS_OS_ZOS

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

#else

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(37)

#endif

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

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(0)

#endif

_tickle_client_addr.sin_family = PF_INET;

_tickle_client_addr.sin_port = 0;

// bind socket to client side

if((::bind(_tickle_client_socket,

(struct sockaddr*)&_tickle_client_addr,

sizeof(_tickle_client_addr))) < 0){

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_CLIENT_BIND",

"Received error number $0 while binding the internal client socket.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// connect to server side

if((::connect(_tickle_client_socket,

(struct sockaddr*)&_tickle_server_addr,

sizeof(_tickle_server_addr))) < 0){

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_CLIENT_CONNECT",

"Received error number $0 while connecting the internal client socket.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

/* set up the slave connection */

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

PEGASUS_SOCKLEN_SIZE peer_size = sizeof(_tickle_peer_addr);

pegasus_sleep(1);

// this call may fail, we will try a max of 20 times to establish this peer connection

if((_tickle_peer_socket = ::accept(_tickle_server_socket,

(struct sockaddr*)&_tickle_peer_addr,

&peer_size)) < 0){

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

// Only retry on non-windows platforms.

if(_tickle_peer_socket == -1 && errno == EAGAIN)

{

int retries = 0;

{

pegasus_sleep(1);

_tickle_peer_socket = ::accept(_tickle_server_socket,

(struct sockaddr*)&_tickle_peer_addr,

&peer_size);

retries++;

} while(_tickle_peer_socket == -1 && errno == EAGAIN && retries < 20);

}

#endif

}

if(_tickle_peer_socket == -1){

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_ACCEPT",

"Received error number $0 while accepting the internal socket connection.",

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// add the tickler to the list of entries to be monitored and set to IDLE because Monitor only

// checks entries with IDLE state for events

_MonitorEntry entry(_tickle_peer_socket, 1, INTERNAL);

entry._status = _MonitorEntry::IDLE;

_entries.append(entry);

}

void Monitor::tickle(void)

{

static char _buffer[] =

{

'0','0'

};

AutoMutex autoMutex(_tickle_mutex);

Socket::disableBlocking(_tickle_client_socket);

Socket::write(_tickle_client_socket,&_buffer, 2);

Socket::enableBlocking(_tickle_client_socket);

}

void Monitor::setState( Uint32 index, _MonitorEntry::entry_status status )

{

// Set the state to requested state

_entries[index]._status = status;

}

Boolean Monitor::run(Uint32 milliseconds)

{

Boolean handled_events = false;

int i = 0;

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

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

#else

struct timeval tv = {0, 1};

#endif

fd_set fdread;

FD_ZERO(&fdread);

_entry_mut.lock(pegasus_thread_self());

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

Line 180

Line 442

}

_stopConnections = 0;

_stopConnectionsSem.signal();

}

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

{

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

const _MonitorEntry &entry = _entries[indx];

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

if ((entry._status.value() == _MonitorEntry::DYING) &&

(entry._type == Monitor::CONNECTION))

{

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

MessageQueue *q = MessageQueue::lookup(entry.queueId);

PEGASUS_ASSERT(q != 0);

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

HTTPConnection &h = *static_cast<HTTPConnection *>(q);

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

if (h._connectionClosePending == false)

continue;

// NOTE: do not attempt to delete while there are pending responses

// coming thru. The last response to come thru after a

// _connectionClosePending will reset _responsePending to false

// and then cause the monitor to rerun this code and clean up.

// (see HTTPConnection.cpp)

if (h._responsePending == true)

{

Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "Monitor::run - "

"Ignoring connection delete request because "

"responses are still pending. "

"connection=0x%p, socket=%d\n",

(void *)&h, h.getSocket());

continue;

}

h._connectionClosePending = false;

MessageQueue &o = h.get_owner();

Message* message= new CloseConnectionMessage(entry.socket);

message->dest = o.getQueueId();

// HTTPAcceptor is responsible for closing the connection.

Line 213

Line 498

Uint32 _idleEntries = 0;

We will keep track of the maximum socket number and pass this value

to the kernel as a parameter to SELECT. This loop seems like a good

place to calculate the max file descriptor (maximum socket number)

because we have to traverse the entire array.

int maxSocketCurrentPass = 0;

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

{

if(maxSocketCurrentPass < _entries[indx].socket)

maxSocketCurrentPass = _entries[indx].socket;

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

{

_idleEntries++;

Line 222

Line 517

}

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

Add 1 then assign maxSocket accordingly. We add 1 to account for

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

descriptors starting at 0.

// is shutting down.

if( _idleEntries == 0 )

maxSocketCurrentPass++;

{

Thread::sleep( milliseconds );

_entry_mut.unlock();

return false;

}

_entry_mut.unlock();

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

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

_entry_mut.lock(pegasus_thread_self());

#ifdef PEGASUS_OS_TYPE_WINDOWS

Line 277

Line 567

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

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

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

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

// Do not update the entry just yet. The entry gets updated once

// the request has been read.

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

// If allocate_and_awaken failure, retry on next iteration

/* Removed for PEP 183.

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

(void *)q, _dispatch))

{

Line 288

Line 583

_entry_mut.unlock();

return true;

}

// Added for PEP 183

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

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

}

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

// It is possible the entry status may not be set to busy.

// The following will fail in that case.

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

// The following is not relevant as the worker thread or the

// reader thread will update the status of the entry.

//if (dst->_connectionClosePending)

//{

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

//}

//else

//{

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

//}

// end Added for PEP 183

}

else if( _entries[indx]._type == Monitor::INTERNAL){

// set ourself to BUSY,

// read the data

// and set ourself back to IDLE

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

static char buffer[2];

Socket::disableBlocking(_entries[indx].socket);

Sint32 amt = Socket::read(_entries[indx].socket,&buffer, 2);

Socket::enableBlocking(_entries[indx].socket);

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

}

else

{

Line 315

Line 659

return(handled_events);

}

void Monitor::stopListeningForConnections()

void Monitor::stopListeningForConnections(Boolean wait)

{

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

// set boolean then tickle the server to recognize _stopConnections

_stopConnections = 1;

tickle();

if (wait)

{

// Wait for the monitor to notice _stopConnections. Otherwise the

// caller of this function may unbind the ports while the monitor

// is still accepting connections on them.

try

{

_stopConnectionsSem.time_wait(10000);

}

catch (TimeOut &)

{

// The monitor is probably busy processng a very long request, and is

// not accepting connections. Let the caller unbind the ports.

}

PEG_METHOD_EXIT();

}

Line 331

Line 692

Uint32 queueId,

int type)

{

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

AutoMutex autoMut(_entry_mut);

// Check to see if we need to dynamically grow the _entries array

// We always want the _entries array to 2 bigger than the

// current connections requested

_solicitSocketCount++; // bump the count

int size = (int)_entries.size();

if(_solicitSocketCount >= (size-1)){

for(int i = 0; i < (_solicitSocketCount - (size-1)); i++){

_MonitorEntry entry(0, 0, 0);

_entries.append(entry);

}

_entry_mut.lock(pegasus_thread_self());

int index;

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

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

{

try

{

Line 346

Line 717

_entries[index].queueId = queueId;

_entries[index]._type = type;

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

_entry_mut.unlock();

return index;

}

Line 354

Line 724

catch(...)

{

}

_entry_mut.unlock();

_solicitSocketCount--; // decrease the count, if we are here we didnt do anything meaningful

PEG_METHOD_EXIT();

return -1;

}

void Monitor::unsolicitSocketMessages(Sint32 socket)

{

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

_entry_mut.lock(pegasus_thread_self());

AutoMutex autoMut(_entry_mut);

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

Start at index = 1 because _entries[0] is the tickle entry which never needs

to be EMPTY;

int index;

for(index = 1; index < _entries.size(); index++)

{

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

{

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

_entries[index].socket = -1;

_solicitSocketCount--;

break;

}

_entry_mut.unlock();

Dynamic Contraction:

To remove excess entries we will start from the end of the _entries array

and remove all entries with EMPTY status until we find the first NON EMPTY.

This prevents the positions, of the NON EMPTY entries, from being changed.

index = _entries.size() - 1;

while(_entries[index]._status == _MonitorEntry::EMPTY){

if(_entries.size() > MAX_NUMBER_OF_MONITOR_ENTRIES)

_entries.remove(index);

index--;

}

PEG_METHOD_EXIT();

}

// Note: this is no longer called with PEP 183.

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm)

{

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

Line 663

Line 1053

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

// No need to set _tickle's state as BUSY, since monitor_2::run() now

// does a select only on sockets which are in IDLE (default) state.

// _tickle->set_state(BUSY);

_listeners.insert_first(_tickle);

Line 707

Line 1100

void monitor_2::run(void)

{

monitor_2_entry* temp;

int _nonIdle=0, _idleCount=0, events;

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

_nonIdle=_idleCount=0;

struct timeval tv_idle = { 60, 0 };

Line 716

Line 1112

try {

_listeners.lock(pegasus_thread_self());

temp = _listeners.next(0);

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

"monitor_2::run:Creating New FD list for SELECT.");

while(temp != 0 ){

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

monitor_2_entry* closed = temp;

temp = _listeners.next(closed);

_listeners.remove_no_lock(closed);

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

"monitor_2::run:Deleteing CLOSED socket fd=%d.",(Sint32)closed->get_sock());

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

delete cn;

delete closed;

}

if(temp == 0)

break;

//Count the number if IDLE sockets

if(temp->get_state() != IDLE ) _nonIdle++;

else _idleCount++;

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

if(fd >= 0 )

//Select should be called ONLY on the FDs which are in IDLE state

if((fd >= 0) && (temp->get_state() == IDLE))

{

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

"monitor_2::run:Adding FD %d to the list for SELECT.",fd);

FD_SET(fd , &rd_fd_set);

}

temp = _listeners.next(temp);

}

_listeners.unlock();

Line 738

Line 1151

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

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

else

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

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

if(_die.value())

{

break;

}

#ifdef PEGASUS_OS_TYPE_WINDOWS

if(events == SOCKET_ERROR)

#else

if(events == -1)

#endif

{

Tracer::trace(TRC_HTTP, Tracer::LEVEL2,

"monitor_2:run:INVALID FD. errorno = %d 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.

// Keeping the line below commented for time being.

// PEGASUS_ASSERT(errno != EBADF);

}

else if (events)

{

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

"monitor_2::run select event received events = %d, monitoring %d idle entries", events, _idleCount);

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

if(temp->get_type() != CLIENTSESSION) temp->set_state(BUSY);

FD_CLR(fd, &rd_fd_set);

monitor_2_entry* ready = new monitor_2_entry(*temp);

try

Line 785

Line 1221

if(_connections.count() == 0 )

_idle_dispatch(_idle_parm);

}

} // if events

} // while alive

_die=0;

}

Line 796

Line 1234

int type)

{

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

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

_entry_mut.lock(pegasus_thread_self());

AutoMutex autoMut(_entry_mut);

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

{

Line 809

Line 1247

_entries[index].socket = socket;

//_entries[index].queueId = queueId;

//_entries[index]._type = type;

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

_entries[index]._status = IDLE;

_entry_mut.unlock();

return index;

}

Line 820

Line 1257

}

_entry_mut.unlock();

PEG_METHOD_EXIT();

return -1;

}

Line 830

Line 1266

{

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

_entry2_mut.lock(pegasus_thread_self());

AutoMutex autoMut(_entry2_mut);

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

{

Line 841

Line 1277

break;

}

_entry2_mut.unlock();

PEG_METHOD_EXIT();

}

Line 915

Line 1350

entry->get_sock().disableBlocking();

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

entry->get_sock().enableBlocking();

entry->set_state(IDLE); // Set state of the socket to IDLE so that

// monitor_2::run can add to the list of FDs

// on which select would be called.

delete entry;

break;

Line 924

Line 1365

static PEGASUS_SOCKLEN_SIZE peer_size = sizeof(peer);

entry->get_sock().disableBlocking();

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

entry->set_state(IDLE); // Set state of the LISTEN socket to IDLE

#ifdef PEGASUS_OS_TYPE_WINDOWS

if((Sint32)connected == SOCKET_ERROR)

#else

Line 943

Line 1385

}

break;

case SESSION:

case CLIENTSESSION:

if(_session_dispatch != 0 )

{

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

unsigned client=0;

if(entry->get_type() == CLIENTSESSION) client = 1;

Sint32 sock=(Sint32)(entry->get_sock());

_session_dispatch(entry);

if(client)

{

HTTPConnection2 *cn = monitor_2::remove_connection(sock);

if(cn) delete cn;

// stop();

_die=1;

}

else {

Line 1006

Line 1461

void* accept_parm,

void* dispatch_parm)

{

Sint32 fd1,fd2;

fd2=(Sint32) ps;

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

// The purpose of the following piece of code is to avoid duplicate entries in

// the _listeners list. Would it be too much of an overhead ?

try {

monitor_2_entry* temp;

_listeners.lock(pegasus_thread_self());

temp = _listeners.next(0);

while(temp != 0 )

{

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

if(fd1 == fd2)

{

Tracer::trace(TRC_HTTP, Tracer::LEVEL3,

"monitor_2::add_entry:Request for duplicate entry in _listeners for %d FD.", fd1);

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

{

temp->set_state(IDLE);

Tracer::trace(TRC_HTTP, Tracer::LEVEL3,

"monitor_2::add_entry:CLOSED state changed to IDLE for %d.", fd1);

}

_listeners.unlock();

delete m2e;

return 0;

}

temp = _listeners.next(temp);

}

catch(...)

{

delete m2e;

return 0;

}

_listeners.unlock();

try{

_listeners.insert_first(m2e);

}

Line 1015

Line 1514

delete m2e;

return 0;

}

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

"monitor_2::add_entry:SUCCESSFULLY added to _listeners list. FD = %d.", fd2);

tickle();

return m2e;

}

Legend:

Removed from v.1.70
changed lines
	Added in v.1.82

No CVS admin address has been configured