From: Mikko Rasa Date: Tue, 23 Apr 2013 13:42:10 +0000 (+0300) Subject: Use the system call name as parameter to system_error X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=commitdiff_plain;h=7f847aeb48e0e8f58ead52ba255cff27527628eb Use the system call name as parameter to system_error --- diff --git a/source/core/mutex.cpp b/source/core/mutex.cpp index e1657c9..4f830c5 100644 --- a/source/core/mutex.cpp +++ b/source/core/mutex.cpp @@ -33,7 +33,7 @@ void Mutex::lock() EnterCriticalSection(&priv->crit); #else if(int err = pthread_mutex_lock(&priv->mutex)) - throw system_error("Mutex::lock", err); + throw system_error("pthread_mutex_lock", err); #endif } @@ -44,7 +44,7 @@ bool Mutex::trylock() #else int err = pthread_mutex_trylock(&priv->mutex); if(err && err!=EBUSY) - throw system_error("Mutex::trylock", err); + throw system_error("pthread_mutex_trylock", err); return !err; #endif } @@ -55,7 +55,7 @@ void Mutex::unlock() LeaveCriticalSection(&priv->crit); #else if(int err = pthread_mutex_unlock(&priv->mutex)) - throw system_error("Mutex::unlock", err); + throw system_error("pthread_mutex_unlock", err); #endif } diff --git a/source/core/semaphore.cpp b/source/core/semaphore.cpp index 8fa1be9..06e8435 100644 --- a/source/core/semaphore.cpp +++ b/source/core/semaphore.cpp @@ -53,13 +53,13 @@ void Semaphore::signal() { #ifdef WIN32 if(!ReleaseSemaphore(priv->handle, 1, 0)) - throw system_error("Semaphore::signal"); + throw system_error("ReleaseSemaphore"); #else MutexLock mlock(priv->mutex); if(priv->countlimit) ++priv->count; if(int err = pthread_cond_signal(&priv->cond)) - throw system_error("Semaphore::signal", err); + throw system_error("pthread_cond_signal", err); #endif } @@ -68,12 +68,12 @@ void Semaphore::wait() #ifdef WIN32 DWORD ret = WaitForSingleObject(priv->handle, INFINITE); if(ret==WAIT_FAILED) - throw system_error("Semaphore::wait"); + throw system_error("WaitForSingleObject"); #else MutexLock mlock(priv->mutex); while(!priv->count) if(int err = pthread_cond_wait(&priv->cond, &priv->mutex.priv->mutex)) - throw system_error("Semaphore::wait", err); + throw system_error("pthread_cond_wait", err); --priv->count; #endif } @@ -83,14 +83,14 @@ bool Semaphore::wait(const Time::TimeDelta &d) #ifdef WIN32 DWORD ret = WaitForSingleObject(priv->handle, (DWORD)(d/Time::usec)); if(ret==WAIT_FAILED) - throw system_error("Semaphore::wait"); + throw system_error("WaitForSingleObject"); return ret==WAIT_OBJECT_0; #else timespec timeout = Time::rawtime_to_timespec((Time::now()+d).raw()); int err = pthread_cond_timedwait(&priv->cond, &priv->mutex.priv->mutex, &timeout); if(err && err!=ETIMEDOUT) - throw system_error("Semaphore::wait", err); + throw system_error("pthread_cond_timedwait", err); return err==0; #endif }