(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.6.2.1 and 1.12

version 1.6.2.1, 2008/06/03 13:59:18 version 1.12, 2008/09/05 20:37:24
Line 40 
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_PASE_ISERIES_IBMCXX)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_HPUX_ACC)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC)  
 # define PEGASUS_USE_POSIX_RWLOCK  
 #elif defined(PEGASUS_PLATFORM_SOLARIS_IX86_CC)  
 # 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;  
     ReadWriteSemRep() :     ReadWriteSemRep() :
         _rlock(10), _wlock(), _internal_lock(), _owner(Threads::self())          _rlock(10), _wlock(), _internal_lock()
     {     {
     }     }
 }; };
Line 122 
Line 97 
  
     ~ReadWriteSem();     ~ReadWriteSem();
  
     // @exception Deadlock  
     // @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 WaitFailed     // @exception WaitFailed
     inline void wait_write(ThreadType caller)     inline void wait_write(ThreadType caller)
     {     {
         wait(PEG_SEM_WRITE, caller);          _wait(true, caller);
     }     }
  
     // @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 WaitFailed
     // @exception TooManyReaders      void _wait(Boolean writeLock, ThreadType caller);
     void wait(Uint32 mode, ThreadType caller);  
  
     // @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.6.2.1  
changed lines
  Added in v.1.12
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2