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.7 and 1.18

version 1.7, 2007/01/11 16:21:54

version 1.18, 2008/12/02 09:00:53

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 40

Line 38

#if defined(PEGASUS_OS_TYPE_WINDOWS)

# include <sys/timeb.h>

#endif

#if defined(PEGASUS_OS_ZOS)

# include <unistd.h>

#endif

#if defined(PEGASUS_OS_SOLARIS)

# include <unistd.h>

#endif

PEGASUS_NAMESPACE_BEGIN

Line 47

Line 52

{

#if defined(PEGASUS_HAVE_NANOSLEEP)

struct timespec wait;

struct timespec wait, remwait;

wait.tv_sec = msec / 1000;

wait.tv_nsec = (msec % 1000) * 1000000;

nanosleep(&wait, NULL);

#elif defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM)

int loop;

while ((nanosleep(&wait, &remwait) == -1) && (errno == EINTR))

int microsecs = msec * 1000; /* convert from milliseconds to microseconds */

if (microsecs < 1000000)

usleep(microsecs);

else

{

loop = microsecs / 1000000;

wait.tv_sec = remwait.tv_sec;

for (int i = 0; i < loop; i++)

wait.tv_nsec = remwait.tv_nsec;

usleep(1000000);

if ((loop*1000000) < microsecs)

usleep(microsecs - (loop*1000000));

}

#elif defined(PEGASUS_OS_TYPE_WINDOWS)

Line 89

Line 83

}

while (end.millitm > now.millitm && end.time >= now.time);

#elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

#else

int seconds;

if (msec < 1000)

{

usleep(msec*1000);

Line 102

Line 95

// Usleep the remaining micro seconds

usleep( (msec*1000) % 1000000 );

}

#elif defined(PEGASUS_OS_VMS)

::sleep(msec / 1000);

#endif

}

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

// Thread id TSD:

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

static Once _once = PEGASUS_ONCE_INITIALIZER;

static TSDKeyType _key;

static void _create_key()

{

TSDKey::create(&_key);

}

static inline void _set_id_tsd(Uint32 id)

{

once(&_once, _create_key);

TSDKey::set_thread_specific(_key, (void*)(long)id);

}

static inline Uint32 _get_id_tsd()

{

once(&_once, _create_key);

void* ptr = TSDKey::get_thread_specific(_key);

if (!ptr)

{

// Main thread's id is 1!

return 1;

}

return (Uint32)(long)ptr;

}

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

// _get_stack_multiplier()

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

Line 190

Line 146

}

return _multiplier;

#else

#elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)

return 2;

#elif defined(PEGASUS_OS_AIX)

return 2;

#else

return 1;

#endif

}

Line 218

Line 178

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 228

Line 188

// Stack size:

#if defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC) || defined(PEGASUS_OS_VMS)

int multiplier = _get_stack_multiplier();

if (multiplier != 1)

{

size_t stacksize;

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

{

int m = _get_stack_multiplier();

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

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

PEGASUS_ASSERT(rc == 0);

}

#endif

// Scheduling policy:

#if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_GNU) || \

#if defined(PEGASUS_OS_SOLARIS)

defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)

# if defined SUNOS_5_7

pthread_attr_setschedpolicy(&attr, SCHED_RR);

# else

pthread_attr_setschedpolicy(&attr, SCHED_OTHER);

# endif

#endif // PEGASUS_PLATFORM_SOLARIS_SPARC_GNU

#endif /* defined(PEGASUS_OS_SOLARIS) */

// Create thread:

Legend:

Removed from v.1.7
changed lines
	Added in v.1.18

No CVS admin address has been configured