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

Return to Threads.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/Threads.cpp between version 1.13.2.4.2.1 and 1.21

version 1.13.2.4.2.1, 2008/07/01 19:28:03

version 1.21, 2011/01/12 13:30:24

Line 1

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

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

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

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

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

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

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

// License.

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

// EMC Corporation; Symantec Corporation; The Open Group.

// to deal in the Software without restriction, including without limitation

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// Permission is hereby granted, free of charge, to any person obtaining a copy

// and/or sell copies of the Software, and to permit persons to whom the

// of this software and associated documentation files (the "Software"), to

// Software is furnished to do so, subject to the following conditions:

// deal in the Software without restriction, including without limitation the

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// The above copyright notice and this permission notice shall be included

// sell copies of the Software, and to permit persons to whom the Software is

// in all copies or substantial portions of the Software.

// furnished to do so, subject to the following conditions:

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

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

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

Line 44

Line 42

# include <unistd.h>

#endif

#if defined(PEGASUS_OS_ZOS)

# include <unistd.h>

#endif

#if defined(PEGASUS_OS_SOLARIS)

# include <unistd.h>

#endif

PEGASUS_NAMESPACE_BEGIN

namespace

{

//mutex used for synchronising threads calling _get_stack_multiplier

MutexType _multiplier_mutex = PEGASUS_MUTEX_INITIALIZER;

}

void Threads::sleep(int msec)

{

#if defined(PEGASUS_HAVE_NANOSLEEP)

Line 107

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

// _get_stack_multiplier()

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

static inline int _get_stack_multiplier()

{

#if defined(PEGASUS_OS_VMS)

static int _multiplier = 0;

static MutexType _multiplier_mutex = PEGASUS_MUTEX_INITIALIZER;

// This code uses a, 'hidden' (non-documented), VMS only, logical

// name (environment variable), PEGASUS_VMS_THREAD_STACK_MULTIPLIER,

// to allow in the field adjustment of the thread stack size.

// We only check for the logical name once to not have an

// impact on performance.

// Note: This code may have problems in a multithreaded environment

// with the setting of doneOnce to true.

// Current code in Cimserver and the clients do some serial thread

// creations first so this is not a problem now.

if (_multiplier == 0)

{

mutex_lock(&_multiplier_mutex);

if (_multiplier == 0)

{

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

if (env)

_multiplier = atoi(env);

if (_multiplier == 0)

_multiplier = 2;

}

mutex_unlock(&_multiplier_mutex);

}

return _multiplier;

#elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)

return 2;

#else

return 1;

#endif

}

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

// PEGASUS_HAVE_PTHREADS

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

Line 176

Line 122

// Initialize thread attributes:

pthread_attr_t attr;

pthread_attr_init(&attr);

int rc = pthread_attr_init(&attr);

if(rc != 0)

{

return rc;

}

// Detached:

if (type == DETACHED)

{

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

#if defined(PEGASUS_OS_ZOS)

int ds = 1;

pthread_attr_setdetachstate(&attr, &ds);

#else

Line 191

Line 141

}

// Stack size:

rc = pthread_attr_setstacksize(&attr, PEGASUS_INITIAL_THREADSTACK_SIZE);

int multiplier = _get_stack_multiplier();

if (multiplier != 1)

{

size_t stacksize;

if (pthread_attr_getstacksize(&attr, &stacksize) == 0)

{

int rc = pthread_attr_setstacksize(&attr, stacksize * multiplier);

PEGASUS_ASSERT(rc == 0);

}

// Scheduling policy:

Line 215

Line 154

// Create thread:

int rc = pthread_create(&thread.thread, &attr, start, arg);

rc = pthread_create(&thread.thread, &attr, start, arg);

if (rc != 0)

{

thread = ThreadType();

return rc;

}

// Destroy attributes now.

Line 229

Line 167

// Return:

return 0;

return rc;

}

ThreadType Threads::self()

Legend:

Removed from v.1.13.2.4.2.1
changed lines
	Added in v.1.21

No CVS admin address has been configured