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.100 and 1.115.14.1

version 1.100, 2005/12/02 18:25:52

version 1.115.14.1, 2006/11/03 04:52:41

Line 1

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

//%2006////////////////////////////////////////////////////////////////////////

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

Line 8

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

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

// EMC Corporation; Symantec 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 27

Line 29

//==============================================================================

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

// Josephine Eskaline Joyce (jojustin@in.ibm.com) for PEP#101

// Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)

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

#include "Network.h"

#include <Pegasus/Common/Config.h>

#include <cstring>

#include "Monitor.h"

#include "MessageQueue.h"

Line 49

Line 43

#include <Pegasus/Common/MessageQueueService.h>

#include <Pegasus/Common/Exception.h>

#include "ArrayIterator.h"

#include <errno.h>

#ifdef PEGASUS_OS_TYPE_WINDOWS

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

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

// Maximum iterations of Pipe processing in Monitor::run

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

const Uint32 maxIterations = 2;

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

<windows.h>). Find 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."

# endif

# define FD_SETSIZE 1024

# include <windows.h>

#else

# include <sys/types.h>

# include <sys/socket.h>

# include <sys/time.h>

# include <netinet/in.h>

# include <netdb.h>

# include <arpa/inet.h>

#endif

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

static AtomicInt _connections(0);

Mutex Monitor::_cout_mut;

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

#define PIPE_INCREMENT 1

#endif

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

// Monitor

Line 91

Line 73

_tickle_client_socket(-1),

_tickle_server_socket(-1),

_tickle_peer_socket(-1)

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

,_solicitPipeCount(0)

#endif

{

int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;

Socket::initializeInterface();

_entries.reserveCapacity(numberOfMonitorEntriesToAllocate);

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

_entries_pipe.reserveCapacity(numberOfMonitorEntriesToAllocate);

#endif

// setup the tickler

initializeTickler();

Line 107

Line 95

_MonitorEntry entry(0, 0, 0);

_entries.append(entry);

}

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

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

{

_MonitorEntry entry(0, 0, 0);

_entries_pipe.append(entry);

}

#endif

}

Monitor::~Monitor()

{

uninitializeTickler();

Socket::uninitializeInterface();

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

"returning from monitor destructor");

}

void Monitor::uninitializeTickler(){

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

try{

Line 133

Line 135

"Failed to close tickle sockets");

}

Socket::uninitializeInterface();

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

"returning from monitor destructor");

}

void Monitor::initializeTickler(){

Line 146

Line 145

/* setup the tickle server/listener */

// try until the tcpip is restarted

{

// get a socket for the server side

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

if((_tickle_server_socket = Socket::createSocket(PF_INET, SOCK_STREAM, 0)) == PEGASUS_INVALID_SOCKET)

{

//handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_CREATE",

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

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

getSocketError());

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

Line 172

Line 171

_tickle_server_addr.sin_family = PF_INET;

_tickle_server_addr.sin_port = 0;

PEGASUS_SOCKLEN_T _addr_size = sizeof(_tickle_server_addr);

SocketLength _addr_size = sizeof(_tickle_server_addr);

// bind server side to socket

if((::bind(_tickle_server_socket,

reinterpret_cast<struct sockaddr*>(&_tickle_server_addr),

sizeof(_tickle_server_addr))) < 0){

sizeof(_tickle_server_addr))) < 0)

{

// handle error

#ifdef PEGASUS_OS_ZOS

MessageLoaderParms parms("Common.Monitor.TICKLE_BIND_LONG",

"Received error:$0 while binding the internal socket.",strerror(errno));

"Received error:$0 while binding the internal socket."

,strerror(errno));

#else

MessageLoaderParms parms("Common.Monitor.TICKLE_BIND",

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

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

getSocketError());

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// tell the kernel we are a server

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

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)

getSocketError());

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

Line 211

Line 205

int sock = ::getsockname(_tickle_server_socket,

reinterpret_cast<struct sockaddr*>(&_tickle_server_addr),

&_addr_size);

if(sock < 0){

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)

getSocketError());

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)) == PEGASUS_INVALID_SOCKET){

if((_tickle_client_socket = Socket::createSocket(PF_INET, SOCK_STREAM, 0))

== PEGASUS_INVALID_SOCKET)

{

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

getSocketError());

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

Line 253

Line 242

// bind socket to client side

if((::bind(_tickle_client_socket,

reinterpret_cast<struct sockaddr*>(&_tickle_client_addr),

sizeof(_tickle_client_addr))) < 0){

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)

getSocketError());

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

// connect to server side

if((::connect(_tickle_client_socket,

reinterpret_cast<struct sockaddr*>(&_tickle_server_addr),

sizeof(_tickle_server_addr))) < 0){

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)

getSocketError());

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

}

/* set up the slave connection */

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

PEGASUS_SOCKLEN_T peer_size = sizeof(_tickle_peer_addr);

SocketLength peer_size = sizeof(_tickle_peer_addr);

pegasus_sleep(1);

Threads::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,

reinterpret_cast<struct sockaddr*>(&_tickle_peer_addr),

&peer_size)) < 0){

&peer_size)) < 0)

{

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

// Only retry on non-windows platforms.

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

if(_tickle_peer_socket == PEGASUS_SOCKET_ERROR

&& getSocketError() == PEGASUS_NETWORK_TRYAGAIN)

{

int retries = 0;

{

pegasus_sleep(1);

Threads::sleep(1);

_tickle_peer_socket = ::accept(_tickle_server_socket,

reinterpret_cast<struct sockaddr*>(&_tickle_peer_addr),

&peer_size);

retries++;

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

} while(_tickle_peer_socket == PEGASUS_SOCKET_ERROR

&& getSocketError() == PEGASUS_NETWORK_TRYAGAIN

&& retries < 20);

}

// TCP/IP is down, destroy sockets and retry again.

if(_tickle_peer_socket == PEGASUS_SOCKET_ERROR &&

getSocketError() == PEGASUS_NETWORK_TCPIP_STOPPED )

{

// destroy everything

uninitializeTickler();

// retry again.

continue;

}

#endif

}

if(_tickle_peer_socket == -1){

if(_tickle_peer_socket == PEGASUS_SOCKET_ERROR)

{

// handle error

MessageLoaderParms parms("Common.Monitor.TICKLE_ACCEPT",

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

#if !defined(PEGASUS_OS_TYPE_WINDOWS)

getSocketError());

errno);

#else

WSAGetLastError());

#endif

throw Exception(parms);

} else

{

// socket is ok

break;

}

} while(1); // try until TCP/IP is restarted

Socket::disableBlocking(_tickle_peer_socket);

Socket::disableBlocking(_tickle_client_socket);

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

// is the tickler initalized as first socket on startup ?

if (_entries.size()==0)

{

// if yes, append a new entry

_entries.append(entry);

}

else

{

// if not, overwrite the tickler entry with new socket

_entries[0]=entry;

}

void Monitor::tickle(void)

{

Line 331

Line 346

};

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 )

Line 342

Line 355

_entries[index]._status = status;

}

Boolean Monitor::run(Uint32 milliseconds)

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

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

{

// Set the state to requested state

_entries_pipe[index]._status = status;

}

int Monitor::handlePipe()

{

AutoMutex autoEntryMutex(_entry_mut);

ArrayIterator<_MonitorEntry> entries(_entries_pipe);

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

if (_stopConnections.get() == 1)

{

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

{

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

{

if ( entries[indx]._status.get() != _MonitorEntry::EMPTY)

{

if ( entries[indx]._status.get() == _MonitorEntry::IDLE ||

entries[indx]._status.get() == _MonitorEntry::DYING )

{

// remove the entry

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

}

else

{

// set status to DYING

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

}

_stopConnections = 0;

_stopConnectionsSem.signal();

}

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

{

const _MonitorEntry &entry = entries[indx];

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

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

{

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

PEGASUS_ASSERT(q != 0);

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

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, NamedPipe=%d\n",

(void *)&h, h.getNamedPipe().getPipe());

continue;

}

h._connectionClosePending = false;

MessageQueue &o = h.get_owner();

Message* message = 0;

message= new CloseConnectionMessage(entry.namedPipe);

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

// After enqueue a message and the autoEntryMutex has been released and locked again,

// the array of _entries can be changed. The ArrayIterator has be reset with the original _entries.

entries.reset(_entries_pipe);

}

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.

SocketHandle maxSocketCurrentPass = 0;

int indx = 0;

Array <Uint32> indexPipeCountAssociator;

int pipeEntryCount=0;

int MaxPipes = PIPE_INCREMENT;

// List of Pipe Handlers

HANDLE * hPipeList = new HANDLE[PIPE_INCREMENT];

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

{

if (!entries[indx].namedPipeConnection)

continue;

entries[indx].pipeSet = false;

if (pipeEntryCount >= MaxPipes)

{

MaxPipes += PIPE_INCREMENT;

HANDLE* temp_pList = new HANDLE[MaxPipes];

for (Uint32 i =0;i<pipeEntryCount;i++)

{

temp_pList[i] = hPipeList[i];

}

delete [] hPipeList;

hPipeList = temp_pList;

}

hPipeList[pipeEntryCount] = entries[indx].namedPipe.getPipe();

indexPipeCountAssociator.append(indx);

pipeEntryCount++;

}

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

descriptors starting at 0.

maxSocketCurrentPass++;

int pEvents = -1;

int pCount = -1;

BOOL bPeekPipe = 0;

DWORD dwBytesAvail=0;

// The pipe is sniffed and check if there are any data. If available, the

// message is picked from the Queue and appropriate methods are invoked.

// pipeProcessCount records the number of requests that are processed.

// At the end of loop this is verified against the count of request

// on local connection . If there are any pipes which needs to be

// processed we would apply delay and then proceed to iterate.

Uint32 pipeProcessCount =0;

_entry_mut.unlock();

// pipeIndex is used to index into indexPipeCountAssociator to fetch

// index of the _MonitorEntry of Monitor

for (int pipeIndex = 0; pipeIndex < pipeEntryCount; pipeIndex++)

{

dwBytesAvail = 0;

bPeekPipe = ::PeekNamedPipe(hPipeList[pipeIndex],

NULL,

&dwBytesAvail,

NULL

);

// If peek on NamedPipe was successfull and data is available

if (bPeekPipe && dwBytesAvail)

{

// Tracer::trace(TRC_HTTP,Tracer::LEVEL4," PIPE_PEEKING FOUND = %u BYTES", dwBytesAvail);

pEvents = 1;

Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "EVENT TRIGGERED in Pipe = %u ",entries[indexPipeCountAssociator[pipeIndex]].namedPipe.getPipe());

entries[indexPipeCountAssociator[pipeIndex]].pipeSet = true;

int pIndx = indexPipeCountAssociator[pipeIndex];

if ((entries[pIndx]._status.get() == _MonitorEntry::IDLE) &&

entries[pIndx].namedPipe.isConnected() &&

(pEvents))

{

MessageQueue *q = 0;

try

{

q = MessageQueue::lookup (entries[pIndx].queueId);

}

catch (Exception e)

{

e.getMessage();

}

catch(...)

{

}

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

"Monitor::run indx = %d, queueId = %d,\

q = %p",pIndx, entries[pIndx].queueId, q);

try

{

if (entries[pIndx]._type == Monitor::CONNECTION)

{

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

"entries[indx].type for indx = \

%d is Monitor::CONNECTION",

pIndx);

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

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

// Record that the requested data is read/Written

pipeProcessCount++;

}

catch (...)

{

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

"Monitor::_dispatch: \

exception received");

}

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

"Monitor::_dispatch: exited \

\run() index %d",

dst->_entry_index);

}

else

{

/* The condition

entries[indx]._type == Monitor::INTERNAL can be

ignored for pipes as the tickler is of

Monitor::INTERNAL type. The tickler is

a socket.

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

"Non-connection entry, indx = %d,\

has been received.", pIndx);

int events = 0;

Message *msg = 0;

pEvents |= NamedPipeMessage::READ;

msg = new NamedPipeMessage(entries[pIndx].namedPipe, pEvents);

entries[pIndx]._status = _MonitorEntry::BUSY;

q->enqueue(msg);

_entry_mut.lock();

entries.reset(_entries_pipe);

entries[pIndx]._status = _MonitorEntry::IDLE;

delete [] hPipeList;

return 1;

}

catch(...)

{

}

_entry_mut.lock();

}

delete [] hPipeList;

//If no request received on pipe rest for 4 seconds and give chance to Socket Thread

if (!pipeProcessCount)

{

Sleep(4000);

}

return 1;

}

#endif

void Monitor::run(Uint32 milliseconds)

{

Boolean handled_events = false;

int i = 0;

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

Line 429

Line 746

// unlocked will not result in an ArrayIndexOutOfBounds

// exception.

autoEntryMutex.unlock();

_entry_mut.unlock();

o.enqueue(message);

autoEntryMutex.lock();

_entry_mut.lock();

// After enqueue a message and the autoEntryMutex has been released and locked again,

// the array of _entries can be changed. The ArrayIterator has be reset with the original _entries.

entries.reset(_entries);

}

Line 443

Line 763

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

because we have to traverse the entire array.

PEGASUS_SOCKET maxSocketCurrentPass = 0;

SocketHandle maxSocketCurrentPass = 0;

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

{

if(maxSocketCurrentPass < entries[indx].socket)

Line 462

Line 782

maxSocketCurrentPass++;

autoEntryMutex.unlock();

_entry_mut.unlock();

// The first argument to select() is ignored on Windows and it is not

Line 474

Line 794

#else

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

#endif

autoEntryMutex.lock();

_entry_mut.lock();

// After enqueue a message and the autoEntryMutex has been released and locked again,

// the array of _entries can be changed. The ArrayIterator has be reset with the original _entries

entries.reset(_entries);

#ifdef PEGASUS_OS_TYPE_WINDOWS

if (events == PEGASUS_SOCKET_ERROR)

if(events == SOCKET_ERROR)

#else

if(events == -1)

#endif

{

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

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

Line 576

Line 895

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

if(amt == PEGASUS_SOCKET_ERROR &&

getSocketError() == PEGASUS_NETWORK_TCPIP_STOPPED )

{

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

"Monitor::run: Tickler socket got an IO error. "

"Going to re-create Socket and wait for TCP/IP restart.");

uninitializeTickler();

initializeTickler();

} else

{

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

}

else

{

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

Line 589

Line 920

events |= SocketMessage::READ;

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

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

autoEntryMutex.unlock();

_entry_mut.unlock();

q->enqueue(msg);

autoEntryMutex.lock();

_entry_mut.lock();

// After enqueue a message and the autoEntryMutex has been released and locked again,

// the array of entries can be changed. The ArrayIterator has be reset with the original _entries

entries.reset(_entries);

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

return true;

}

catch(...)

{

}

handled_events = true;

}

return(handled_events);

}

void Monitor::stopListeningForConnections(Boolean wait)

Line 620

Line 949

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

{

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

}

int Monitor::solicitSocketMessages(

PEGASUS_SOCKET socket,

SocketHandle socket,

Uint32 events,

Uint32 queueId,

int type)

Line 680

Line 1002

}

void Monitor::unsolicitSocketMessages(PEGASUS_SOCKET socket)

void Monitor::unsolicitSocketMessages(SocketHandle socket)

{

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

Line 718

Line 1040

}

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

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm)

ThreadReturnType PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm)

{

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

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

Line 752

Line 1074

}

return 0;

}

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

//This method is anlogus to solicitSocketMessages. It does the same thing for named Pipes

int Monitor::solicitPipeMessages(

NamedPipe namedPipe,

Uint32 events, //not sure what has to change for this enum

Uint32 queueId,

int type)

{

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

AutoMutex autoMut(_entry_pipe_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

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "In Monitor::solicitPipeMessages at the begining" << PEGASUS_STD(endl);

}

#endif

_solicitPipeCount++; // bump the count

int size = (int)_entries_pipe.size();

if((int)_solicitPipeCount >= (size-1)){

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

_MonitorEntry entry(0, 0, 0);

_entries_pipe.append(entry);

}

int index;

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

{

try

{

if(_entries_pipe[index]._status.get() == _MonitorEntry::EMPTY)

{

_entries_pipe[index].socket = NULL;

_entries_pipe[index].namedPipe = namedPipe;

_entries_pipe[index].namedPipeConnection = true;

_entries_pipe[index].queueId = queueId;

_entries_pipe[index]._type = type;

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

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "In Monitor::solicitPipeMessages after seting up _entries[index] index = " << index << PEGASUS_STD(endl);

}

#endif

return index;

}

catch(...)

{

}

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

PEGASUS_STD(cout) << "In Monitor::solicitPipeMessages nothing happed - it didn't work" << PEGASUS_STD(endl);

PEG_METHOD_EXIT();

return -1;

}

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

// Method Name : unsolicitPipeMessages

// Input Parameter : namedPipe - type NamedPipe

// Return Type : void

//============================================================================

// This method is invoked from HTTPAcceptor::handleEnqueue for server

// when the CLOSE_CONNECTION_MESSAGE is recieved. This method is also invoked

// from HTTPAcceptor::destroyConnections method when the CIMServer is shutdown.

// For the CIMClient, this is invoked from HTTPConnector::handleEnqueue when the

// CLOSE_CONNECTION_MESSAGE is recieved. This method is also invoked from

// HTTPConnector::disconnect when CIMClient requests a disconnect request.

// The list of _MonitorEntry is searched for the matching pipe.

// The Handle of the identified is closed and _MonitorEntry for the

// requested pipe is removed.

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

void Monitor::unsolicitPipeMessages(NamedPipe namedPipe)

{

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "Entering: Monitor::unsolicitPipeMessages(): (tid:" << Uint32(pegasus_thread_self()) << ")" << PEGASUS_STD(endl);

}

#endif

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

AutoMutex autoMut(_entry_pipe_mut);

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

to be EMPTY;

unsigned int index;

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

{

if (_entries_pipe[index].namedPipe.getPipe() == namedPipe.getPipe())

{

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

// Ensure that the client has read the data

::FlushFileBuffers (namedPipe.getPipe());

//Disconnect to release the pipe. This doesn't release Pipe Handle

::DisconnectNamedPipe (_entries_pipe[index].namedPipe.getPipe());

// Must use CloseHandle to Close Pipe

::CloseHandle(_entries_pipe[index].namedPipe.getPipe());

_entries_pipe[index].namedPipe.disconnect();

_solicitPipeCount--;

break;

}

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_pipe.size() - 1;

while (_entries_pipe[index]._status.get() == _MonitorEntry::EMPTY

&& index > 0)

{

if ((_entries_pipe[index].namedPipe.getPipe() == namedPipe.getPipe()) ||

(_entries_pipe.size() > MAX_NUMBER_OF_MONITOR_ENTRIES))

{

_entries_pipe.remove(index);

}

index--;

}

PEG_METHOD_EXIT();

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "Exiting: Monitor::unsolicitPipeMessages(): (tid:" << Uint32(pegasus_thread_self()) << ")" << PEGASUS_STD(endl);

}

#endif

}

#endif

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.100
changed lines
	Added in v.1.115.14.1

No CVS admin address has been configured