pegasus/src/Pegasus/Common/HTTPAcceptor.cpp - diff

Return to HTTPAcceptor.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/HTTPAcceptor.cpp between version 1.93.4.4 and 1.106.2.7

version 1.93.4.4, 2008/01/02 21:05:03

version 1.106.2.7, 2008/01/30 11:59:01

Line 44

#include "Tracer.h"

#include <Pegasus/Common/MessageLoader.h>

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#ifdef PEGASUS_OS_PASE

#include "EBCDIC_OS400.h"

# include <as400_protos.h>

# include <Pegasus/Common/PaseCcsid.h>

#endif

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

static int MAX_CONNECTION_QUEUE_LENGTH = -1;

static int _maxConnectionQueueLength = -1;

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

Line 137

Socket::initializeInterface();

Platforms interpret the value of MAX_CONNECTION_QUEUE_LENGTH

Platforms interpret the value of _maxConnectionQueueLength

differently. Some platforms interpret the value literally, while

others multiply a fudge factor. When the server is under stress from

multiple clients with multiple requests, toggling this number may

Line 145

value, we allow an environment variable to be set which specifies a

number greater than the maximum concurrent client connections

possible. If this environment var is not specified, then

MAX_CONNECTION_QUEUE_LENGTH = 15.

_maxConnectionQueueLength = 15.

//To engage runtime backlog queue length: uncomment the following block AND

//comment out the line MAX_CONNECTION_QUEUE_LENGTH = 15

//comment out the line _maxConnectionQueueLength = 15

if (MAX_CONNECTION_QUEUE_LENGTH == -1)

if (_maxConnectionQueueLength == -1)

{

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(37)

const char* env = getenv("PEGASUS_MAX_BACKLOG_CONNECTION_QUEUE");

EtoA(env);

#pragma convert(0)

#else

const char* env = getenv("PEGASUS_MAX_BACKLOG_CONNECTION_QUEUE");

#endif

if (!env)

{

MAX_CONNECTION_QUEUE_LENGTH = 15;

_maxConnectionQueueLength = 15;

}

else

{

char* end = NULL;

MAX_CONNECTION_QUEUE_LENGTH = strtol(env, &end, 10);

_maxConnectionQueueLength = strtol(env, &end, 10);

if (*end)

MAX_CONNECTION_QUEUE_LENGTH = 15;

_maxConnectionQueueLength = 15;

cout << " MAX_CONNECTION_QUEUE_LENGTH = " <<

cout << " _maxConnectionQueueLength = " <<

MAX_CONNECTION_QUEUE_LENGTH << endl;

_maxConnectionQueueLength << endl;

}

MAX_CONNECTION_QUEUE_LENGTH = 15;

#ifdef PEGASUS_WMIMAPPER

//The WMI Mapper can be used as a proxy to multiple WMI Servers.

//If a client application simultaneously initiates connections

//to many Windows systems, many of these connections may be routed

//to a single WMI Mapper. A larger _maxConnectionQueueLength

//value is required to allow these connections to be initiated

//successfully.

_maxConnectionQueueLength = 40;

#else

_maxConnectionQueueLength = 15;

#endif

}

HTTPAcceptor::~HTTPAcceptor()

Line 292

Line 295

void HTTPAcceptor::_bind()

{

#ifdef PEGASUS_OS_PASE

// bind need ccsid is 819

int orig_ccsid;

orig_ccsid = _SETCCSID(-1);

if (orig_ccsid == -1)

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

String("HTTPAcceptor::_bind: Can not get current PASE CCSID."));

orig_ccsid = 1208;

}

PaseCcsid ccsid(819, orig_ccsid);

#endif

PEGASUS_ASSERT(_rep != 0);

// Create address:

memset(_rep->address, 0, _rep->address_size);

Line 299

Line 315

if (_connectionType == LOCAL_CONNECTION)

{

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

// Make sure the local domain socket can be owned by the cimserver

// user. Otherwise, the bind may fail with a vague "bind failed"

// error.

if (System::exists(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH))

{

if (!System::removeFile(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH))

{

throw CannotRemoveFile(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH);

}

reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_family =

AF_UNIX;

strcpy(reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path,

PEGASUS_LOCAL_DOMAIN_SOCKET_PATH);

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

AtoE(reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);

#endif

::unlink(

reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);

#else

PEGASUS_ASSERT(false);

#endif

Line 473

Line 497

// Set up listening on the given socket:

//int const MAX_CONNECTION_QUEUE_LENGTH = 15;

//int const _maxConnectionQueueLength = 15;

if (listen(_rep->socket, MAX_CONNECTION_QUEUE_LENGTH) < 0)

if (listen(_rep->socket, _maxConnectionQueueLength) < 0)

{

Socket::close(_rep->socket);

delete _rep;

Line 603

Line 627

if (_rep)

{

AutoMutex autoMut(_rep->_connection_mut);

if (_rep->connections.size() > 0)

for (Uint32 i = 0, n = _rep->connections.size(); i < n; i++)

{

HTTPConnection* connection = _rep->connections[i];

if (connection->isResponsePending())

{

HTTPConnection* connection = _rep->connections[0];

count++;

count = connection->getRequestCount();

}

return count;

Line 754

Line 781

"HTTPAcceptor: accept() failed");

return;

}

#ifndef PEGASUS_OS_TYPE_WINDOWS

// We need to ensure that the socket number is not higher than

// what fits into FD_SETSIZE, because we else won't be able to select on it

// and won't ever communicate correct on that socket.

if (socket >= FD_SETSIZE)

{

// the remote connection is invalid, destroy client address.

delete accept_address;

Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE,

"HTTPAcceptor out of available sockets. "

"Closing connection to the new client.");

PEG_TRACE(

(TRC_DISCARDED_DATA,

Tracer::LEVEL2,

"accept() returned too large socket number %d.",

socket));

// close the connection

Socket::close(socket);

return;

}

#endif

String ipAddress;

Line 766

Line 817

#ifdef PEGASUS_ENABLE_IPV6

char ipBuffer[PEGASUS_INET6_ADDRSTR_LEN];

int rc;

while ((rc = getnameinfo(accept_address, address_size, ipBuffer,

if ((rc = System::getNameInfo(accept_address,

PEGASUS_INET6_ADDRSTR_LEN, 0, 0, NI_NUMERICHOST)) == EAI_AGAIN)

address_size,

;

ipBuffer,

if (rc)

PEGASUS_INET6_ADDRSTR_LEN,

NI_NUMERICHOST)))

{

Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE,

"HTTPAcceptor - getnameinfo() failure. rc: $0", rc);

Line 816

Line 870

PEG_LOGGER_TRACE((Logger::STANDARD_LOG, System::CIMSERVER, 0,

"HTTPAcceptor - accept() success. Socket: $1" ,socket));

AutoPtr<MP_Socket> mp_socket(new MP_Socket(

SharedPtr<MP_Socket> mp_socket(new MP_Socket(

socket, _sslcontext, _sslContextObjectLock));

socket, _sslcontext, _sslContextObjectLock, ipAddress));

mp_socket->disableBlocking();

mp_socket->setSocketWriteTimeout(_socketWriteTimeout);

Legend:

Removed from v.1.93.4.4
changed lines
	Added in v.1.106.2.7

No CVS admin address has been configured