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

Diff for /pegasus/src/Pegasus/Common/Mutex.cpp between version 1.3.14.4 and 1.3.14.5

version 1.3.14.4, 2006/07/28 21:19:53 version 1.3.14.5, 2006/07/28 23:52:11
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Mike Day (mdday@us.ibm.com)  // Author: Mike Brasher (m.brasher@inovadevelopment.com)
 //  
 // Modified By: Markus Mueller  
 //              Ramnath Ravindran (Ramnath.Ravindran@compaq.com)  
 //              David Eger (dteger@us.ibm.com)  
 //              Amit K Arora, IBM (amita@in.ibm.com) for PEP#101  
 //              Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)  
 //              Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)  
 //              David Dillard, VERITAS Software Corp.  
 //                  (david.dillard@veritas.com)  
 //              Aruran, IBM (ashanmug@in.ibm.com) for BUG# 3518  
 //  
 // Reworked By: Mike Brasher (m.brasher@inovadevelopment.com)  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 68 
Line 56 
     pthread_mutexattr_settype(&_rep.attr, PTHREAD_MUTEX_RECURSIVE);     pthread_mutexattr_settype(&_rep.attr, PTHREAD_MUTEX_RECURSIVE);
  
     pthread_mutex_init(&_rep.mutex, &_rep.attr);     pthread_mutex_init(&_rep.mutex, &_rep.attr);
     Threads::clear(_rep.owner);  
 } }
  
 Mutex::~Mutex() Mutex::~Mutex()
Line 79 
Line 66 
         pthread_mutexattr_destroy(&_rep.attr);         pthread_mutexattr_destroy(&_rep.attr);
 } }
  
 void Mutex::lock(ThreadType caller)  void Mutex::lock()
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
     switch (pthread_mutex_lock(&_rep.mutex))     switch (pthread_mutex_lock(&_rep.mutex))
     {     {
         case 0:         case 0:
             _rep.owner = caller;  
             break;             break;
  
         case EDEADLK:         case EDEADLK:
             throw Deadlock(_rep.owner);              throw Deadlock(ThreadType());
  
         default:         default:
             throw WaitFailed(_rep.owner);              throw WaitFailed(ThreadType());
     }     }
 } }
  
 void Mutex::try_lock(ThreadType caller)  void Mutex::try_lock()
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
     switch (pthread_mutex_trylock(&_rep.mutex))     switch (pthread_mutex_trylock(&_rep.mutex))
     {     {
         case 0:         case 0:
             _rep.owner = caller;  
             break;             break;
  
         case EBUSY:         case EBUSY:
             throw AlreadyLocked(_rep.owner);              throw AlreadyLocked(ThreadType());
  
         case EDEADLK:         case EDEADLK:
             throw Deadlock(_rep.owner);              throw Deadlock(ThreadType());
  
         default:         default:
             throw WaitFailed(_rep.owner);              throw WaitFailed(ThreadType());
     }     }
 } }
  
 void Mutex::timed_lock(Uint32 milliseconds, ThreadType caller)  void Mutex::timed_lock(Uint32 milliseconds)
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
Line 166 
Line 151 
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
     ThreadType owner = _rep.owner;  
     Threads::clear(_rep.owner);  
   
     if (pthread_mutex_unlock(&_rep.mutex) != 0)     if (pthread_mutex_unlock(&_rep.mutex) != 0)
     {          throw Permission(ThreadType());
         _rep.owner = owner;  
         throw Permission(_rep.owner);  
     }  
 } }
  
 #endif /* PEGASUS_HAVE_PTHREADS */ #endif /* PEGASUS_HAVE_PTHREADS */
Line 189 
Line 168 
 Mutex::Mutex() Mutex::Mutex()
 { {
     _rep.handle = CreateMutex(NULL, FALSE, NULL);     _rep.handle = CreateMutex(NULL, FALSE, NULL);
     Threads::clear(_rep.owner);      Threads::clear(ThreadType());
     _rep.count = 0;     _rep.count = 0;
 } }
  
Line 201 
Line 180 
     CloseHandle(_rep.handle);     CloseHandle(_rep.handle);
 } }
  
 void Mutex::lock(ThreadType caller)  void Mutex::lock()
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
     DWORD rc = WaitForSingleObject(_rep.handle, INFINITE);     DWORD rc = WaitForSingleObject(_rep.handle, INFINITE);
  
     if (rc == WAIT_FAILED)     if (rc == WAIT_FAILED)
         throw WaitFailed(_rep.owner);          throw WaitFailed(ThreadType());
  
     _rep.owner = caller;  
     _rep.count++;     _rep.count++;
 } }
  
 void Mutex::try_lock(ThreadType caller)  void Mutex::try_lock()
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
     DWORD rc = WaitForSingleObject(_rep.handle, 0);     DWORD rc = WaitForSingleObject(_rep.handle, 0);
  
     if (rc == WAIT_TIMEOUT)     if (rc == WAIT_TIMEOUT)
         throw AlreadyLocked(_rep.owner);          throw AlreadyLocked(ThreadType());
  
     if (rc == WAIT_FAILED)     if (rc == WAIT_FAILED)
         throw WaitFailed(_rep.owner);          throw WaitFailed(ThreadType());
  
     _rep.owner = caller;  
     _rep.count++;     _rep.count++;
 } }
  
 void Mutex::timed_lock(Uint32 milliseconds , ThreadType caller)  void Mutex::timed_lock(Uint32 milliseconds)
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
     DWORD rc = WaitForSingleObject(_rep.handle, milliseconds);     DWORD rc = WaitForSingleObject(_rep.handle, milliseconds);
  
     if (rc == WAIT_TIMEOUT)     if (rc == WAIT_TIMEOUT)
         throw TimeOut(_rep.owner);          throw TimeOut(ThreadType());
  
     if (rc == WAIT_FAILED)     if (rc == WAIT_FAILED)
         throw WaitFailed(_rep.owner);          throw WaitFailed(ThreadType());
  
     _rep.owner = caller;  
     _rep.count++;     _rep.count++;
 } }
  
Line 250 
Line 226 
 { {
     PEGASUS_DEBUG_ASSERT(_magic);     PEGASUS_DEBUG_ASSERT(_magic);
  
     Threads::clear(_rep.owner);      Threads::clear(ThreadType());
     _rep.count--;     _rep.count--;
     ReleaseMutex(_rep.handle);     ReleaseMutex(_rep.handle);
 } }

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