(file) Return to Thread.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Thread.cpp between version 1.36.4.6 and 1.66

version 1.36.4.6, 2003/08/14 14:26:20 version 1.66, 2004/07/26 23:45:11
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2003////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L. P., IBM Corp., The Open Group, Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
   // IBM Corp.; EMC Corporation, The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 25 
Line 27 
 // //
 // Modified By: Rudy Schuet (rudy.schuet@compaq.com) 11/12/01 // Modified By: Rudy Schuet (rudy.schuet@compaq.com) 11/12/01
 //              added nsk platform support //              added nsk platform support
   //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)
   //              Amit K Arora, IBM (amita@in.ibm.com) for PEP#101
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 51 
Line 55 
       ::operator delete(data);       ::operator delete(data);
 } }
  
 Boolean Thread::_signals_blocked = false;  // l10n start
 // l10n  void language_delete(void * data)
   {
      if( data != NULL)
      {
         AutoPtr<AcceptLanguages> al(static_cast<AcceptLanguages *>(data));
      }
   }
   // l10n end
  
   Boolean Thread::_signals_blocked = false;
 // l10n // l10n
   #ifndef PEGASUS_OS_ZOS
   PEGASUS_THREAD_KEY_TYPE Thread::_platform_thread_key = -1;
   #else
 PEGASUS_THREAD_KEY_TYPE Thread::_platform_thread_key; PEGASUS_THREAD_KEY_TYPE Thread::_platform_thread_key;
   #endif
 Boolean Thread::_key_initialized = false; Boolean Thread::_key_initialized = false;
 Boolean Thread::_key_error = false; Boolean Thread::_key_error = false;
  
   
 // for non-native implementations // for non-native implementations
 #ifndef PEGASUS_THREAD_CLEANUP_NATIVE #ifndef PEGASUS_THREAD_CLEANUP_NATIVE
 void Thread::cleanup_push( void (*routine)(void *), void *parm) throw(IPCException) void Thread::cleanup_push( void (*routine)(void *), void *parm) throw(IPCException)
 { {
     cleanup_handler *cu = new cleanup_handler(routine, parm);      AutoPtr<cleanup_handler> cu(new cleanup_handler(routine, parm));
     try      _cleanup.insert_first(cu.get());
     {      cu.release();
         _cleanup.insert_first(cu);  
     }  
     catch(IPCException&)  
     {  
         delete cu;  
         throw;  
     }  
     return;     return;
 } }
  
 void Thread::cleanup_pop(Boolean execute) throw(IPCException) void Thread::cleanup_pop(Boolean execute) throw(IPCException)
 { {
     cleanup_handler *cu ;      AutoPtr<cleanup_handler> cu ;
     try     try
     {     {
         cu = _cleanup.remove_first() ;          cu.reset(_cleanup.remove_first());
     }     }
     catch(IPCException&)     catch(IPCException&)
     {     {
Line 90 
Line 99 
      }      }
     if(execute == true)     if(execute == true)
         cu->execute();         cu->execute();
     delete cu;  
 } }
  
 #endif #endif
Line 209 
Line 217 
    {    {
                 // deletes the old tsd and creates a new one                 // deletes the old tsd and creates a new one
                 currentThrd->put_tsd("acceptLanguages",                 currentThrd->put_tsd("acceptLanguages",
                         thread_data::default_delete,                          language_delete,
                         sizeof(AcceptLanguages *),                         sizeof(AcceptLanguages *),
                         langs);                         langs);
    }    }
Line 232 
Line 240 
 } }
 // l10n end // l10n end
  
 DQueue<ThreadPool> ThreadPool::_pools(true);  #if 0
   // two special synchronization classes for ThreadPool
   //
  
   class timed_mutex
   {
      public:
         timed_mutex(Mutex* mut, int msec)
            :_mut(mut)
         {
            _mut->timed_lock(msec, pegasus_thread_self());
         }
         ~timed_mutex(void)
         {
            _mut->unlock();
         }
         Mutex* _mut;
   };
   #endif
   
   class try_mutex
   {
      public:
         try_mutex(Mutex* mut)
            :_mut(mut)
         {
            _mut->try_lock(pegasus_thread_self());
         }
         ~try_mutex(void)
         {
            _mut->unlock();
         }
   
         Mutex* _mut;
   };
   
   class auto_int
   {
      public:
         auto_int(AtomicInt* num)
            : _int(num)
         {
            _int->operator++();
         }
         ~auto_int(void)
         {
            _int->operator--();
         }
         AtomicInt *_int;
   };
   
   
   AtomicInt _idle_control;
   
   DQueue<ThreadPool> ThreadPool::_pools(true);
  
 void ThreadPool::kill_idle_threads(void) void ThreadPool::kill_idle_threads(void)
 { {
Line 296 
Line 357 
 } }
  
  
   // Note:   <<< Fri Oct 17 09:19:03 2003 mdd >>>
   // the pegasus_yield() calls that preceed each th->join() are to
   // give a thread on the running list a chance to reach a cancellation
   // point before the join
  
 ThreadPool::~ThreadPool(void) ThreadPool::~ThreadPool(void)
 { {
      PEG_METHOD_ENTER(TRC_THREAD, "Thread::~ThreadPool");
    try    try
    {    {
       _pools.remove(this);        // Set the dying flag so all thread know the destructor has been entered
       _dying++;       _dying++;
   
         // remove from the global pools list
         _pools.remove(this);
   
         // start with idle threads.
       Thread *th = 0;       Thread *th = 0;
       th = _pool.remove_first();       th = _pool.remove_first();
         Semaphore* sleep_sem;
   
       while(th != 0)       while(th != 0)
       {       {
          Semaphore *sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");           sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");
            PEGASUS_ASSERT(sleep_sem != 0);
  
          if(sleep_sem == 0)          if(sleep_sem == 0)
          {          {
             th->dereference_tsd();             th->dereference_tsd();
             throw NullPointer();  
          }          }
            else
            {
               // Signal to get the thread out of the work loop.
          sleep_sem->signal();          sleep_sem->signal();
   
               // Signal to get the thread past the end. See the comment
               // "wait to be awakend by the thread pool destructor"
               // Note: the current implementation of Thread for Windows
               // does not implement "pthread" cancelation points so this
               // is needed.
          sleep_sem->signal();          sleep_sem->signal();
          th->dereference_tsd();          th->dereference_tsd();
          // signal the thread's sleep semaphore  
          th->cancel();          th->cancel();
          th->join();          th->join();
          th->empty_tsd();  
          delete th;          delete th;
            }
          th = _pool.remove_first();          th = _pool.remove_first();
       }       }
  
       th = _running.remove_first();        while(_idle_control.value())
            pegasus_yield();
   
         th = _dead.remove_first();
       while(th != 0)       while(th != 0)
       {       {
            sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");
            PEGASUS_ASSERT(sleep_sem != 0);
   
            if(sleep_sem == 0)
            {
               th->dereference_tsd();
            }
            else
            {
               //ATTN-DME-P3-20030322: _dead queue processing in
               //ThreadPool::~ThreadPool is inconsistent with the
               //processing in kill_dead_threads.  Is this correct?
   
          // signal the thread's sleep semaphore          // signal the thread's sleep semaphore
               sleep_sem->signal();
               sleep_sem->signal();
               th->dereference_tsd();
          th->cancel();          th->cancel();
          th->join();          th->join();
          th->empty_tsd();  
          delete th;          delete th;
          th = _running.remove_first();  
       }       }
   
       th = _dead.remove_first();       th = _dead.remove_first();
         }
   
         {
            th = _running.remove_first();
       while(th != 0)       while(th != 0)
       {       {
          // signal the thread's sleep semaphore          // signal the thread's sleep semaphore
   
               sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");
               PEGASUS_ASSERT(sleep_sem != 0);
   
               if(sleep_sem == 0 )
               {
                  th->dereference_tsd();
               }
               else
               {
                  sleep_sem->signal();
                  sleep_sem->signal();
                  th->dereference_tsd();
          th->cancel();          th->cancel();
                  pegasus_yield();
   
          th->join();          th->join();
          th->empty_tsd();  
          delete th;          delete th;
          th = _dead.remove_first();              }
               th = _running.remove_first();
       }       }
    }    }
      }
   
    catch(...)    catch(...)
    {    {
    }    }
Line 361 
Line 478 
    Thread *myself = (Thread *)parm;    Thread *myself = (Thread *)parm;
    if(myself == 0)    if(myself == 0)
    {    {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_loop: Thread pointer is null");
       PEG_METHOD_EXIT();       PEG_METHOD_EXIT();
       throw NullPointer();       throw NullPointer();
    }    }
Line 373 
Line 492 
    ThreadPool *pool = (ThreadPool *)myself->get_parm();    ThreadPool *pool = (ThreadPool *)myself->get_parm();
    if(pool == 0 )    if(pool == 0 )
    {    {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_loop: ThreadPool pointer is null");
       PEG_METHOD_EXIT();       PEG_METHOD_EXIT();
       throw NullPointer();       throw NullPointer();
    }    }
      if(pool->_dying.value())
      {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_loop: ThreadPool is dying(1)");
         PEG_METHOD_EXIT();
         return((PEGASUS_THREAD_RETURN)0);
      }
   
    Semaphore *sleep_sem = 0;    Semaphore *sleep_sem = 0;
    Semaphore *blocking_sem = 0;    Semaphore *blocking_sem = 0;
  
Line 388 
Line 517 
       deadlock_timer = (struct timeval *)myself->reference_tsd("deadlock timer");       deadlock_timer = (struct timeval *)myself->reference_tsd("deadlock timer");
       myself->dereference_tsd();       myself->dereference_tsd();
    }    }
    catch(IPCException &)  
    {  
       PEG_METHOD_EXIT();  
       myself->exit_self(0);  
    }  
    catch(...)    catch(...)
    {    {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_loop: Failure getting sleep_sem or deadlock_timer");
       PEG_METHOD_EXIT();       PEG_METHOD_EXIT();
       myself->exit_self(0);        return((PEGASUS_THREAD_RETURN)0);
    }    }
  
    if(sleep_sem == 0 || deadlock_timer == 0)    if(sleep_sem == 0 || deadlock_timer == 0)
    {    {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_loop: sleep_sem or deadlock_timer are null.");
       PEG_METHOD_EXIT();       PEG_METHOD_EXIT();
       throw NullPointer();        return((PEGASUS_THREAD_RETURN)0);
    }    }
  
    while(pool->_dying < 1)     while(1)
      {
         if(pool->_dying.value())
            break;
   
         try
    {    {
       sleep_sem->wait();       sleep_sem->wait();
         }
         catch(IPCException& )
         {
            Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_loop: failure on sleep_sem->wait().");
            PEG_METHOD_EXIT();
            return((PEGASUS_THREAD_RETURN)0);
         }
  
       // when we awaken we reside on the running queue, not the pool queue       // when we awaken we reside on the running queue, not the pool queue
       if(pool->_dying > 0)  
          break;  
  
       PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *_work)(void *) = 0;       PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *_work)(void *) = 0;
       void *parm = 0;       void *parm = 0;
Line 429 
Line 569 
       }       }
       catch(IPCException &)       catch(IPCException &)
       {       {
            Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
              "ThreadPool::_loop: Failure accessing work func, work parm, or blocking sem.");
          PEG_METHOD_EXIT();          PEG_METHOD_EXIT();
          myself->exit_self(0);           return((PEGASUS_THREAD_RETURN)0);
       }       }
  
       if(_work == 0)       if(_work == 0)
       {       {
            Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
              "ThreadPool::_loop: work func is null.");
          PEG_METHOD_EXIT();          PEG_METHOD_EXIT();
          throw NullPointer();           return((PEGASUS_THREAD_RETURN)0);
       }       }
  
       if(_work ==       if(_work ==
          (PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *)(void *)) &_undertaker)          (PEGASUS_THREAD_RETURN (PEGASUS_THREAD_CDECL *)(void *)) &_undertaker)
       {       {
            PEG_METHOD_EXIT();
          _work(parm);          _work(parm);
       }       }
  
       gettimeofday(deadlock_timer, NULL);       gettimeofday(deadlock_timer, NULL);
   
         if (pool->_dying.value() == 0)
         {
       try       try
       {       {
          _work(parm);          _work(parm);
       }       }
            catch(Exception & e)
            {
               PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,
                  String("Exception from _work in ThreadPool::_loop: ") +
                     e.getMessage());
               PEG_METHOD_EXIT();
               return((PEGASUS_THREAD_RETURN)0);
            }
       catch(...)       catch(...)
       {       {
          gettimeofday(deadlock_timer, NULL);              Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
                 "ThreadPool::_loop: execution of _work failed.");
               PEG_METHOD_EXIT();
               return((PEGASUS_THREAD_RETURN)0);
            }
       }       }
  
         // put myself back onto the available list
         try
         {
            if(pool->_dying.value() == 0)
            {
       gettimeofday(deadlock_timer, NULL);       gettimeofday(deadlock_timer, NULL);
       if( blocking_sem != 0 )       if( blocking_sem != 0 )
          blocking_sem->signal();          blocking_sem->signal();
  
       // put myself back onto the available list              // If we are not on _running then ~ThreadPool has removed
       try              // us and now "owns" our pointer.
               if ( pool->_running.remove((void *)myself) != 0 )
       {       {
          pool->_running.remove((void *)myself);                 pool->_pool.insert_first(myself);
          pool->_link_pool(myself);  
       }       }
       catch(IPCException &)              else
               {
                  Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
                     "ThreadPool::_loop: Failed to remove thread from running queue.");
                  PEG_METHOD_EXIT();
                  return((PEGASUS_THREAD_RETURN)0);
               }
            }
            else
       {       {
          PEG_METHOD_EXIT();          PEG_METHOD_EXIT();
          myself->exit_self(0);              return((PEGASUS_THREAD_RETURN)0);
            }
         }
         catch(...)
         {
           Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
                "ThreadPool::_loop: Adding thread to idle pool failed.");
            PEG_METHOD_EXIT();
            return((PEGASUS_THREAD_RETURN)0);
       }       }
   
    }    }
   
      // TODO: Why is this needed? Why not just continue?
    // wait to be awakend by the thread pool destructor    // wait to be awakend by the thread pool destructor
    sleep_sem->wait();     //sleep_sem->wait();
   
    myself->test_cancel();    myself->test_cancel();
  
    PEG_METHOD_EXIT();    PEG_METHOD_EXIT();
    myself->exit_self(0);  
    return((PEGASUS_THREAD_RETURN)0);    return((PEGASUS_THREAD_RETURN)0);
 } }
  
 void ThreadPool::allocate_and_awaken(void *parm,  Boolean ThreadPool::allocate_and_awaken(void *parm,
                                      PEGASUS_THREAD_RETURN \                                      PEGASUS_THREAD_RETURN \
                                      (PEGASUS_THREAD_CDECL *work)(void *),                                      (PEGASUS_THREAD_CDECL *work)(void *),
                                      Semaphore *blocking)                                      Semaphore *blocking)
   
    throw(IPCException)    throw(IPCException)
 { {
    PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::allocate_and_awaken");    PEG_METHOD_ENTER(TRC_THREAD, "ThreadPool::allocate_and_awaken");
   
      // Allocate_and_awaken will not run if the _dying flag is set.
      // Once the lock is acquired, ~ThreadPool will not change
      // the value of _dying until the lock is released.
   
      try
      {
         if (_dying.value())
         {
            Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::allocate_and_awaken: ThreadPool is dying(1).");
            // ATTN: Error result has not yet been defined
            return true;
         }
    struct timeval start;    struct timeval start;
    gettimeofday(&start, NULL);    gettimeofday(&start, NULL);
         Thread *th = 0;
  
    Thread *th = _pool.remove_first();        th = _pool.remove_first();
  
    // wait for the right interval and try again        if (th == 0)
    while (th == 0 && _dying < 1)  
    {    {
            // will throw an IPCException&
       _check_deadlock(&start) ;       _check_deadlock(&start) ;
  
       if(_max_threads == 0 || _current_threads < _max_threads)       if(_max_threads == 0 || _current_threads < _max_threads)
       {       {
          th = _init_thread();          th = _init_thread();
          continue;  
       }       }
       pegasus_yield();  
       th = _pool.remove_first();  
    }    }
  
         if (th == 0)
    if(_dying < 1)  
    {    {
           // ATTN-DME-P3-20031103: This trace message should not be
           // be labeled TRC_DISCARDED_DATA, because it does not
           // 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 ",
              _key, _running.count(), _pool.count(), _dead.count());
            return false;
         }
   
       // initialize the thread data with the work function and parameters       // initialize the thread data with the work function and parameters
       Tracer::trace(TRC_THREAD, Tracer::LEVEL4,       Tracer::trace(TRC_THREAD, Tracer::LEVEL4,
           "Initializing thread with work function and parameters: parm = %p",           "Initializing thread with work function and parameters: parm = %p",
Line 534 
Line 741 
       if(sleep_sem == 0)       if(sleep_sem == 0)
       {       {
          th->dereference_tsd();          th->dereference_tsd();
            Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
              "ThreadPool::allocate_and_awaken: thread data is corrupted.");
          PEG_METHOD_EXIT();          PEG_METHOD_EXIT();
          throw NullPointer();          throw NullPointer();
       }       }
Line 541 
Line 750 
       sleep_sem->signal();       sleep_sem->signal();
       th->dereference_tsd();       th->dereference_tsd();
    }    }
    else     catch (...)
       _pool.insert_first(th);     {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::allocate_and_awaken: Operation Failed.");
         PEG_METHOD_EXIT();
         // ATTN: Error result has not yet been defined
         return true;
      }
    PEG_METHOD_EXIT();    PEG_METHOD_EXIT();
      return true;
 } }
  
 // caller is responsible for only calling this routine during slack periods // caller is responsible for only calling this routine during slack periods
Line 554 
Line 769 
 Uint32 ThreadPool::kill_dead_threads(void) Uint32 ThreadPool::kill_dead_threads(void)
          throw(IPCException)          throw(IPCException)
 { {
      // Since the kill_dead_threads, ThreadPool or allocate_and_awaken
      // manipulate the threads on the ThreadPool queues, they should never
      // be allowed to run at the same time.
   
      // << Thu Oct 23 14:41:02 2003 mdd >>
      // not true, the queues are thread safe. they are syncrhonized.
   
      auto_int do_not_destruct(&_idle_control);
   
      try
      {
         if (_dying.value())
         {
            return 0;
         }
   
    struct timeval now;    struct timeval now;
    gettimeofday(&now, NULL);    gettimeofday(&now, NULL);
    Uint32 bodies = 0;    Uint32 bodies = 0;
  
    // first go thread the dead q and clean it up as much as possible    // first go thread the dead q and clean it up as much as possible
    while(_dead.count() > 0)        try
         {
            while(_dying.value() == 0 && _dead.count() > 0)
    {    {
       Tracer::trace(TRC_THREAD, Tracer::LEVEL4, "ThreadPool:: removing and joining dead thread");       Tracer::trace(TRC_THREAD, Tracer::LEVEL4, "ThreadPool:: removing and joining dead thread");
       Thread *dead = _dead.remove_first();       Thread *dead = _dead.remove_first();
       if(dead == 0)  
          throw NullPointer();              if(dead )
               {
       dead->join();       dead->join();
       delete dead;       delete dead;
    }    }
            }
         }
         catch(...)
         {
         }
   
         if (_dying.value())
         {
            return 0;
         }
  
    DQueue<Thread> * map[2] =    DQueue<Thread> * map[2] =
       {       {
Line 578 
Line 822 
    DQueue<Thread> *q = 0;    DQueue<Thread> *q = 0;
    int i = 0;    int i = 0;
    AtomicInt needed(0);    AtomicInt needed(0);
         Thread *th = 0;
         internal_dq idq;
  
 #ifdef PEGASUS_DISABLE_KILLING_HUNG_THREADS  #ifdef PEGASUS_KILL_LONG_RUNNING_THREADS
    // This change prevents the thread pool from killing "hung" threads.        // Defining PEGASUS_KILL_LONG_RUNNING_THREADS causes the thread pool
    // The definition of a "hung" thread is one that has been on the run queue        // to kill threads that are on the _running queue longer than the
    // for longer than the time interval set when the thread pool was created.        // _deadlock_detect time interval specified for the thread pool.
    // Cancelling "hung" threads has proven to be problematic.        // Cancelling long-running threads has proven to be problematic and
         // may cause a crash depending on the state of the thread when it is
    // With this change the thread pool will not cancel "hung" threads.  This        // killed.  Use this option with care.
    // may prevent a crash depending upon the state of the "hung" thread.  In  
    // the case that the thread is actually hung, this change causes the  
    // thread resources not to be reclaimed.  
   
    // Idle threads, those that have not executed a routine for a time  
    // interval, continue to be destroyed.  This is normal and should not  
    // cause any problems.  
    for( ; i < 1; i++)  
 #else  
    for( ; i < 2; i++)    for( ; i < 2; i++)
   #else
         for( ; i < 1; i++)
 #endif #endif
    {    {
       q = map[i];       q = map[i];
Line 612 
Line 851 
  
          struct timeval dt = { 0, 0 };          struct timeval dt = { 0, 0 };
          struct timeval *dtp;          struct timeval *dtp;
          Thread *th = 0;  
          th = q->next(th);          th = q->next(th);
          while (th != 0 )          while (th != 0 )
          {          {
Line 665 
Line 904 
                }                }
  
                th = q->remove_no_lock((void *)th);                th = q->remove_no_lock((void *)th);
                     idq.insert_first((void*)th);
                  }
                  th = q->next(th);
               }
               q->unlock();
            }
  
                if(th != 0)           th = (Thread*)idq.remove_last();
            while(th != 0)
                {                {
                   if( i == 0 )                   if( i == 0 )
                   {                   {
Line 679 
Line 925 
  
                      // signal the thread's sleep semaphore to awaken it                      // signal the thread's sleep semaphore to awaken it
                      Semaphore *sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");                      Semaphore *sleep_sem = (Semaphore *)th->reference_tsd("sleep sem");
                  PEGASUS_ASSERT(sleep_sem != 0);
                      if(sleep_sem == 0)  
                      {  
                         q->unlock();  
                         th->dereference_tsd();  
                         throw NullPointer();  
                      }  
  
                      bodies++;                      bodies++;
                      th->dereference_tsd();                      th->dereference_tsd();
                      _dead.insert_first(th);                 // Putting thread on _dead queue delays availability to others
                  //_dead.insert_first(th);
                      sleep_sem->signal();                      sleep_sem->signal();
                  th->join();  // Note: Clean up the thread here rather than
                  delete th;   // leave it sitting unused on the _dead queue
                      th = 0;                      th = 0;
                   }                   }
                   else                   else
                   {                   {
                      // deadlocked threads                      // deadlocked threads
                      Tracer::trace(TRC_THREAD, Tracer::LEVEL4, "Killing a deadlocked thread");                 Tracer::trace(TRC_THREAD, Tracer::LEVEL2,
                                "A thread has run longer than %u seconds and "
                                    "will be cancelled.",
                                Uint32(_deadlock_detect.tv_sec));
                  Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER,
                                Logger::SEVERE,
                                "Common.Thread.CANCEL_LONG_RUNNING_THREAD",
                                "A thread has run longer than {0} seconds and "
                                    "will be cancelled.",
                                Uint32(_deadlock_detect.tv_sec));
                      th->cancel();                      th->cancel();
                      delete th;                      delete th;
                   }                   }
               th = (Thread*)idq.remove_last();
                }                }
             }             }
             th = q->next(th);  
             pegasus_sleep(1);        while (needed.value() > 0)   {
          }  
          q->unlock();  
          while (needed.value() > 0)  
          {  
             _link_pool(_init_thread());             _link_pool(_init_thread());
             needed--;             needed--;
             pegasus_sleep(0);             pegasus_sleep(0);
          }          }
          return bodies;
       }       }
       catch (...)
       {
    }    }
     return bodies;      return 0;
 } }
  
  
Line 791 
Line 1043 
    th->put_tsd("deadlock timer", thread_data::default_delete, sizeof(struct timeval), (void *)dldt);    th->put_tsd("deadlock timer", thread_data::default_delete, sizeof(struct timeval), (void *)dldt);
    // thread will enter _loop(void *) and sleep on sleep_sem until we signal it    // thread will enter _loop(void *) and sleep on sleep_sem until we signal it
  
    th->run();     if (!th->run())
      {
         delete th;
         return 0;
      }
    _current_threads++;    _current_threads++;
    pegasus_yield();    pegasus_yield();
  
Line 801 
Line 1057 
  void ThreadPool::_link_pool(Thread *th) throw(IPCException)  void ThreadPool::_link_pool(Thread *th) throw(IPCException)
 { {
    if(th == 0)    if(th == 0)
      {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_link_pool: Thread pointer is null.");
       throw NullPointer();       throw NullPointer();
      }
      try
      {
    _pool.insert_first(th);    _pool.insert_first(th);
 } }
      catch(...)
      {
         Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,
             "ThreadPool::_link_pool: _pool.insert_first failed.");
      }
   }
  
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

Legend:
Removed from v.1.36.4.6  
changed lines
  Added in v.1.66
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2