(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.16

version 1.1.2.1, 2006/07/27 23:11:52 version 1.16, 2008/12/02 09:00:52
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  //
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  // Permission is hereby granted, free of charge, to any person obtaining a
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  // copy of this software and associated documentation files (the "Software"),
 // EMC Corporation; Symantec Corporation; The Open Group.  // to deal in the Software without restriction, including without limitation
 //  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // and/or sell copies of the Software, and to permit persons to whom the
 // of this software and associated documentation files (the "Software"), to  // Software is furnished to do so, subject to the following conditions:
 // deal in the Software without restriction, including without limitation the  //
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // The above copyright notice and this permission notice shall be included
 // sell copies of the Software, and to permit persons to whom the Software is  // in all copies or substantial portions of the Software.
 // furnished to do so, subject to the following conditions:  //
 //  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  //////////////////////////////////////////////////////////////////////////
 //  
 // Author: Mike Day (mdday@us.ibm.com)  
 //  
 // Reworked By: Mike Brasher (m.brasher@inovadevelopment.com)  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 44 
Line 38 
 #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  
 #else  
 # define PEGASUS_USE_SEMAPHORE_RWLOCK  
 #endif #endif
  
 //============================================================================== //==============================================================================
Line 88 
Line 65 
 struct ReadWriteSemRep struct ReadWriteSemRep
 { {
     pthread_rwlock_t rwlock;     pthread_rwlock_t rwlock;
     pthread_t owner;  
 }; };
 #endif /* PEGASUS_USE_POSIX_RWLOCK */ #endif /* PEGASUS_USE_POSIX_RWLOCK */
  
Line 98 
Line 74 
     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 120 
Line 97 
  
     ~ReadWriteSem();     ~ReadWriteSem();
  
     // @exception Deadlock      void waitRead();
     // @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  
     inline void try_wait_write(ThreadType caller)  
     {  
         try_wait(PEG_SEM_WRITE, caller);  
     }  
  
     // @exception Deadlock      void waitWrite();
     // @exception Permission  
     // @exception TimeOut  
     // @exception WaitFailed  
     inline void timed_wait_read(ThreadType caller, int milliseconds)  
     {  
         timed_wait(PEG_SEM_READ, caller, milliseconds);  
     }  
  
     // @exception Deadlock      void unlockRead();
     // @exception Permission  
     // @exception TimeOut  
     // @exception WaitFailed  
     inline void timed_wait_write(ThreadType caller, int milliseconds)  
     {  
         timed_wait(PEG_SEM_WRITE, caller, milliseconds);  
     }  
  
     // @exception Permission      void unlockWrite();
     inline void unlock_read(ThreadType caller)  
     {  
         unlock(PEG_SEM_READ, caller);  
     }  
   
     // @exception Permission  
     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 228 
Line 122 
  
     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 252 
Line 146 
  
     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.1.2.1  
changed lines
  Added in v.1.16
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2