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

version 1.52, 2003/10/01 00:14:57

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 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), _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 107

Line 112

Monitor::Monitor(Boolean 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 213

Line 182

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

Line 224

Line 222

}

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

Line 250

Line 259

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)

Line 272

Line 277

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

{

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

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

"Monitor::run processing dying value > 0 for indx = %d, connection being closed.",

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

indx);

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

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

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

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

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

{

Line 371

Line 372

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

{

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

_entries[index].socket = -1;

break;

}

Line 382

Line 384

{

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

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

"Monitor::_dispatch: entering run() for index = %d",

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

dst->_entry_index);

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

try

{

dst->run(1);

Line 396

Line 398

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

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

dst->_monitor->_entry_mut.lock(pegasus_thread_self());

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

// It shouldn't be necessary to set status = _MonitorEntry::IDLE

// if the connection is being closed. However, the current logic

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

// in Monitor::run requires this value to be set for the close

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

// to be processed.

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

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

// or the entry in the _entries table.

if (dst->_connectionClosePending)

{

dst->_dying = 1;

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

}

else

{

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

}

dst->_monitor->_entry_mut.unlock();

return 0;

}

Line 421

Line 426

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

m2e_rep::m2e_rep(void)

:Base(), state(IDLE)

Line 508

Line 516

monitor_2_entry::~monitor_2_entry(void)

{

Dec(_rep);

}

Line 589

Line 598

}

//static monitor_2* _m2_instance;

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)

Line 610

Line 619

#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 646

Line 661

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

Line 657

Line 673

monitor_2::~monitor_2(void)

{

stop();

try {

monitor_2_entry* temp = _listeners.remove_first();

while(temp){

Line 664

Line 683

temp = _listeners.remove_first();

}

catch(...){ }

try

{

HTTPConnection2* temp = _connections.remove_first();

while(temp)

{

delete temp;

temp = _connections.remove_first();

}

catch(...)

{

}

Line 673

Line 709

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 685

Line 721

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;

Line 704

Line 741

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

Line 733

Line 778

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)(monitor_2_entry*))

Line 749

Line 857

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

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

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

{

monitor_2_entry* entry;

if(_ready.count() == 0 )

return;

try

{

Line 780

Line 915

entry->get_sock().disableBlocking();

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

entry->get_sock().enableBlocking();

delete entry;

break;

case LISTEN:

{

Line 787

Line 924

static PEGASUS_SOCKLEN_SIZE peer_size = sizeof(peer);

entry->get_sock().disableBlocking();

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 )

{

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

_session_dispatch(entry);

}

else {

static char buffer[4096];

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

delete entry;

}

break;

case UNTYPED:

default:

delete entry;

break;

}

_requestCount--;

delete entry;

if(_ready.count() == 0 )

break;

Line 827

Line 981

{

_die = 1;

tickle();

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

_tickler.get_sock().close();

_listeners.shutdown_queue();

Line 840

Line 993

'0','0'

};

_tickler.get_sock().disableBlocking();

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

_tickler.get_sock().enableBlocking();

}

Legend:

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

No CVS admin address has been configured