(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.1.2.1 and 1.7.2.2

version 1.1.2.1, 2006/07/27 23:11:52 version 1.7.2.2, 2008/08/21 15:06:30
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
  
 //============================================================================== //==============================================================================
Line 60 
Line 53 
  
 #if defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX) #if defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX)
 # define PEGASUS_USE_POSIX_RWLOCK # define PEGASUS_USE_POSIX_RWLOCK
 #elif defined(PEGASUS_PLATFORM_HPUX_ACC)  #elif defined(PEGASUS_PLATFORM_PASE_ISERIES_IBMCXX)
 # define PEGASUS_USE_POSIX_RWLOCK # define PEGASUS_USE_POSIX_RWLOCK
 #elif defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM)  #elif defined(PEGASUS_PLATFORM_HPUX_ACC)
 # define PEGASUS_USE_POSIX_RWLOCK # define PEGASUS_USE_POSIX_RWLOCK
 #elif defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)  #elif defined(PEGASUS_OS_SOLARIS)
 # define PEGASUS_USE_POSIX_RWLOCK # define PEGASUS_USE_POSIX_RWLOCK
 #elif defined(PEGASUS_PLATFORM_TRU64_ALPHA_DECCXX) #elif defined(PEGASUS_PLATFORM_TRU64_ALPHA_DECCXX)
 # define PEGASUS_USE_POSIX_RWLOCK # define PEGASUS_USE_POSIX_RWLOCK
Line 74 
Line 67 
 # define PEGASUS_USE_POSIX_RWLOCK # define PEGASUS_USE_POSIX_RWLOCK
 #elif defined(PEGASUS_PLATFORM_VMS_ALPHA_DECCXX) #elif defined(PEGASUS_PLATFORM_VMS_ALPHA_DECCXX)
 # define PEGASUS_USE_POSIX_RWLOCK # define PEGASUS_USE_POSIX_RWLOCK
   #elif defined(PEGASUS_PLATFORM_LINUX_X86_64_GNU)
   # define PEGASUS_USE_POSIX_RWLOCK
 #else #else
 # define PEGASUS_USE_SEMAPHORE_RWLOCK # define PEGASUS_USE_SEMAPHORE_RWLOCK
 #endif #endif
Line 88 
Line 83 
 struct ReadWriteSemRep struct ReadWriteSemRep
 { {
     pthread_rwlock_t rwlock;     pthread_rwlock_t rwlock;
     pthread_t owner;      ThreadType owner;
 }; };
 #endif /* PEGASUS_USE_POSIX_RWLOCK */ #endif /* PEGASUS_USE_POSIX_RWLOCK */
  
Line 120 
Line 115 
  
     ~ReadWriteSem();     ~ReadWriteSem();
  
     // @exception Deadlock  
     // @exception Permission     // @exception Permission
     // @exception WaitFailed     // @exception WaitFailed
     inline void wait_read(ThreadType caller)     inline void wait_read(ThreadType caller)
     {     {
         wait(PEG_SEM_READ, caller );          _wait(false, caller);
     }     }
  
     // @exception Deadlock  
     // @exception Permission     // @exception Permission
     // @exception WaitFailed     // @exception WaitFailed
     inline void wait_write(ThreadType caller)     inline void wait_write(ThreadType caller)
     {     {
         wait(PEG_SEM_WRITE, caller);          _wait(true, 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  
     inline void try_wait_write(ThreadType caller)  
     {  
         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  
     inline void timed_wait_write(ThreadType caller, int milliseconds)  
     {  
         timed_wait(PEG_SEM_WRITE, caller, milliseconds);  
     }     }
  
     // @exception Permission     // @exception Permission
     inline void unlock_read(ThreadType caller)     inline void unlock_read(ThreadType caller)
     {     {
         unlock(PEG_SEM_READ, caller);          _unlock(false, caller);
     }     }
  
     // @exception Permission     // @exception Permission
     inline void unlock_write(ThreadType caller)     inline void unlock_write(ThreadType caller)
     {     {
         unlock(PEG_SEM_WRITE, caller);          _unlock(true, caller);
     }     }
  
     int read_count() const;     int read_count() const;
     int write_count() const;     int write_count() const;
  
     // @exception Deadlock  private:
     // @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 Permission
     // @exception WaitFailed     // @exception WaitFailed
     // @exception TooManyReaders      void _wait(Boolean writeLock, ThreadType caller);
     void timed_wait(Uint32 mode, ThreadType caller, int milliseconds);  
  
     // @exception Permission     // @exception Permission
     void unlock(Uint32 mode, ThreadType caller);      void _unlock(Boolean writeLock, ThreadType caller);
  
 private:  
     AtomicInt _readers;     AtomicInt _readers;
     AtomicInt _writers;     AtomicInt _writers;
     ReadWriteSemRep _rwlock;     ReadWriteSemRep _rwlock;
     friend void extricate_read_write(void *);  
 }; };
  
 //============================================================================== //==============================================================================

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