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.71.2.6 and 1.87.4.1

version 1.71.2.6, 2005/08/16 17:30:51

version 1.87.4.1, 2006/01/18 17:37:56

Line 1

//%2004////////////////////////////////////////////////////////////////////////

//%2005////////////////////////////////////////////////////////////////////////

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

Line 6

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

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

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

Line 31

Line 33

// added nsk platform support

// Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)

// Amit K Arora, IBM (amita@in.ibm.com) for PEP#101

// Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)

// David Dillard, VERITAS Software Corp.

// (david.dillard@veritas.com)

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

Line 45

Line 50

# include "ThreadUnix.cpp"

#elif defined(PEGASUS_OS_TYPE_NSK)

# include "ThreadNsk.cpp"

#elif defined(PEGASUS_OS_VMS)

# include "ThreadVms.cpp"

#else

# error "Unsupported platform"

#endif

Line 64

Line 71

{

if( data != NULL)

{

AutoPtr<AcceptLanguages> al(static_cast<AcceptLanguages *>(data));

AutoPtr<AcceptLanguageList> al(static_cast<AcceptLanguageList *>(data));

}

// l10n end

Line 72

Line 79

Boolean Thread::_signals_blocked = false;

// l10n

#ifndef PEGASUS_OS_ZOS

PEGASUS_THREAD_KEY_TYPE Thread::_platform_thread_key =

PEGASUS_THREAD_KEY_TYPE Thread::_platform_thread_key = PEGASUS_THREAD_KEY_TYPE(-1);

PEGASUS_THREAD_KEY_TYPE(-1);

#else

PEGASUS_THREAD_KEY_TYPE Thread::_platform_thread_key;

#endif

Line 81

Line 87

Boolean Thread::_key_error = false;

void Thread::cleanup_push( void (*routine)(void *), void *parm) throw(IPCException)

void Thread::cleanup_push( void (*routine)(void *), void *parm)

{

AutoPtr<cleanup_handler> cu(new cleanup_handler(routine, parm));

_cleanup.insert_first(cu.get());

Line 89

Line 95

return;

}

void Thread::cleanup_pop(Boolean execute) throw(IPCException)

void Thread::cleanup_pop(Boolean execute)

{

AutoPtr<cleanup_handler> cu ;

try

Line 105

Line 111

}

//thread_data *Thread::put_tsd(const Sint8 *key, void (*delete_func)(void *), Uint32 size, void *value) throw(IPCException)

//thread_data *Thread::put_tsd(const Sint8 *key, void (*delete_func)(void *), Uint32 size, void *value)

#ifndef PEGASUS_THREAD_EXIT_NATIVE

Line 180

Line 186

PEG_METHOD_ENTER(TRC_THREAD, "Thread::setCurrent");

if (Thread::initializeKey() == 0)

{

if (pegasus_set_thread_specific(Thread::_platform_thread_key,

if (pegasus_set_thread_specific(

(void *) thrd) == 0)

Thread::_platform_thread_key, (void *) thrd) == 0)

{

Tracer::trace(TRC_THREAD, Tracer::LEVEL4,

"Successful set Thread * into thread specific storage");

Line 189

Line 195

else

{

Tracer::trace(TRC_THREAD, Tracer::LEVEL4,

"ERROR: got error setting Thread * into thread specific storage");

"ERROR: error setting Thread * into thread specific storage");

}

PEG_METHOD_EXIT();

}

AcceptLanguages * Thread::getLanguages()

AcceptLanguageList * Thread::getLanguages()

{

PEG_METHOD_ENTER(TRC_THREAD, "Thread::getLanguages");

Thread * curThrd = Thread::getCurrent();

if (curThrd == NULL)

return NULL;

AcceptLanguages * acceptLangs =

AcceptLanguageList * acceptLangs =

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

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

curThrd->dereference_tsd();

PEG_METHOD_EXIT();

return acceptLangs;

}

void Thread::setLanguages(AcceptLanguages *langs) //l10n

void Thread::setLanguages(AcceptLanguageList *langs) //l10n

{

PEG_METHOD_ENTER(TRC_THREAD, "Thread::setLanguages");

Line 219

Line 225

// deletes the old tsd and creates a new one

currentThrd->put_tsd("acceptLanguages",

language_delete,

sizeof(AcceptLanguages *),

sizeof(AcceptLanguageList *),

langs);

}

Line 241

Line 247

}

// l10n end

#if 0

// two special synchronization classes for ThreadPool

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

// ThreadPool

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

class timed_mutex

ThreadPool::ThreadPool(

{

Sint16 initialSize,

public:

const char* key,

timed_mutex(Mutex* mut, int msec)

Sint16 minThreads,

:_mut(mut)

Sint16 maxThreads,

{

struct timeval& deallocateWait)

_mut->timed_lock(msec, pegasus_thread_self());

: _maxThreads(maxThreads),

}

_minThreads(minThreads),

~timed_mutex(void)

_currentThreads(0),

_idleThreads(true),

_runningThreads(true),

_dying(0)

{

_mut->unlock();

_deallocateWait.tv_sec = deallocateWait.tv_sec;

}

_deallocateWait.tv_usec = deallocateWait.tv_usec;

Mutex* _mut;

};

#endif

class try_mutex

memset(_key, 0x00, 17);

{

if (key != 0)

public:

try_mutex(Mutex* mut)

:_mut(mut)

{

_mut->try_lock(pegasus_thread_self());

}

~try_mutex(void)

{

_mut->unlock();

strncpy(_key, key, 16);

}

Mutex* _mut;

if ((_maxThreads > 0) && (_maxThreads < initialSize))

};

class auto_int

{

public:

auto_int(AtomicInt* num)

: _int(num)

{

_int->operator++();

}

~auto_int(void)

{

_int->operator--();

_maxThreads = initialSize;

}

AtomicInt *_int;

};

if (_minThreads > initialSize)

AtomicInt _idle_control;

DQueue<ThreadPool> ThreadPool::_pools(true);

void ThreadPool::kill_idle_threads(void)

{

static struct timeval now, last = {0, 0};

pegasus_gettimeofday(&now);

if(now.tv_sec - last.tv_sec > 5)

{

_pools.lock();

ThreadPool *p = _pools.next(0);

while(p != 0)

{

try

{

p->kill_dead_threads();

_minThreads = initialSize;

}

catch(...)

{

}

p = _pools.next(p);

}

_pools.unlock();

pegasus_gettimeofday(&last);

}

ThreadPool::ThreadPool(Sint16 initial_size,

const Sint8 *key,

Sint16 min,

Sint16 max,

struct timeval & alloc_wait,

struct timeval & dealloc_wait,

struct timeval & deadlock_detect)

: _max_threads(max), _min_threads(min),

_current_threads(0),

_pool(true), _running(true),

_dead(true), _dying(0)

{

_allocate_wait.tv_sec = alloc_wait.tv_sec;

_allocate_wait.tv_usec = alloc_wait.tv_usec;

_deallocate_wait.tv_sec = dealloc_wait.tv_sec;

_deallocate_wait.tv_usec = dealloc_wait.tv_usec;

_deadlock_detect.tv_sec = deadlock_detect.tv_sec;

_deadlock_detect.tv_usec = deadlock_detect.tv_usec;

memset(_key, 0x00, 17);

if(key != 0)

strncpy(_key, key, 16);

if(_max_threads > 0 && _max_threads < initial_size)

_max_threads = initial_size;

if(_min_threads > initial_size)

_min_threads = initial_size;

int i;

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

for(i = 0; i < initial_size; i++)

{

_link_pool(_init_thread());

_addToIdleThreadsQueue(_initializeThread());

}

_pools.insert_last(this);

}

ThreadPool::~ThreadPool(void)

ThreadPool::~ThreadPool()

{

PEG_METHOD_ENTER(TRC_THREAD, "Thread::~ThreadPool");

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::~ThreadPool");

try

{

// Set the dying flag so all thread know the destructor has been entered

_dying++;

Tracer::trace(TRC_THREAD, Tracer::LEVEL2,

// remove from the global pools list

"Cleaning up %d idle threads. ", _currentThreads.get());

_pools.remove(this);

while (_currentThreads.get() > 0)

while(_current_threads.value() > 0)

{

Thread* thread = _pool.remove_first();

Thread* thread = _idleThreads.remove_first();

if (thread != 0)

{

_cleanupThread(thread);

_current_threads--;

_currentThreads--;

}

else

{

pegasus_yield();

Line 388

Line 321

}

// make this static to the class

PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL ThreadPool::_loop(void *parm)

{

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::_loop");

Thread *myself = (Thread *)parm;

try

if(myself == 0)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

Thread* myself = (Thread *)parm;

"ThreadPool::_loop: Thread pointer is null");

PEGASUS_ASSERT(myself != 0);

PEG_METHOD_EXIT();

throw NullPointer();

}

// l10n

// Set myself into thread specific storage

// This will allow code to get its own Thread

Thread::setCurrent(myself);

ThreadPool *pool = (ThreadPool *)myself->get_parm();

if(pool == 0 )

PEGASUS_ASSERT(pool != 0);

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_loop: ThreadPool pointer is null");

PEG_METHOD_EXIT();

throw NullPointer();

}

Semaphore *sleep_sem = 0;

Semaphore *blocking_sem = 0;

struct timeval* lastActivityTime = 0;

struct timeval *deadlock_timer = 0;

try

{

Line 427

Line 346

myself->dereference_tsd();

PEGASUS_ASSERT(sleep_sem != 0);

deadlock_timer = (struct timeval *)myself->reference_tsd("deadlock timer");

lastActivityTime =

(struct timeval *)myself->reference_tsd("last activity time");

myself->dereference_tsd();

PEGASUS_ASSERT(deadlock_timer != 0);

PEGASUS_ASSERT(lastActivityTime != 0);

}

catch(...)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_loop: Failure getting sleep_sem or deadlock_timer.");

"ThreadPool::_loop: Failure getting sleep_sem or "

"lastActivityTime.");

PEGASUS_ASSERT(false);

pool->_pool.remove(myself);

pool->_idleThreads.remove(myself);

pool->_current_threads--;

pool->_currentThreads--;

PEG_METHOD_EXIT();

return((PEGASUS_THREAD_RETURN)1);

}

Line 453

Line 374

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_loop: failure on sleep_sem->wait().");

PEGASUS_ASSERT(false);

pool->_pool.remove(myself);

pool->_idleThreads.remove(myself);

pool->_current_threads--;

pool->_currentThreads--;

PEG_METHOD_EXIT();

return((PEGASUS_THREAD_RETURN)1);

}

// when we awaken we reside on the running queue, not the pool queue

// When we awaken we reside on the _runningThreads queue, not the

/* Hence no need to move the thread to the _dead queue, as the _running

// _idleThreads queue.

* queue is only dused by kill_dead_threads which makes sure that the

* the threads are cleaned up (unlocking any locked lists in the TSD, etc)

* before killing it.

PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *_work)(void *) = 0;

PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL* work)(void *) = 0;

void *parm = 0;

Semaphore* blocking_sem = 0;

try

{

_work = (PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *)(void *)) \

work = (PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *)(void *))

myself->reference_tsd("work func");

myself->dereference_tsd();

parm = myself->reference_tsd("work parm");

myself->dereference_tsd();

blocking_sem = (Semaphore *)myself->reference_tsd("blocking sem");

myself->dereference_tsd();

}

catch(...)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_loop: Failure accessing work func, work parm, or blocking sem.");

"ThreadPool::_loop: Failure accessing work func, work parm, "

"or blocking sem.");

PEGASUS_ASSERT(false);

pool->_pool.remove(myself);

pool->_idleThreads.remove(myself);

pool->_current_threads--;

pool->_currentThreads--;

PEG_METHOD_EXIT();

return((PEGASUS_THREAD_RETURN)1);

}

if(_work == 0)

if (work == 0)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

Tracer::trace(TRC_THREAD, Tracer::LEVEL4,

"ThreadPool::_loop: work func is 0, meaning we should exit.");

break;

}

gettimeofday(deadlock_timer, NULL);

gettimeofday(lastActivityTime, NULL);

try

{

PEG_TRACE_STRING(TRC_THREAD, Tracer::LEVEL4,

PEG_TRACE_STRING(TRC_THREAD, Tracer::LEVEL4, "Work starting.");

"Worker started");

work(parm);

_work(parm);

PEG_TRACE_STRING(TRC_THREAD, Tracer::LEVEL4, "Work finished.");

PEG_TRACE_STRING(TRC_THREAD, Tracer::LEVEL4,

"Worker finished");

}

catch(Exception & e)

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

String("Exception from _work in ThreadPool::_loop: ") +

String("Exception from work in ThreadPool::_loop: ") +

e.getMessage());

}

#if !defined(PEGASUS_OS_LSB)

catch (exception& e)

catch (const exception& e)

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

String("Exception from _work in ThreadPool::_loop: ") +

String("Exception from work in ThreadPool::_loop: ") +

e.what());

}

#endif

catch(...)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_loop: execution of _work failed.");

"Unknown exception from work in ThreadPool::_loop.");

}

// put myself back onto the available list

try

{

gettimeofday(deadlock_timer, NULL);

gettimeofday(lastActivityTime, NULL);

if( blocking_sem != 0 )

{

blocking_sem->signal();

}

Boolean removed = pool->_running.remove((void *)myself);

Boolean removed = pool->_runningThreads.remove((void *)myself);

PEGASUS_ASSERT(removed);

pool->_pool.insert_first(myself);

pool->_idleThreads.insert_first(myself);

}

catch(...)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_loop: Adding thread to idle pool failed.");

PEGASUS_ASSERT(false);

pool->_current_threads--;

pool->_currentThreads--;

PEG_METHOD_EXIT();

return((PEGASUS_THREAD_RETURN)1);

}

catch (const Exception& e)

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"Caught exception: \"" + e.getMessage() + "\". Exiting _loop.");

}

catch (...)

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"Caught unrecognized exception. Exiting _loop.");

}

PEG_METHOD_EXIT();

return((PEGASUS_THREAD_RETURN)0);

}

ThreadStatus ThreadPool::allocate_and_awaken(void *parm,

ThreadStatus ThreadPool::allocate_and_awaken(

PEGASUS_THREAD_RETURN \

void* parm,

(PEGASUS_THREAD_CDECL *work)(void *),

PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL* work)(void *),

Semaphore *blocking)

{

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::allocate_and_awaken");

Line 571

Line 497

try

{

if (_dying.value())

if (_dying.get())

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::allocate_and_awaken: ThreadPool is dying(1).");

Line 581

Line 507

gettimeofday(&start, NULL);

Thread *th = 0;

th = _pool.remove_first();

th = _idleThreads.remove_first();

if (th == 0)

{

// will throw an IPCException&

if ((_maxThreads == 0) ||

_check_deadlock(&start) ;

(_currentThreads.get() < Uint32(_maxThreads)))

if(_max_threads == 0 || _current_threads < _max_threads)

{

th = _init_thread();

th = _initializeThread();

}

Line 601

Line 525

// necessarily imply that a failure has occurred. However,

// this label is being used temporarily to help isolate

// the cause of client timeout problems.

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::allocate_and_awaken: Insufficient resources: "

" pool = %s, running threads = %d, idle threads = %d, dead threads = %d ",

" pool = %s, running threads = %d, idle threads = %d",

_key, _running.count(), _pool.count(), _dead.count());

_key, _runningThreads.count(), _idleThreads.count());

return PEGASUS_THREAD_INSUFFICIENT_RESOURCES;

}

Line 625

Line 548

th->put_tsd("blocking sem", NULL, sizeof(Semaphore *), blocking);

// put the thread on the running list

_running.insert_first(th);

_runningThreads.insert_first(th);

// signal the thread's sleep semaphore to awaken it

Semaphore *sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");

Line 648

Line 571

}

// caller is responsible for only calling this routine during slack periods

// but should call it at least once per _deadlock_detect with the running q

// but should call it at least once per _deallocateWait interval.

// and at least once per _deallocate_wait for the pool q

Uint32 ThreadPool::kill_dead_threads(void)

Uint32 ThreadPool::cleanupIdleThreads()

throw(IPCException)

{

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::kill_dead_threads");

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::cleanupIdleThreads");

Uint32 numThreadsCleanedUp = 0;

Uint32 numIdleThreads = _pool.count();

Uint32 numIdleThreads = _idleThreads.count();

for (Uint32 i = 0; i < numIdleThreads; i++)

{

// Do not dip below the minimum thread count

if (_current_threads.value() <= (Uint32)_min_threads)

if (_currentThreads.get() <= (Uint32)_minThreads)

{

break;

}

Thread* thread = _pool.remove_last();

Thread* thread = _idleThreads.remove_last();

// If there are no more threads in the _pool queue, we're done.

// If there are no more threads in the _idleThreads queue, we're done.

if (thread == 0)

{

break;

Line 679

Line 600

try

{

lastActivityTime = (struct timeval *)thread->try_reference_tsd(

"deadlock timer");

"last activity time");

PEGASUS_ASSERT(lastActivityTime != 0);

}

catch (...)

{

PEGASUS_ASSERT(false);

_pool.insert_last(thread);

_idleThreads.insert_last(thread);

break;

}

Boolean cleanupThisThread =

check_time(lastActivityTime, &_deallocate_wait);

_timeIntervalExpired(lastActivityTime, &_deallocateWait);

thread->dereference_tsd();

if (cleanupThisThread)

{

_cleanupThread(thread);

_current_threads--;

_currentThreads--;

numThreadsCleanedUp++;

}

else

{

_pool.insert_first(thread);

_idleThreads.insert_first(thread);

}

Line 709

Line 630

return numThreadsCleanedUp;

}

void ThreadPool::_cleanupThread(Thread* th)

void ThreadPool::_cleanupThread(Thread* thread)

{

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::cleanupThread");

// Set the "work func" and "work parm" to 0 so _loop() knows to exit.

th->delete_tsd("work func");

thread->delete_tsd("work func");

th->put_tsd(

thread->put_tsd(

"work func", NULL,

"work func", 0,

sizeof(PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *)(void *)),

(void *) 0);

th->delete_tsd("work parm");

thread->delete_tsd("work parm");

th->put_tsd("work parm", NULL, sizeof(void *), 0);

thread->put_tsd("work parm", 0, sizeof(void *), 0);

// signal the thread's sleep semaphore to awaken it

Semaphore* sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");

Semaphore* sleep_sem = (Semaphore *)thread->reference_tsd("sleep sem");

PEGASUS_ASSERT(sleep_sem != 0);

sleep_sem->signal();

th->dereference_tsd();

thread->dereference_tsd();

th->join();

thread->join();

delete th;

delete thread;

PEG_METHOD_EXIT();

}

Boolean ThreadPool::check_time(struct timeval *start, struct timeval *interval)

Boolean ThreadPool::_timeIntervalExpired(

struct timeval* start,

struct timeval* interval)

{

// never time out if the interval is zero

if(interval && interval->tv_sec == 0 && interval->tv_usec == 0)

if (interval && (interval->tv_sec == 0) && (interval->tv_usec == 0))

{

return false;

}

struct timeval now , finish , remaining ;

Uint32 usec;

pegasus_gettimeofday(&now);

/* remove valgrind error */

pegasus_gettimeofday(&remaining); // Avoid valgrind error

pegasus_gettimeofday(&remaining);

finish.tv_sec = start->tv_sec + interval->tv_sec;

usec = start->tv_usec + interval->tv_usec;

Line 753

Line 676

usec %= 1000000;

finish.tv_usec = usec;

if ( timeval_subtract(&remaining, &finish, &now) )

return (timeval_subtract(&remaining, &finish, &now) != 0);

return true;

else

return false;

}

PEGASUS_THREAD_RETURN ThreadPool::_undertaker( void *parm )

{

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::_undertaker");

exit_thread((PEGASUS_THREAD_RETURN)1);

PEG_METHOD_EXIT();

return (PEGASUS_THREAD_RETURN)1;

}

PEGASUS_THREAD_RETURN ThreadPool::_graveyard(Thread *t)

{

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::_graveyard");

ThreadPool *pool = (ThreadPool *)t->get_parm();

if(pool == 0 ) {

Tracer::trace(TRC_THREAD, Tracer::LEVEL2,

"Could not obtain the pool information from the Thread.", t);

return (PEGASUS_THREAD_RETURN)1;

}

if (pool->_pool.exists(t))

{

if (pool->_pool.remove( (void *) t) != 0)

{

Tracer::trace(TRC_THREAD, Tracer::LEVEL4,

"Moving thread %p", t);

/* We are moving the thread to the _running queue b/c

_only_ kill_dead_threads has enough logic to take care

of cleaning up the threads.*/

pool->_running.insert_first( t );

}

else

{

Tracer::trace(TRC_THREAD, Tracer::LEVEL4,

"Could not move Thread %p from _pool to _runing queue.", t);

return (PEGASUS_THREAD_RETURN)1;

}

else if (pool->_running.exists(t))

void ThreadPool::_deleteSemaphore(void *p)

{

Tracer::trace(TRC_THREAD, Tracer::LEVEL4,

"Thread %p is on _running queue. Letting kill_dead_threads take care of the problem.", t);

return (PEGASUS_THREAD_RETURN)1;

}

if (!pool->_dead.exists(t))

{

Tracer::trace(TRC_THREAD, Tracer::LEVEL2,

"Thread is not on any queue! Moving it to the running queue.");

pool->_running.insert_first( t );

}

PEG_METHOD_EXIT();

return (PEGASUS_THREAD_RETURN)0;

}

void ThreadPool::_sleep_sem_del(void *p)

{

if(p != 0)

{

delete (Semaphore *)p;

}

void ThreadPool::_check_deadlock(struct timeval *start) throw(Deadlock)

Thread* ThreadPool::_initializeThread()

{

if (true == check_time(start, &_deadlock_detect))

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::_initializeThread");

throw Deadlock(pegasus_thread_self());

return;

}

Boolean ThreadPool::_check_deadlock_no_throw(struct timeval *start)

{

return(check_time(start, &_deadlock_detect));

}

Boolean ThreadPool::_check_dealloc(struct timeval *start)

{

return(check_time(start, &_deallocate_wait));

}

Thread *ThreadPool::_init_thread(void) throw(IPCException)

{

PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::_init_thread");

Thread *th = (Thread *) new Thread(_loop, this, false);

// allocate a sleep semaphore and pass it in the thread context

// initial count is zero, loop function will sleep until

// we signal the semaphore

Semaphore *sleep_sem = (Semaphore *) new Semaphore(0);

th->put_tsd("sleep sem", &_sleep_sem_del, sizeof(Semaphore), (void *)sleep_sem);

th->put_tsd(

"sleep sem", &_deleteSemaphore, sizeof(Semaphore), (void *)sleep_sem);

struct timeval *dldt = (struct timeval *) ::operator new(sizeof(struct timeval));

pegasus_gettimeofday(dldt);

th->put_tsd("deadlock timer", thread_data::default_delete, sizeof(struct timeval), (void *)dldt);

struct timeval* lastActivityTime =

// thread will enter _loop(void *) and sleep on sleep_sem until we signal it

(struct timeval *) ::operator new(sizeof(struct timeval));

pegasus_gettimeofday(lastActivityTime);

th->put_tsd("last activity time", thread_data::default_delete,

sizeof(struct timeval), (void *)lastActivityTime);

// thread will enter _loop() and sleep on sleep_sem until we signal it

if (th->run() != PEGASUS_THREAD_OK)

{

Line 863

Line 712

delete th;

return 0;

}

_current_threads++;

_currentThreads++;

pegasus_yield();

PEG_METHOD_EXIT();

return th;

}

void ThreadPool::_link_pool(Thread *th) throw(IPCException)

void ThreadPool::_addToIdleThreadsQueue(Thread* th)

{

if(th == 0)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_link_pool: Thread pointer is null.");

"ThreadPool::_addToIdleThreadsQueue: Thread pointer is null.");

throw NullPointer();

}

try

{

_pool.insert_first(th);

_idleThreads.insert_first(th);

}

catch(...)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"ThreadPool::_link_pool: _pool.insert_first failed.");

"ThreadPool::_addToIdleThreadsQueue: _idleThreads.insert_first "

"failed.");

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.71.2.6
changed lines
	Added in v.1.87.4.1

No CVS admin address has been configured