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

Diff for /pegasus/src/Pegasus/Common/Thread.h between version 1.11 and 1.26

version 1.11, 2002/03/31 00:37:56 version 1.26, 2002/09/20 20:31:30
Line 1 
Line 1 
 //%///////////-*-c++-*-//////////////////////////////////////////////////////  //%/-*-c++-*-////////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001 The Open group, BMC Software, Tivoli Systems, IBM  // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,
   // The Open Group, Tivoli Systems
 // //
 // 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 26 
Line 27 
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
   
 #ifndef Pegasus_Thread_h #ifndef Pegasus_Thread_h
 #define Pegasus_Thread_h #define Pegasus_Thread_h
   
   #include <cstring>
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/IPC.h> #include <Pegasus/Common/IPC.h>
 #include <Pegasus/Common/Exception.h>  #include <Pegasus/Common/InternalException.h>
 #include <Pegasus/Common/DQueue.h> #include <Pegasus/Common/DQueue.h>
   #include <Pegasus/Common/Linkage.h>
 // REVIEW: Spend time getting to know this.  
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
 PEGASUS_USING_STD;  
  
 class PEGASUS_COMMON_LINKAGE cleanup_handler class PEGASUS_COMMON_LINKAGE cleanup_handler
 { {
Line 145 
Line 145 
  
       }       }
  
       void copy_data(void **buf, size_t *size) throw(BufferTooSmall, NullPointer)        void copy_data(void **buf, size_t *size) throw(NullPointer)
       {       {
          if((buf == NULL) || (size == NULL))          if((buf == NULL) || (size == NULL))
             throw NullPointer() ;             throw NullPointer() ;
Line 289 
Line 289 
             delete tsd;             delete tsd;
       }       }
  
         // Note: Caller must delete the thread_data object returned (if not null)
       inline void *remove_tsd(const Sint8 *key) throw(IPCException)       inline void *remove_tsd(const Sint8 *key) throw(IPCException)
       {       {
          return(_tsd.remove((const void *)key));          return(_tsd.remove((const void *)key));
Line 296 
Line 297 
  
       inline void empty_tsd(void) throw(IPCException)       inline void empty_tsd(void) throw(IPCException)
       {       {
          _tsd.empty_list();           thread_data* tsd;
            while (0 != (tsd = _tsd.remove_first()))
            {
               delete tsd;
            }
            //_tsd.empty_list();
       }       }
  
       // create or re-initialize tsd associated with the key       // create or re-initialize tsd associated with the key
       // if the tsd already exists, return the existing buffer        // if the tsd already exists, delete the existing buffer
       thread_data *put_tsd(const Sint8 *key, void (*delete_func)(void *), Uint32 size, void *value)        void put_tsd(const Sint8 *key, void (*delete_func)(void *), Uint32 size, void *value)
          throw(IPCException)          throw(IPCException)
  
       {       {
          PEGASUS_ASSERT(key != NULL);          PEGASUS_ASSERT(key != NULL);
          thread_data *tsd ;          thread_data *tsd ;
          tsd = _tsd.remove((const void *)key);  // may throw an IPC exception          tsd = _tsd.remove((const void *)key);  // may throw an IPC exception
            delete tsd;
          thread_data *ntsd = new thread_data(key);          thread_data *ntsd = new thread_data(key);
          ntsd->put_data(delete_func, size, value);          ntsd->put_data(delete_func, size, value);
          try { _tsd.insert_first(ntsd); }          try { _tsd.insert_first(ntsd); }
          catch(IPCException& e) { e = e; delete ntsd; throw; }          catch(IPCException& e) { e = e; delete ntsd; throw; }
          return(tsd);  
       }       }
       inline PEGASUS_THREAD_RETURN get_exit(void) { return _exit_code; }       inline PEGASUS_THREAD_RETURN get_exit(void) { return _exit_code; }
       inline PEGASUS_THREAD_TYPE self(void) {return pegasus_thread_self(); }       inline PEGASUS_THREAD_TYPE self(void) {return pegasus_thread_self(); }
Line 467 
Line 473 
          return _running.count();          return _running.count();
       }       }
  
         inline Uint32 pool_count(void)
           {
             return _pool.count();
           }
         inline Uint32 dead_count(void)
           {
             return _dead.count();
           }
   
   
       static Boolean check_time(struct timeval *start, struct timeval *interval);       static Boolean check_time(struct timeval *start, struct timeval *interval);
  
         Boolean operator ==(const ThreadPool & p)
         {
            return operator==((const void *)&p);
         }
   
         Boolean operator ==(const void *p)
         {
            if((void *)this == p)
               return true;
            return false;
         }
   
         static void kill_idle_threads(void);
   
    private:    private:
       ThreadPool(void);       ThreadPool(void);
       Sint16 _max_threads;       Sint16 _max_threads;
Line 483 
Line 513 
       DQueue<Thread> _running;       DQueue<Thread> _running;
       DQueue<Thread> _dead;       DQueue<Thread> _dead;
       AtomicInt _dying;       AtomicInt _dying;
   
   
       static void _sleep_sem_del(void *p);       static void _sleep_sem_del(void *p);
  
       void _check_deadlock(struct timeval *start) throw(Deadlock);       void _check_deadlock(struct timeval *start) throw(Deadlock);
Line 493 
Line 521 
       Thread *_init_thread(void) throw(IPCException);       Thread *_init_thread(void) throw(IPCException);
       void _link_pool(Thread *th) throw(IPCException);       void _link_pool(Thread *th) throw(IPCException);
       static PEGASUS_THREAD_RETURN  _undertaker(void *);       static PEGASUS_THREAD_RETURN  _undertaker(void *);
         static DQueue<ThreadPool> _pools;
  };  };
  
  
 inline void ThreadPool::_sleep_sem_del(void *p)  
 {  
    if(p != 0)  
    {  
       delete (Semaphore *)p;  
    }  
 }  
   
 inline void ThreadPool::_check_deadlock(struct timeval *start) throw(Deadlock)  
 {  
    if (true == check_time(start, &_deadlock_detect))  
       throw Deadlock(pegasus_thread_self());  
    return;  
 }  
   
   
 inline Boolean ThreadPool::_check_deadlock_no_throw(struct timeval *start)  
 {  
    return(check_time(start, &_deadlock_detect));  
 }  
   
 inline Boolean ThreadPool::_check_dealloc(struct timeval *start)  
 {  
    return(check_time(start, &_deallocate_wait));  
 }  
   
 inline Thread *ThreadPool::_init_thread(void) throw(IPCException)  
 {  
    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);  
   
    struct timeval *dldt = (struct timeval *) ::operator new(sizeof(struct timeval));  
    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  
    th->run();  
    _current_threads++;  
    pegasus_yield();  
   
    return th;  
 }  
   
 inline void ThreadPool::_link_pool(Thread *th) throw(IPCException)  
 {  
    if(th == 0)  
       throw NullPointer();  
    _pool.insert_first(th);  
 }  
  
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)

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