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

Return to Thread.cpp CVS log

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

Diff for /pegasus/src/Pegasus/Common/Thread.cpp between version 1.107 and 1.112

version 1.107, 2008/09/16 18:37:03

version 1.112, 2008/12/16 18:56:00

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 80

Line 78

void Thread::thread_switch()

{

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

#if defined(PEGASUS_OS_ZOS)

pthread_yield(NULL);

#else

sched_yield();

Line 103

Line 101

void Thread::detach()

{

_is_detached = true;

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

#if defined(PEGASUS_OS_ZOS)

pthread_t thread_id=_handle.thid.thread;

pthread_detach(&thread_id);

#else

Line 150

Line 148

: _is_detached(detached),

_start(start),

_cleanup(),

_tsd(),

_thread_parm(parameter),

_exit_code(0)

{

Threads::clear(_handle.thid);

memset(_tsd, 0, sizeof(_tsd));

}

Thread::~Thread()

Line 261

Line 259

_is_detached = true;

}

Thread::Thread(ThreadReturnType(PEGASUS_THREAD_CDECL * start) (void *),

Thread::Thread(

ThreadReturnType(PEGASUS_THREAD_CDECL* start)(void*),

void *parameter,

Boolean detached):_is_detached(detached),

_cancelled(false),

_start(start), _cleanup(), _tsd(), _thread_parm(parameter), _exit_code(0)

_start(start),

_cleanup(),

_thread_parm(parameter),

_exit_code(0)

{

Threads::clear(_handle.thid);

memset(_tsd, 0, sizeof(_tsd));

}

Thread::~Thread()

Line 290

Line 293

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

void thread_data::default_delete(void *data)

{

if (data != NULL)

::operator delete(data);

}

void language_delete(void *data)

{

if (data != NULL)

Line 434

Line 431

if (curThrd == NULL)

return NULL;

AcceptLanguageList *acceptLangs =

(AcceptLanguageList *) curThrd->reference_tsd("acceptLanguages");

(AcceptLanguageList *) curThrd->reference_tsd(TSD_ACCEPT_LANGUAGES);

curThrd->dereference_tsd();

PEG_METHOD_EXIT();

return acceptLangs;

Line 451

Line 448

// deletes the old tsd and creates a new one

currentThrd->put_tsd(

"acceptLanguages",

TSD_ACCEPT_LANGUAGES,

language_delete,

sizeof (AcceptLanguageList *),

langsCopy.get());

Line 470

Line 467

if (currentThrd != NULL)

{

// deletes the old tsd

currentThrd->delete_tsd("acceptLanguages");

currentThrd->delete_tsd(TSD_ACCEPT_LANGUAGES);

}

PEG_METHOD_EXIT();

Legend:

Removed from v.1.107
changed lines
	Added in v.1.112

No CVS admin address has been configured