(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.2 and 1.13

version 1.2, 2006/08/09 21:12:42 version 1.13, 2008/09/09 17:38:27
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Mike Day (mdday@us.ibm.com)  
 //  
 // Reworked By: Mike Brasher (m.brasher@inovadevelopment.com)  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #ifndef Pegasus_ReadWriteSem_h #ifndef Pegasus_ReadWriteSem_h
Line 44 
Line 40 
 #include <Pegasus/Common/Mutex.h> #include <Pegasus/Common/Mutex.h>
 #include <Pegasus/Common/AtomicInt.h> #include <Pegasus/Common/AtomicInt.h>
  
 #define PEG_SEM_READ 1  
 #define PEG_SEM_WRITE 2  
   
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 //==============================================================================  /**
 //      Every platform should decide which implementation for read/write locks
 // Select the read-write-lock implementation for your platform:      should be used in OpenPegasus by defining one of the following:
 //      1.) PEGASUS_USE_POSIX_RWLOCK - POSIX standard based implementation
 //     PEGASUS_USE_POSIX_RWLOCK      2.) PEGASUS_USE_SEMAPHORE_RWLOCK - mutex based implementation
 //     PEGASUS_USE_SEMAPHORE_RWLOCK  
 //      The definition for each platform can be found in the according platform
 //==============================================================================      header file: pegasus/src/Pegasus/Common/Platform_<Platform>.h
   */
   
   #if !defined(PEGASUS_USE_POSIX_RWLOCK) && !defined(PEGASUS_USE_SEMAPHORE_RWLOCK)
   # error "Unsupported platform: ReadWriteSem.h implementation type missing"
  
 #if defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_HPUX_ACC)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_TRU64_ALPHA_DECCXX)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_VMS_IA64_DECCXX)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_VMS_ALPHA_DECCXX)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_LINUX_X86_64_GNU)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #else  
 # define PEGASUS_USE_SEMAPHORE_RWLOCK  
 #endif #endif
  
 //============================================================================== //==============================================================================
Line 90 
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 100 
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 122 
Line 99 
  
     ~ReadWriteSem();     ~ReadWriteSem();
  
     // @exception Deadlock  
     // @exception Permission  
     // @exception WaitFailed  
     inline void wait_read(ThreadType caller)  
     {  
         wait(PEG_SEM_READ, caller );  
     }  
   
     // @exception Deadlock  
     // @exception Permission  
     // @exception WaitFailed  
     inline void wait_write(ThreadType caller)  
     {  
         wait(PEG_SEM_WRITE, caller);  
     }  
   
     // @exception Deadlock  
     // @exception Permission  
     // @exception AlreadyLocked  
     // @exception WaitFailed  
     inline void try_wait_read(ThreadType caller)  
     {  
         try_wait(PEG_SEM_READ, caller);  
     }  
   
     // @exception Deadlock  
     // @exception Permission  
     // @exception AlreadyLocked  
     // @exception WaitFailed     // @exception WaitFailed
     inline void try_wait_write(ThreadType caller)      void waitRead();
     {  
         try_wait(PEG_SEM_WRITE, caller);  
     }  
   
     // @exception Deadlock  
     // @exception Permission  
     // @exception TimeOut  
     // @exception WaitFailed  
     inline void timed_wait_read(ThreadType caller, int milliseconds)  
     {  
         timed_wait(PEG_SEM_READ, caller, milliseconds);  
     }  
  
     // @exception Deadlock  
     // @exception Permission  
     // @exception TimeOut  
     // @exception WaitFailed     // @exception WaitFailed
     inline void timed_wait_write(ThreadType caller, int milliseconds)      void waitWrite();
     {  
         timed_wait(PEG_SEM_WRITE, caller, milliseconds);  
     }  
  
     // @exception Permission      void unlockRead();
     inline void unlock_read(ThreadType caller)  
     {  
         unlock(PEG_SEM_READ, caller);  
     }  
  
     // @exception Permission      void unlockWrite();
     inline void unlock_write(ThreadType caller)  
     {  
         unlock(PEG_SEM_WRITE, caller);  
     }  
   
     int read_count() const;  
     int write_count() const;  
   
     // @exception Deadlock  
     // @exception Permission  
     // @exception WaitFailed  
     // @exception TooManyReaders  
     void wait(Uint32 mode, ThreadType caller);  
   
     // @exception Deadlock  
     // @exception Permission  
     // @exception WaitFailed  
     // @exception TooManyReaders  
     void try_wait(Uint32 mode, ThreadType caller);  
   
     // @exception Timeout  
     // @exception Deadlock  
     // @exception Permission  
     // @exception WaitFailed  
     // @exception TooManyReaders  
     void timed_wait(Uint32 mode, ThreadType caller, int milliseconds);  
   
     // @exception Permission  
     void unlock(Uint32 mode, ThreadType caller);  
  
 private: private:
     AtomicInt _readers;  
     AtomicInt _writers;  
     ReadWriteSemRep _rwlock;     ReadWriteSemRep _rwlock;
     friend void extricate_read_write(void *);  
 }; };
  
 //============================================================================== //==============================================================================
Line 230 
Line 126 
  
     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 254 
Line 150 
  
     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.2  
changed lines
  Added in v.1.13
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2