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

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

version 1.110, 2006/06/28 20:58:18

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 38

Line 40

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

#include "Network.h"

#include <Pegasus/Common/Config.h>

#include <cstring>

#include "Monitor.h"

#include "MessageQueue.h"

Line 50

Line 52

#include <Pegasus/Common/Exception.h>

#include "ArrayIterator.h"

#ifdef PEGASUS_OS_TYPE_WINDOWS

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

Line 152

Line 133

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

}

// set TCP_NODELAY

int opt = 1;

setsockopt(_tickle_server_socket, IPPROTO_TCP, TCP_NODELAY, (char*)&opt, sizeof(opt));

// initialize the address

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

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

Line 172

Line 153

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

Line 185

Line 166

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

}

Line 199

Line 176

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

Line 188

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

}

Line 230

Line 199

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

}

// set TCP_NODELAY

setsockopt(_tickle_client_socket, IPPROTO_TCP, TCP_NODELAY, (char*)&opt, sizeof(opt));

// setup the address of the client

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

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

Line 257

Line 225

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

}

Line 272

Line 236

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

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

Line 309

Line 269

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

}

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

Line 432

Line 388

autoEntryMutex.unlock();

o.enqueue(message);

autoEntryMutex.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 402

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 475

Line 434

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

#endif

autoEntryMutex.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 592

Line 550

autoEntryMutex.unlock();

q->enqueue(msg);

autoEntryMutex.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;

Line 620

Line 581

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

Line 636

Line 589

int Monitor::solicitSocketMessages(

PEGASUS_SOCKET socket,

SocketHandle socket,

Uint32 events,

Uint32 queueId,

int type)

Line 680

Line 633

}

void Monitor::unsolicitSocketMessages(PEGASUS_SOCKET socket)

void Monitor::unsolicitSocketMessages(SocketHandle socket)

{

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

Legend:

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

No CVS admin address has been configured