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

Diff for /pegasus/src/Pegasus/Common/ReadWriteSem.h between version 1.11 and 1.14

version 1.11, 2008/09/02 14:11:21 version 1.14, 2008/09/16 18:37:03
Line 67 
Line 67 
 struct ReadWriteSemRep struct ReadWriteSemRep
 { {
     pthread_rwlock_t rwlock;     pthread_rwlock_t rwlock;
     ThreadType owner;  
 }; };
 #endif /* PEGASUS_USE_POSIX_RWLOCK */ #endif /* PEGASUS_USE_POSIX_RWLOCK */
  
Line 77 
Line 76 
     Semaphore _rlock;     Semaphore _rlock;
     Mutex _wlock;     Mutex _wlock;
     Mutex _internal_lock;     Mutex _internal_lock;
     ThreadType _owner;      AtomicInt _readers;
       AtomicInt _writers;
     ReadWriteSemRep() :     ReadWriteSemRep() :
         _rlock(10), _wlock(), _internal_lock(), _owner(Threads::self())          _rlock(10), _wlock(), _internal_lock(), _readers(0), _writers(0)
     {     {
     }     }
 }; };
Line 99 
Line 99 
  
     ~ReadWriteSem();     ~ReadWriteSem();
  
     // @exception WaitFailed      void waitRead();
     inline void wait_read(ThreadType caller)  
     {  
         _wait(false, caller);  
     }  
   
     // @exception WaitFailed  
     inline void wait_write(ThreadType caller)  
     {  
         _wait(true, caller);  
     }  
  
     // @exception Permission      void waitWrite();
     inline void unlock_read(ThreadType caller)  
     {  
         _unlock(false, caller);  
     }  
  
     // @exception Permission      void unlockRead();
     inline void unlock_write(ThreadType caller)  
     {  
         _unlock(true, caller);  
     }  
  
     int read_count() const;      void unlockWrite();
     int write_count() const;  
  
 private: private:
     // @exception WaitFailed  
     void _wait(Boolean writeLock, ThreadType caller);  
  
     // @exception Permission  
     void _unlock(Boolean writeLock, ThreadType caller);  
   
     AtomicInt _readers;  
     AtomicInt _writers;  
     ReadWriteSemRep _rwlock;     ReadWriteSemRep _rwlock;
 }; };
  
Line 150 
Line 124 
  
     ReadLock(ReadWriteSem& rwsem) : _rwsem(rwsem)     ReadLock(ReadWriteSem& rwsem) : _rwsem(rwsem)
     {     {
         _rwsem.wait_read(Threads::self());          _rwsem.waitRead();
     }     }
  
     ~ReadLock()     ~ReadLock()
     {     {
         _rwsem.unlock_read(Threads::self());          _rwsem.unlockRead();
     }     }
  
 private: private:
Line 174 
Line 148 
  
     WriteLock(ReadWriteSem& rwsem) : _rwsem(rwsem)     WriteLock(ReadWriteSem& rwsem) : _rwsem(rwsem)
     {     {
         _rwsem.wait_write(Threads::self());          _rwsem.waitWrite();
     }     }
  
     ~WriteLock()     ~WriteLock()
     {     {
         _rwsem.unlock_write(Threads::self());          _rwsem.unlockWrite();
     }     }
  
 private: private:


Legend:
Removed from v.1.11  
changed lines
  Added in v.1.14

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2